refactoring code

Author: harsh maheshwari

controllers/add_services.go

@@ -43,16 +43,7 @@ func (a addServices) reconcile(ctx context.Context, r *FoundationDBClusterReconc
 		existingService := &corev1.Service{}
 		err := r.Get(ctx, client.ObjectKey{Namespace: cluster.Namespace, Name: cluster.Name}, existingService)
 		if err == nil {
-			if cluster.IsPodIPFamily6() && (existingService.Spec.IPFamilies == nil || existingService.Spec.IPFamilies[0] != corev1.IPv6Protocol) {
-				logger.V(1).Info("Recreating service", "name", service.Name)
-				err = r.Delete(ctx, existingService)
-				if err != nil {
-					return &requeue{curError: err}
-				}
-				err = r.Create(ctx, service)
-			} else {
-				err = updateService(ctx, logger, r, existingService, service)
-			}
+			err = updateService(ctx, logger, cluster, r, existingService, service)
 			if err != nil {
 				return &requeue{curError: err}
 			}
@@ -90,16 +81,7 @@ func (a addServices) reconcile(ctx context.Context, r *FoundationDBClusterReconc
 			existingService := &corev1.Service{}
 			err = r.Get(ctx, client.ObjectKey{Namespace: cluster.Namespace, Name: serviceName}, existingService)
 			if err == nil {
-				if cluster.IsPodIPFamily6() && (existingService.Spec.IPFamilies == nil || existingService.Spec.IPFamilies[0] != corev1.IPv6Protocol) {
-					logger.V(1).Info("Recreating service", "name", service.Name)
-					err = r.Delete(ctx, existingService)
-					if err != nil {
-						return &requeue{curError: err}
-					}
-					err = r.Create(ctx, service)
-				} else {
-					err = updateService(ctx, logger, r, existingService, service)
-				}
+				err = updateService(ctx, logger, cluster, r, existingService, service)
 				if err != nil {
 					return &requeue{curError: err}
 				}
@@ -122,9 +104,29 @@ func (a addServices) reconcile(ctx context.Context, r *FoundationDBClusterReconc
 	return nil
 }
 
+// requiresRecreation returns true if the cluster supports podIPFamily as IPv6 and the existing service does not have
+// IPv6 in the IPFamilies.
+func requiresRecreation(cluster *fdbv1beta2.FoundationDBCluster, existingService *corev1.Service) bool {
+	return cluster.IsPodIPFamily6() && (existingService.Spec.IPFamilies == nil || existingService.Spec.IPFamilies[0] != corev1.IPv6Protocol)
+}
+
+// recreateService removes the existing service and create a new service.
+func recreateService(ctx context.Context, r *FoundationDBClusterReconciler, currentService *corev1.Service, newService *corev1.Service, logger logr.Logger) error {
+	logger.V(1).Info("Recreating service", "name", newService.Name)
+	err := r.Delete(ctx, currentService)
+	if err != nil {
+		return err
+	}
+	err = r.Create(ctx, newService)
+	return err
+}
+
 // updateServices updates selected safe fields on a service based on a new
 // service definition.
-func updateService(ctx context.Context, logger logr.Logger, r *FoundationDBClusterReconciler, currentService *corev1.Service, newService *corev1.Service) error {
+func updateService(ctx context.Context, logger logr.Logger, cluster *fdbv1beta2.FoundationDBCluster, r *FoundationDBClusterReconciler, currentService *corev1.Service, newService *corev1.Service) error {
+	if requiresRecreation(cluster, currentService) {
+		return recreateService(ctx, r, currentService, newService, logger)
+	}
 	originalSpec := currentService.Spec.DeepCopy()
 
 	currentService.Spec.Selector = newService.Spec.Selector