Fix go templates

helm/Chart.yaml

@@ -27,7 +27,7 @@ dependencies:
   - name: strimzi-kafka-operator
     version: 0.27.1
     repository: https://strimzi.io/charts/
-    condition: strimzi-kafka-operator.enabled
+    condition: strimzi.enabled
 
 
 version: 0.7.0-SNAPSHOT

helm/templates/strimzi/kafka-cluster.yaml

+{{- if .Values.strimzi.enabled -}}
 apiVersion: kafka.strimzi.io/v1beta2
 kind: Kafka
 metadata:
@@ -5,6 +6,22 @@ metadata:
 spec:
   kafka:
     jmxOptions: {}
+    {{- with .Values.strimzi.kafka.listeners }}
+    listeners:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.strimzi.kafka.replicas }}
+    replicas:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.strimzi.kafka.config }}
+    config:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.strimzi.kafka.jvmOptions }}
+    jvmOptions:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     storage:
       type: ephemeral
     metricsConfig:
@@ -17,5 +34,10 @@ spec:
   kafkaExporter: {}
 
   zookeeper:
+    {{- with .Values.strimzi.zookeeper.replicas }}
+    replicas:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     storage:
       type: ephemeral
+{{- end }}
\ No newline at end of file

helm/templates/strimzi/kafka-exporter-podmonitor.yaml

+{{- if .Values.strimzi.enabled -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
@@ -15,3 +16,4 @@ spec:
   podMetricsEndpoints:
   - path: /metrics
     port: tcp-prometheus
+{{- end }}
\ No newline at end of file

helm/templates/strimzi/kafka-metrics-configmap.yaml

+{{- if .Values.strimzi.enabled -}}
 kind: ConfigMap
 apiVersion: v1
 metadata:
@@ -129,3 +130,4 @@ data:
       type: GAUGE
       labels:
         quantile: "0.$4"
+{{- end }}
\ No newline at end of file

helm/templates/strimzi/kafka-podmonitor.yaml

+{{- if .Values.strimzi.enabled -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
@@ -15,3 +16,4 @@ spec:
   podMetricsEndpoints:
   - path: /metrics
     port: tcp-prometheus
+{{- end }}
\ No newline at end of file

helm/values.yaml

@@ -137,7 +137,6 @@ cp-helm-charts:
       nodePort: 30099
       annotations: {}
 
-
     kafka:
       bootstrapServers: theodolite-strimzi-kafka-bootstrap:9092
 
@@ -156,9 +155,8 @@ cp-helm-charts:
   ## The interval between refreshing metrics
   pollIntervalSeconds: 15
 
-strimzi-kafka-operator:
+strimzi:
   enabled: true
-
   kafka:
     listeners:
       - name: plain
@@ -255,7 +253,7 @@ prometheus:
 operator:
   enabled: true
   
-  image: ghcr.io/cau-se/theodolite
+  image: sehrenstein/theodolite-operator-jvm # old: ghcr.io/cau-se/theodolite
   imageTag: latest
   imagePullPolicy: Always