From 35d2adac7ace7fe168034fbecf1d4170c16cc8fb Mon Sep 17 00:00:00 2001
From: Angelo Fausti <angelofausti@gmail.com>
Date: Tue, 11 Feb 2025 17:30:36 -0700
Subject: [PATCH] Uniformize Kafkanodepool node IDs

- Assign node IDs 3,4,5 to controllers. IDs 0,1,2 to brokers deployed on default storage and IDs 6,7,8 to brokers deployed on local storage.
---
 .../sasquatch/charts/strimzi-kafka/templates/kafka.yaml   | 8 +++-----
 applications/sasquatch/values-base.yaml                   | 2 --
 applications/sasquatch/values-summit.yaml                 | 2 --
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/applications/sasquatch/charts/strimzi-kafka/templates/kafka.yaml b/applications/sasquatch/charts/strimzi-kafka/templates/kafka.yaml
index 0cb786c1e0..42087d9571 100644
--- a/applications/sasquatch/charts/strimzi-kafka/templates/kafka.yaml
+++ b/applications/sasquatch/charts/strimzi-kafka/templates/kafka.yaml
@@ -5,10 +5,8 @@ metadata:
   name: controller
   labels:
     strimzi.io/cluster: {{ .Values.cluster.name }}
-  {{- with .Values.kafkaController.annotations }}
   annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
+    strimzi.io/next-node-ids: "[3,4,5]"
 spec:
   replicas: {{ .Values.kafka.replicas }}
   roles:
@@ -37,7 +35,7 @@ metadata:
   labels:
     strimzi.io/cluster: {{ .Values.cluster.name }}
   annotations:
-    strimzi.io/next-node-ids: "[0-99]"
+    strimzi.io/next-node-ids: "[0,1,2]"
 spec:
   replicas: {{ .Values.kafka.replicas }}
   roles:
@@ -66,7 +64,7 @@ metadata:
   labels:
     strimzi.io/cluster: {{ .Values.cluster.name }}
   annotations:
-    strimzi.io/next-node-ids: "[6-99]"
+    strimzi.io/next-node-ids: "[6,7,8]"
 spec:
   replicas: {{ .Values.kafka.replicas }}
   roles:
diff --git a/applications/sasquatch/values-base.yaml b/applications/sasquatch/values-base.yaml
index 761ea95dfb..e809134236 100644
--- a/applications/sasquatch/values-base.yaml
+++ b/applications/sasquatch/values-base.yaml
@@ -70,8 +70,6 @@ strimzi-kafka:
     enabled: true
   kafkaController:
     enabled: true
-    annotations:
-      strimzi.io/next-node-ids: "(3,4,5)"
     resources:
       requests:
         memory: 8Gi
diff --git a/applications/sasquatch/values-summit.yaml b/applications/sasquatch/values-summit.yaml
index cf28639ffe..b3da1ed72c 100644
--- a/applications/sasquatch/values-summit.yaml
+++ b/applications/sasquatch/values-summit.yaml
@@ -56,8 +56,6 @@ strimzi-kafka:
     enabled: true
   kafkaController:
     enabled: true
-    annotations:
-      strimzi.io/next-node-ids: "(3,4,5)"
     resources:
       requests:
         memory: 8Gi