cleanup: fix "SatefulSet" typo and remove unused method

- Simplify return logic in IsStatefulSetReady by removing redundant 'true &&'
- Rename mkHeadlessSatefulSet -> mkHeadlessStatefulSet:
  All callers updated
- Remove unused PatchR method

Change-Id: I8af73917d1525a0cb13fbd6135058a812c93350e

Author: calancha

controllers/utils.go

@@ -126,13 +126,6 @@ func (r *SFUtilContext) UpdateR(obj client.Object) bool {
 	return true
 }
 
-// PatchR patches a resource.
-func (r *SFUtilContext) PatchR(obj client.Object, patch client.Patch) {
-	if err := r.Client.Patch(r.ctx, obj, patch); err != nil {
-		panic(err.Error())
-	}
-}
-
 // GetOrCreate does not change an existing object, update needs to be used manually.
 // In the case the object already exists then the function return True
 func (r *SFUtilContext) GetOrCreate(obj client.Object) bool {
@@ -327,10 +320,6 @@ func (r *SFUtilContext) EnsureLocalCA(dnsNames []string) {
 	r.GetOrCreate(&certificateSecret2)
 }
 
-//----------------------------------------------------------------------------
-// --- TODO clean functions below / remove useless code ---
-//----------------------------------------------------------------------------
-
 // mkStatefulSet Create a default statefulset.
 func (r *SFUtilContext) mkStatefulSet(name string, image string, storageConfig base.StorageConfig, accessMode apiv1.PersistentVolumeAccessMode, extraLabels map[string]string, openshiftUser bool, nameSuffix ...string) appsv1.StatefulSet {
 	serviceName := name
@@ -343,8 +332,8 @@ func (r *SFUtilContext) mkStatefulSet(name string, image string, storageConfig b
 	return base.MkStatefulset(name, r.ns, 1, serviceName, container, pvc, extraLabels)
 }
 
-// mkHeadlessSatefulSet Create a default headless statefulset.
-func (r *SFUtilContext) mkHeadlessSatefulSet(
+// mkHeadlessStatefulSet Create a default headless statefulset.
+func (r *SFUtilContext) mkHeadlessStatefulSet(
 	name string, image string, storageConfig base.StorageConfig,
 	accessMode apiv1.PersistentVolumeAccessMode, extraLabels map[string]string, openshiftUser bool) appsv1.StatefulSet {
 	return r.mkStatefulSet(name, image, storageConfig, accessMode, extraLabels, openshiftUser, "headless")
@@ -380,7 +369,7 @@ func (r *SFUtilContext) IsStatefulSetReady(dep *appsv1.StatefulSet) bool {
 			}
 		}
 		// All containers in Ready state
-		return true && base.IsStatefulSetRolloutDone(dep)
+		return base.IsStatefulSetRolloutDone(dep)
 	}
 	// No Replica available
 	return false

controllers/zookeeper.go

@@ -121,7 +121,7 @@ func (r *SFController) DeployZookeeper() bool {
 		StorageClassName: storageConfig.StorageClassName,
 		ExtraAnnotations: storageConfig.ExtraAnnotations,
 	}
-	zk := r.mkHeadlessSatefulSet(
+	zk := r.mkHeadlessStatefulSet(
 		ZookeeperIdent, base.ZookeeperImage(), storageConfig, apiv1.ReadWriteOnce, r.cr.Spec.ExtraLabels, r.isOpenShift)
 	// We overwrite the VolumeClaimTemplates set by MkHeadlessStatefulSet to keep the previous volume name
 	// Previously the default PVC created by MkHeadlessStatefulSet was not used by Zookeeper (not mounted). So to avoid having two Volumes

controllers/zuul.go

@@ -578,7 +578,7 @@ func (r *SFController) EnsureZuulExecutor(cfg *ini.File) bool {
 	}
 	// TODO Add the zk-port-forward-kube-config secret resource version in the annotation if enabled
 
-	ze := r.mkHeadlessSatefulSet("zuul-executor", "", r.getStorageConfOrDefault(r.cr.Spec.Zuul.Executor.Storage), apiv1.ReadWriteOnce, r.cr.Spec.ExtraLabels, r.isOpenShift)
+	ze := r.mkHeadlessStatefulSet("zuul-executor", "", r.getStorageConfOrDefault(r.cr.Spec.Zuul.Executor.Storage), apiv1.ReadWriteOnce, r.cr.Spec.ExtraLabels, r.isOpenShift)
 	zuulContainer := r.mkZuulContainer("zuul-executor", corporateCMExists)
 	annotations["limits"] = base.UpdateContainerLimit(r.cr.Spec.Zuul.Executor.Limits, &zuulContainer)
 	ze.Spec.Template.Spec.Containers = []apiv1.Container{zuulContainer}
@@ -674,7 +674,7 @@ func (r *SFController) EnsureZuulMerger(cfg *ini.File) bool {
 		"corporate-ca-certs-version": getCMVersion(corporateCM, corporateCMExists),
 	}
 
-	zm := r.mkHeadlessSatefulSet(service, "", r.getStorageConfOrDefault(r.cr.Spec.Zuul.Merger.Storage), apiv1.ReadWriteOnce, r.cr.Spec.ExtraLabels, r.isOpenShift)
+	zm := r.mkHeadlessStatefulSet(service, "", r.getStorageConfOrDefault(r.cr.Spec.Zuul.Merger.Storage), apiv1.ReadWriteOnce, r.cr.Spec.ExtraLabels, r.isOpenShift)
 	zuulContainer := r.mkZuulContainer(service, corporateCMExists)
 	annotations["limits"] = base.UpdateContainerLimit(r.cr.Spec.Zuul.Merger.Limits, &zuulContainer)
 	zm.Spec.Template.Spec.Containers = []apiv1.Container{zuulContainer}