fix(quorum): correct ConfigMap key and bootstrap wait gate (#253)

Author: amalsom10

internal/controller/typesensecluster_quorum.go

@@ -116,8 +116,12 @@ func (r *TypesenseClusterReconciler) ReconcileQuorum(ctx context.Context, ts *ts
 	r.logger.V(debugLevel).Info("reporting cluster status", "status", clusterStatus)
 
 	if clusterStatus == ClusterStatusSplitBrain {
-		nodeslist := strings.Split(quorum.NodesListConfigMap.Data["nodeslist"], ",")
-		if _, c := contains(nodeslist, fmt.Sprintf(ClusterStatefulSet, ts.Name)); c == true {
+		rawNodeslist, ok := quorum.NodesListConfigMap.Data["nodes"]
+		if !ok || rawNodeslist == "" {
+			return ConditionReasonQuorumNotReady, 0, fmt.Errorf("configmap %s is missing 'nodes' key", quorum.NodesListConfigMap.Name)
+		}
+		nodeslist := strings.Split(rawNodeslist, ",")
+		if hasHostnameBasedNodes(nodeslist, fmt.Sprintf(ClusterStatefulSet, ts.Name)) {
 			return ConditionReasonQuorumNotReadyWaitATerm, 0, nil
 		}
 		return r.downgradeQuorum(ctx, ts, quorum.NodesListConfigMap, stsObjectKey, sts.Status.ReadyReplicas, int32(quorum.MinRequiredNodes))
@@ -170,8 +174,12 @@ func (r *TypesenseClusterReconciler) ReconcileQuorum(ctx context.Context, ts *ts
 	}
 
 	if clusterStatus == ClusterStatusElectionDeadlock {
-		nodeslist := strings.Split(quorum.NodesListConfigMap.Data["nodeslist"], ",")
-		if _, c := contains(nodeslist, fmt.Sprintf(ClusterStatefulSet, ts.Name)); c == true {
+		rawNodeslist, ok := quorum.NodesListConfigMap.Data["nodes"]
+		if !ok || rawNodeslist == "" {
+			return ConditionReasonQuorumNotReady, 0, fmt.Errorf("configmap %s is missing 'nodes' key", quorum.NodesListConfigMap.Name)
+		}
+		nodeslist := strings.Split(rawNodeslist, ",")
+		if hasHostnameBasedNodes(nodeslist, fmt.Sprintf(ClusterStatefulSet, ts.Name)) {
 			return ConditionReasonQuorumNotReadyWaitATerm, 0, nil
 		}
 		return r.downgradeQuorum(ctx, ts, quorum.NodesListConfigMap, stsObjectKey, int32(healthyNodes), int32(minRequiredNodes))
@@ -381,3 +389,13 @@ 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

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