MLE-11463: Enhance deployment management for MarkLogic Group (#7)

* added changes resource configurations for MarkLogic group

* tests for group config params

Author: barkhachoithani

internal/controller/marklogicgroup_controller_test.go

@@ -25,6 +25,7 @@ import (
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
@@ -33,13 +34,16 @@ import (
 const (
 	Name      = "dnode"
 	Namespace = "testns"
+	maxSkew   = int32(2)
 
 	timeout  = time.Second * 60
 	duration = time.Second * 30
 	interval = time.Millisecond * 250
 )
 
 var replicas = int32(2)
+var cpu = int64(1)
+var memory = int64(268435456)
 var typeNamespaceName = types.NamespacedName{Name: Name, Namespace: Namespace}
 
 const imageName = "marklogicdb/marklogic-db:11.1.0-centos-1.1.1"
@@ -70,10 +74,17 @@ var _ = Describe("MarkLogicGroup controller", func() {
 					Namespace: Namespace,
 				},
 				Spec: databasev1alpha1.MarklogicGroupSpec{
-					Replicas:    &replicas,
-					Name:        Name,
-					Image:       imageName,
-					GroupConfig: groupConfig,
+					Replicas:                  &replicas,
+					Name:                      Name,
+					Image:                     imageName,
+					GroupConfig:               groupConfig,
+					EnableConverters:          true,
+					UpdateStrategy:            "OnDelete",
+					Resources:                 &corev1.ResourceRequirements{Requests: corev1.ResourceList{"cpu": resource.MustParse("100m"), "memory": resource.MustParse("256Mi")}, Limits: corev1.ResourceList{"cpu": resource.MustParse("100m"), "memory": resource.MustParse("256Mi")}},
+					PriorityClassName:         "high-priority",
+					ClusterDomain:             "cluster.local",
+					TopologySpreadConstraints: []corev1.TopologySpreadConstraint{{MaxSkew: 2, TopologyKey: "kubernetes.io/hostname", WhenUnsatisfiable: corev1.ScheduleAnyway}},
+					Affinity:                  &corev1.Affinity{PodAffinity: &corev1.PodAffinity{PreferredDuringSchedulingIgnoredDuringExecution: []corev1.WeightedPodAffinityTerm{{PodAffinityTerm: corev1.PodAffinityTerm{TopologyKey: "kubernetes.io/hostname"}, Weight: 100}}}},
 				},
 			}
 			Expect(k8sClient.Create(ctx, mlGroup)).Should(Succeed())
@@ -88,6 +99,18 @@ var _ = Describe("MarkLogicGroup controller", func() {
 			Expect(createdCR.Spec.Replicas).Should(Equal(&replicas))
 			Expect(createdCR.Name).Should(Equal(Name))
 			Expect(createdCR.Spec.GroupConfig).Should(Equal(groupConfig))
+			Expect(createdCR.Spec.EnableConverters).Should(Equal(true))
+			Expect(createdCR.Spec.Resources.Limits.Cpu().Value()).Should(Equal(cpu))
+			Expect(createdCR.Spec.Resources.Limits.Memory().Value()).Should(Equal(memory))
+			Expect(createdCR.Spec.Resources.Requests.Cpu().Value()).Should(Equal(cpu))
+			Expect(createdCR.Spec.Resources.Requests.Memory().Value()).Should(Equal(memory))
+			Expect(createdCR.Spec.UpdateStrategy).Should(Equal(appsv1.OnDeleteStatefulSetStrategyType))
+			Expect(createdCR.Spec.PriorityClassName).Should(Equal("high-priority"))
+			Expect(createdCR.Spec.ClusterDomain).Should(Equal("cluster.local"))
+			Expect(createdCR.Spec.TopologySpreadConstraints[0].MaxSkew).Should(Equal(int32(2)))
+			Expect(createdCR.Spec.TopologySpreadConstraints[0].TopologyKey).Should(Equal("kubernetes.io/hostname"))
+			Expect(createdCR.Spec.TopologySpreadConstraints[0].WhenUnsatisfiable).Should(Equal(corev1.ScheduleAnyway))
+			Expect(createdCR.Spec.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[0].Weight).Should(Equal(int32(100)))
 
 			// Validating if StatefulSet is created successfully
 			sts := &appsv1.StatefulSet{}

pkg/k8sutil/marklogicServer.go

@@ -3,6 +3,8 @@ package k8sutil
 import (
 	"github.com/go-logr/logr"
 	databasev1alpha1 "github.com/marklogic/marklogic-kubernetes-operator/api/v1alpha1"
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
@@ -12,6 +14,14 @@ type markLogicServerParameters struct {
 	Image    string
 	// PersistentVolumeClaim         corev1.PersistentVolumeClaim
 	TerminationGracePeriodSeconds *int64
+	Resources                     *corev1.ResourceRequirements
+	EnableConverters              bool
+	PriorityClassName             string
+	ClusterDomain                 string
+	UpdateStrategy                appsv1.StatefulSetUpdateStrategyType
+	Affinity                      *corev1.Affinity
+	NodeSelector                  map[string]string
+	TopologySpreadConstraints     []corev1.TopologySpreadConstraint
 }
 
 func MarkLogicServerLogger(namespace string, name string) logr.Logger {
@@ -58,6 +68,14 @@ func generateMarkLogicServerParams(cr *databasev1alpha1.MarklogicCluster, index
 		Name:                          cr.Spec.MarkLogicGroups[index].Name,
 		Image:                         cr.Spec.MarkLogicGroups[index].Image,
 		TerminationGracePeriodSeconds: cr.Spec.MarkLogicGroups[index].TerminationGracePeriodSeconds,
+		Resources:                     cr.Spec.MarkLogicGroups[index].Resources,
+		EnableConverters:              cr.Spec.MarkLogicGroups[index].EnableConverters,
+		PriorityClassName:             cr.Spec.MarkLogicGroups[index].PriorityClassName,
+		ClusterDomain:                 cr.Spec.MarkLogicGroups[index].ClusterDomain,
+		UpdateStrategy:                cr.Spec.MarkLogicGroups[index].UpdateStrategy,
+		Affinity:                      cr.Spec.MarkLogicGroups[index].Affinity,
+		NodeSelector:                  cr.Spec.MarkLogicGroups[index].NodeSelector,
+		TopologySpreadConstraints:     cr.Spec.MarkLogicGroups[index].TopologySpreadConstraints,
 	}
 	// if cr.Spec.Storage != nil {
 	// 	params.PersistentVolumeClaim = generatePVCTemplate(cr.Spec.Storage.Size)