fix group level label not prompt to services

Author: Peng Zhou

api/v1/marklogicgroup_types.go

@@ -28,8 +28,10 @@ import (
 // MarklogicGroupSpec defines the desired state of MarklogicGroup
 type MarklogicGroupSpec struct {
 	// +kubebuilder:default:=1
-	Replicas *int32 `json:"replicas,omitempty"`
-	Name     string `json:"name,omitempty"`
+	Replicas    *int32            `json:"replicas,omitempty"`
+	Name        string            `json:"name,omitempty"`
+	Labels      map[string]string `json:"labels,omitempty"`
+	Annotations map[string]string `json:"annotations,omitempty"`
 	// +kubebuilder:default:="cluster.local"
 	ClusterDomain string `json:"clusterDomain,omitempty"`
 	// +kubebuilder:default:="progressofficial/marklogic-db:11.3.0-ubi-rootless"

api/v1/zz_generated.deepcopy.go

@@ -3250,6 +3250,10 @@ spec:
                         x-kubernetes-list-type: atomic
                     type: object
                 type: object
+              annotations:
+                additionalProperties:
+                  type: string
+                type: object
               auth:
                 properties:
                   adminPassword:
@@ -3317,6 +3321,10 @@ spec:
                   type: object
                   x-kubernetes-map-type: atomic
                 type: array
+              labels:
+                additionalProperties:
+                  type: string
+                type: object
               license:
                 properties:
                   key:

config/crd/bases/marklogic.progress.com_marklogicgroups.yaml

@@ -114,7 +114,6 @@ func (cc *ClusterContext) ReconcileIngress() result.ReconcileResult {
 		}
 		if !patchDiff.IsEmpty() {
 			logger.Info("MarkLogic Ingress spec is different from the input Ingress spec, updating the Ingress")
-			logger.Info(patchDiff.String())
 			err := cc.Client.Update(cc.Ctx, ingressDef)
 			if err != nil {
 				logger.Error(err, "Error updating Ingress")

pkg/k8sutil/ingress.go

@@ -125,6 +125,8 @@ func GenerateMarkLogicGroupDef(cr *marklogicv1.MarklogicCluster, index int, para
 			Auth:                           params.Auth,
 			ServiceAccountName:             params.ServiceAccountName,
 			Image:                          params.Image,
+			Labels:                         params.Labels,
+			Annotations:                    params.Annotations,
 			ImagePullSecrets:               params.ImagePullSecrets,
 			License:                        params.License,
 			TerminationGracePeriodSeconds:  params.TerminationGracePeriodSeconds,

pkg/k8sutil/marklogicServer.go

@@ -85,7 +85,6 @@ func (cc *ClusterContext) ReconcileNetworkPolicy() result.ReconcileResult {
 		}
 		if !patchDiff.IsEmpty() {
 			logger.Info("MarkLogic NetworkPolicy spec is different from the input NetworkPolicy spec, updating the NetworkPolicy")
-			logger.Info(patchDiff.String())
 			err := cc.Client.Update(cc.Ctx, networkPolicyDef)
 			if err != nil {
 				logger.Error(err, "Error updating NetworkPolicy")

pkg/k8sutil/networkPolicy.go

@@ -97,6 +97,12 @@ func generateServiceDef(serviceMeta metav1.ObjectMeta, ownerRef metav1.OwnerRefe
 
 func generateService(svcName string, cr *marklogicv1.MarklogicGroup) *corev1.Service {
 	labels := getCommonLabels(cr.Spec.Name)
+	groupLabels := cr.Spec.Labels
+	if groupLabels != nil {
+		for key, value := range groupLabels {
+			labels[key] = value
+		}
+	}
 	var svcParams serviceParameters = serviceParameters{}
 	svcParams = generateServiceParams(cr)
 	svcObjectMeta := generateObjectMeta(svcName, cr.Namespace, labels, svcParams.Annotations)

pkg/k8sutil/service.go

@@ -132,7 +132,6 @@ func (oc *OperatorContext) ReconcileStatefulset() (reconcile.Result, error) {
 	}
 	if !patchDiff.IsEmpty() {
 		logger.Info("MarkLogic statefulSet spec is different from the MarkLogicGroup spec, updating the statefulSet")
-		logger.Info(patchDiff.String())
 		currentSts.Spec = statefulSetDef.Spec
 		currentSts.ObjectMeta.Annotations = statefulSetDef.ObjectMeta.Annotations
 		currentSts.ObjectMeta.Labels = statefulSetDef.ObjectMeta.Labels