From adc999cd596890ed5b8c60742cecad2e488974fc Mon Sep 17 00:00:00 2001
From: Rob Coward <rob.coward@devops-consultants.co.uk>
Date: Tue, 26 Nov 2024 09:56:39 +0000
Subject: [PATCH] fix: Improved handling of defaults for storage topics (#5)

---
 charts/kafka-connect/Chart.yaml             | 2 +-
 charts/kafka-connect/templates/_helpers.tpl | 6 ++++--
 charts/kafka-connect/values.yaml            | 8 +++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/charts/kafka-connect/Chart.yaml b/charts/kafka-connect/Chart.yaml
index bad9ee3..1d56f8a 100644
--- a/charts/kafka-connect/Chart.yaml
+++ b/charts/kafka-connect/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.3
+version: 0.1.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/kafka-connect/templates/_helpers.tpl b/charts/kafka-connect/templates/_helpers.tpl
index 0d21446..e56fd07 100644
--- a/charts/kafka-connect/templates/_helpers.tpl
+++ b/charts/kafka-connect/templates/_helpers.tpl
@@ -69,8 +69,10 @@ Create the name of the config topic to use
 {{- $config := .config -}}
 {{- $clustername := .clustername -}}
 {{- $topic_prefix := (printf "%s-%s" $global.configTopicPrefix $clustername) -}}
-{{- range $topic, $topic_config := $config.topics }}
-{{ $topic }}.storage.replication.factor: {{ $topic_config.replicationFactor | default $global.replicationFactor }}
+{{- $topic_configs := $config.topics | default $global.topics }}
+{{- range $topic, $topic_defaults := $global.topics }}
+{{- $topic_config := index $topic_configs $topic | default $topic_defaults }}
+{{ $topic }}.storage.replication.factor: {{ $topic_config.replicationFactor | default $topic_defaults.replicationFactor }}
 {{ $topic }}.storage.topic: {{ $topic_config.topic | default (printf "%s-%s" $topic_prefix $topic) }}
 {{- end }}
 {{- end }}
diff --git a/charts/kafka-connect/values.yaml b/charts/kafka-connect/values.yaml
index 3e2fc94..d80c64e 100644
--- a/charts/kafka-connect/values.yaml
+++ b/charts/kafka-connect/values.yaml
@@ -1,5 +1,4 @@
 global:
-  replicationFactor: 3
   replicas: 1
   configTopicPrefix: __connect-cluster
   version: 3.8.0
@@ -10,6 +9,13 @@ global:
   secretStore: aws-secretsmanager
   secretStoreKind: ClusterSecretStore
   refreshInterval: 1h
+  topics:
+    config:
+      replicationFactor: 3
+    offset:
+      replicationFactor: 3
+    status:
+      replicationFactor: 3
 
 image: sionsmith/oso-strimzi-kafka-operator-iam-auth:0.38.0-kafka-3.6.0-aws-latest