255 rearrange helper functions (#259)

* move hasHostnameBasedNodes to configmap helper as receiver method #255

* log error when nodes key is empty #255

Author: akyriako

Makefile

@@ -52,7 +52,7 @@ OPERATOR_SDK_VERSION ?= v1.39.0
 # Image URL to use all building/pushing image targets
 DOCKER_HUB_NAME ?= quay.io/akyriako#$(shell docker info | sed '/Username:/!d;s/.* //')
 IMG_NAME ?= typesense-operator
-IMG_TAG ?= 0.4.0
+IMG_TAG ?= 0.4.1-dev.13
 IMG ?= $(DOCKER_HUB_NAME)/$(IMG_NAME):$(IMG_TAG)
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.

internal/controller/typesensecluster_configmap.go

@@ -380,3 +380,20 @@ func (r *TypesenseClusterReconciler) getShortName(raftNodeEndpoint string) strin
 
 	return host
 }
+
+func (r *TypesenseClusterReconciler) hasBootstrapValues(ts *tsv1alpha1.TypesenseCluster, cm *v1.ConfigMap) (bool, error) {
+	rawNodeslist, ok := cm.Data["nodes"]
+	if !ok || rawNodeslist == "" {
+		err := fmt.Errorf("configmap is missing 'nodes' key")
+		return false, err
+	}
+
+	nodeslist := strings.Split(rawNodeslist, ",")
+	for _, node := range nodeslist {
+		if strings.Contains(node, fmt.Sprintf(ClusterStatefulSet, ts.Name)) {
+			return true, nil
+		}
+	}
+
+	return false, nil
+}

internal/controller/typesensecluster_quorum.go

@@ -116,14 +116,15 @@ func (r *TypesenseClusterReconciler) ReconcileQuorum(ctx context.Context, ts *ts
 	r.logger.V(debugLevel).Info("reporting cluster status", "status", clusterStatus)
 
 	if clusterStatus == ClusterStatusSplitBrain {
-		rawNodeslist, ok := quorum.NodesListConfigMap.Data["nodes"]
-		if !ok || rawNodeslist == "" {
-			return ConditionReasonQuorumNotReady, 0, fmt.Errorf("configmap %s is missing 'nodes' key", quorum.NodesListConfigMap.Name)
+		hbv, err := r.hasBootstrapValues(ts, quorum.NodesListConfigMap)
+		if err != nil {
+			return ConditionReasonQuorumNotReady, 0, err
 		}
-		nodeslist := strings.Split(rawNodeslist, ",")
-		if hasHostnameBasedNodes(nodeslist, fmt.Sprintf(ClusterStatefulSet, ts.Name)) {
+
+		if hbv {
 			return ConditionReasonQuorumNotReadyWaitATerm, 0, nil
 		}
+
 		return r.downgradeQuorum(ctx, ts, quorum.NodesListConfigMap, stsObjectKey, sts.Status.ReadyReplicas, int32(quorum.MinRequiredNodes))
 	}
 
@@ -174,14 +175,15 @@ func (r *TypesenseClusterReconciler) ReconcileQuorum(ctx context.Context, ts *ts
 	}
 
 	if clusterStatus == ClusterStatusElectionDeadlock {
-		rawNodeslist, ok := quorum.NodesListConfigMap.Data["nodes"]
-		if !ok || rawNodeslist == "" {
-			return ConditionReasonQuorumNotReady, 0, fmt.Errorf("configmap %s is missing 'nodes' key", quorum.NodesListConfigMap.Name)
+		hbv, err := r.hasBootstrapValues(ts, quorum.NodesListConfigMap)
+		if err != nil {
+			return ConditionReasonQuorumNotReady, 0, err
 		}
-		nodeslist := strings.Split(rawNodeslist, ",")
-		if hasHostnameBasedNodes(nodeslist, fmt.Sprintf(ClusterStatefulSet, ts.Name)) {
+
+		if hbv {
 			return ConditionReasonQuorumNotReadyWaitATerm, 0, nil
 		}
+
 		return r.downgradeQuorum(ctx, ts, quorum.NodesListConfigMap, stsObjectKey, int32(healthyNodes), int32(minRequiredNodes))
 	}
 
@@ -389,13 +391,3 @@ func (r *TypesenseClusterReconciler) updatePodReadinessGate(ctx context.Context,
 	//r.logger.V(debugLevel).Info("updating pod readiness gate condition", "pod", pod.Name, "condition", condition.Type, "conditionStatus", condition.Status)
 	return nil
 }
-
-func hasHostnameBasedNodes(nodes []string, statefulSetName string) bool {
-	for _, node := range nodes {
-		if strings.Contains(node, statefulSetName) {
-			return true
-		}
-	}
-
-	return false
-}

internal/controller/typesensecluster_quorum_helpers.go

@@ -161,7 +161,8 @@ func (r *TypesenseClusterReconciler) getQuorum(ctx context.Context, ts *tsv1alph
 
 	rawNodes, ok := cm.Data["nodes"]
 	if !ok || strings.TrimSpace(rawNodes) == "" {
-		return &Quorum{}, fmt.Errorf("configmap %s is missing 'nodes' key", cm.Name)
+		err := fmt.Errorf("configmap %s is missing 'nodes' key", configMapName)
+		return &Quorum{}, err
 	}
 	nodes := strings.Split(rawNodes, ",")
 	availableNodes := len(nodes)