From 0034a8ac79958d471185901c50381044ffd33b42 Mon Sep 17 00:00:00 2001
From: Eric Charles <eric@datalayer.io>
Date: Thu, 19 Dec 2024 10:56:06 +0100
Subject: [PATCH] chore: kafka raft

---
 charts/datalayer-kafka/Chart.yaml             |  4 +--
 .../templates/kafka-nodepool.yaml             | 19 +++++++++++
 charts/datalayer-kafka/templates/kafka.yaml   | 34 +++++++++++++------
 charts/datalayer-kafka/values.yaml            |  2 +-
 4 files changed, 46 insertions(+), 13 deletions(-)
 create mode 100644 charts/datalayer-kafka/templates/kafka-nodepool.yaml

diff --git a/charts/datalayer-kafka/Chart.yaml b/charts/datalayer-kafka/Chart.yaml
index 4bcc4cc..aee2e83 100644
--- a/charts/datalayer-kafka/Chart.yaml
+++ b/charts/datalayer-kafka/Chart.yaml
@@ -13,5 +13,5 @@ maintainers:
     url: https://datalayer.io
 dependencies:
   - name: strimzi-kafka-operator
-    version: "0.44.0"
-    repository: "https://strimzi.io/charts/"
+    version: "0.45.0"
+    repository: "https://strimzi.io/charts"
diff --git a/charts/datalayer-kafka/templates/kafka-nodepool.yaml b/charts/datalayer-kafka/templates/kafka-nodepool.yaml
new file mode 100644
index 0000000..25ac72d
--- /dev/null
+++ b/charts/datalayer-kafka/templates/kafka-nodepool.yaml
@@ -0,0 +1,19 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaNodePool
+metadata:
+  name: {{ .Release.Name }}-node-pool
+  namespace: {{ .Release.Namespace }}
+  labels:
+    strimzi.io/cluster: {{ .Release.Name }}
+spec:
+  replicas: 3
+  roles:
+    - broker
+    - controller
+  storage:
+      type: jbod
+      volumes:
+      - id: 0
+        type: persistent-claim
+        size: 8Gi
+        deleteClaim: false
diff --git a/charts/datalayer-kafka/templates/kafka.yaml b/charts/datalayer-kafka/templates/kafka.yaml
index f12f681..d1127db 100644
--- a/charts/datalayer-kafka/templates/kafka.yaml
+++ b/charts/datalayer-kafka/templates/kafka.yaml
@@ -3,6 +3,9 @@ kind: Kafka
 metadata:
   name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
+  annotations:
+    strimzi.io/node-pools: enabled
+    strimzi.io/kraft: enabled
 spec:
   kafka:
     version: 3.8.0
@@ -41,12 +44,24 @@ spec:
         type: persistent-claim
         size: 8Gi
         deleteClaim: false
-  zookeeper:
-    replicas: 3
-    storage:
-      type: persistent-claim
-      size: 8Gi
-      deleteClaim: false
+#  zookeeper:
+#    replicas: 3
+#    storage:
+#      type: persistent-claim
+#      size: 8Gi
+#      deleteClaim: false
+#    template:
+#      pod:
+#        affinity:
+#          nodeAffinity:
+#            requiredDuringSchedulingIgnoredDuringExecution:
+#              nodeSelectorTerms:
+#                - matchExpressions:
+#                  - key: role.datalayer.io/system
+#                    operator: In
+#                    values:
+#                    - "true"
+  entityOperator:
     template:
       pod:
         affinity:
@@ -58,7 +73,9 @@ spec:
                     operator: In
                     values:
                     - "true"
-  entityOperator:
+    topicOperator: {}
+    userOperator: {}
+  kafkaExporter:
     template:
       pod:
         affinity:
@@ -70,8 +87,5 @@ spec:
                     operator: In
                     values:
                     - "true"
-    topicOperator: {}
-    userOperator: {}
-  kafkaExporter:
     topicRegex: ".*"
     groupRegex: ".*"
diff --git a/charts/datalayer-kafka/values.yaml b/charts/datalayer-kafka/values.yaml
index af8d8d2..329e0fa 100644
--- a/charts/datalayer-kafka/values.yaml
+++ b/charts/datalayer-kafka/values.yaml
@@ -1,6 +1,6 @@
 telemetry:
   enabled: true
-strimzi:
+strimzi-kafka-operator:
   affinity:
     nodeAffinity:
       requiredDuringSchedulingIgnoredDuringExecution: