Revert Change for service

Author: Peng Zhou

pkg/k8sutil/service.go

@@ -3,7 +3,6 @@ package k8sutil
 import (
 	"strings"
 
-	"github.com/cisco-open/k8s-objectmatcher/patch"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -15,15 +14,13 @@ import (
 )
 
 type serviceParameters struct {
-	StsName     string
 	Ports       []corev1.ServicePort
 	Type        corev1.ServiceType
 	Annotations map[string]string
 }
 
 func generateServiceParams(cr *marklogicv1.MarklogicGroup) serviceParameters {
 	return serviceParameters{
-		StsName:     cr.Spec.Name,
 		Type:        cr.Spec.Service.Type,
 		Ports:       cr.Spec.Service.AdditionalPorts,
 		Annotations: cr.Spec.Service.Annotations,
@@ -74,7 +71,7 @@ func generateServicePorts() []corev1.ServicePort {
 func generateServiceDef(serviceMeta metav1.ObjectMeta, ownerRef metav1.OwnerReference, params serviceParameters) *corev1.Service {
 	var svcSpec corev1.ServiceSpec
 	svcSpec = corev1.ServiceSpec{
-		Selector: getSelectorLabels(params.StsName),
+		Selector: serviceMeta.GetLabels(),
 		Ports:    append(params.Ports, generateServicePorts()...),
 	}
 	if strings.HasSuffix(serviceMeta.Name, "-cluster") {
@@ -95,17 +92,44 @@ func generateServiceDef(serviceMeta metav1.ObjectMeta, ownerRef metav1.OwnerRefe
 	return service
 }
 
-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
+func (oc *OperatorContext) getService(namespace string, serviceName string) (*corev1.Service, error) {
+	logger := oc.ReqLogger
+
+	var serviceInfo *corev1.Service
+	err := oc.Client.Get(oc.Ctx, types.NamespacedName{Name: serviceName, Namespace: namespace}, serviceInfo)
+	if err != nil {
+		logger.Info("MarkLogic service get action is failed")
+		return nil, err
+	}
+	logger.Info("MarkLogic service get action is successful")
+	return serviceInfo, nil
+}
+
+func (oc *OperatorContext) CreateOrUpdateService(namespace string, serviceMeta metav1.ObjectMeta, ownerDef metav1.OwnerReference) error {
+	logger := oc.ReqLogger
+	serviceDef := generateServiceDef(serviceMeta, ownerDef, serviceParameters{})
+	_, err := oc.getService(namespace, serviceMeta.Name)
+	if err != nil {
+		if errors.IsNotFound(err) {
+			logger.Info("MarkLogic service is not found, creating a new one")
+			err = oc.createService(namespace, serviceDef)
+			if err != nil {
+				logger.Info("MarkLogic service creation is failed")
+				return err
+			}
+			logger.Info("MarkLogic service creation is successful")
+			return nil
 		}
+		return err
 	}
+	return nil
+}
+
+func generateService(svcName string, cr *marklogicv1.MarklogicGroup) *corev1.Service {
+	labels := getCommonLabels(cr.Spec.Name)
 	var svcParams serviceParameters = serviceParameters{}
-	svcParams = generateServiceParams(cr)
 	svcObjectMeta := generateObjectMeta(svcName, cr.Namespace, labels, svcParams.Annotations)
+	svcParams = generateServiceParams(cr)
 	service := generateServiceDef(svcObjectMeta, marklogicServerAsOwner(cr), svcParams)
 	return service
 }
@@ -115,21 +139,18 @@ func (oc *OperatorContext) ReconcileServices() result.ReconcileResult {
 	logger.Info("service::Reconciling MarkLogic Service")
 	client := oc.Client
 	cr := oc.MarklogicGroup
-	currentSvc := &corev1.Service{}
+	svc := &corev1.Service{}
 	headlessSvcName := cr.Spec.Name
 	svcName := cr.Spec.Name + "-cluster"
 	services := []string{headlessSvcName, svcName}
 	for _, service := range services {
 		svcNsName := types.NamespacedName{Name: service, Namespace: cr.Namespace}
-		err := client.Get(oc.Ctx, svcNsName, currentSvc)
-		svcDef := generateService(service, cr)
+		err := client.Get(oc.Ctx, svcNsName, svc)
 		if err != nil {
 			if errors.IsNotFound(err) {
 				logger.Info("MarkLogic service not found, creating a new one")
-				if err := patch.DefaultAnnotator.SetLastAppliedAnnotation(svcDef); err != nil {
-					logger.Error(err, "Failed to set last applied annotation for MarkLogic service")
-				}
-				err = client.Create(oc.Ctx, svcDef)
+				svc = generateService(service, cr)
+				err = client.Create(oc.Ctx, svc)
 				if err != nil {
 					logger.Info("MarkLogic service creation has failed")
 					return result.Error(err)
@@ -139,33 +160,19 @@ func (oc *OperatorContext) ReconcileServices() result.ReconcileResult {
 				logger.Error(err, "MarkLogic service creation has failed")
 				return result.Error(err)
 			}
-		} else {
-			patchDiff, err := patch.DefaultPatchMaker.Calculate(currentSvc, svcDef,
-				patch.IgnoreStatusFields(),
-				patch.IgnoreVolumeClaimTemplateTypeMetaAndStatus(),
-				patch.IgnoreField("kind"))
-
-			if err != nil {
-				logger.Error(err, "Error calculating patch")
-				return result.Error(err)
-			}
-			if !patchDiff.IsEmpty() {
-				logger.Info("MarkLogic service spec is different from the MarkLogicGroup spec, updating the service")
-				currentSvc.Spec = svcDef.Spec
-				currentSvc.ObjectMeta.Annotations = svcDef.ObjectMeta.Annotations
-				currentSvc.ObjectMeta.Labels = svcDef.ObjectMeta.Labels
-				if err := patch.DefaultAnnotator.SetLastAppliedAnnotation(currentSvc); err != nil {
-					logger.Error(err, "Failed to set last applied annotation for MarkLogic service")
-				}
-				err := oc.Client.Update(oc.Ctx, currentSvc)
-				if err != nil {
-					logger.Error(err, "Error updating MarkLogic service")
-					return result.Error(err)
-				}
-			} else {
-				logger.Info("MarkLogic service spec is the same")
-			}
 		}
 	}
 	return result.Continue()
 }
+
+func (oc *OperatorContext) createService(namespace string, service *corev1.Service) error {
+	logger := oc.ReqLogger
+	client := oc.Client
+	err := client.Create(oc.Ctx, service)
+	if err != nil {
+		logger.Error(err, "MarkLogic service creation has failed")
+		return err
+	}
+	logger.Info("MarkLogic service creation is successful")
+	return nil
+}