Improve structure of helm chart

helm/Chart.yaml

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

helm/templates/strimzi/kafka-cluster.yaml

@@ -5,30 +5,17 @@ metadata:
 spec:
   kafka:
     jmxOptions: {}
-    listeners:
-      - name: plain
-        port: 9092
-        type: internal
-        tls: false
     storage:
       type: ephemeral
-    replicas: 3
     metricsConfig:
       type: jmxPrometheusExporter
       valueFrom:
         configMapKeyRef:
           name: kafka-metrics
           key: kafka-metrics-config.yml
-    config:
-      message.max.bytes: "134217728" # 128 MB
-      replica.fetch.max.bytes: "134217728" #128 MB
-      auto.create.topics.enable: false
-      log.retention.ms: "7200000" # 2h
-      metrics.sample.window.ms: "5000" #5s
   
   kafkaExporter: {}
 
   zookeeper:
-    replicas: 3
     storage:
       type: ephemeral

helm/values.yaml

@@ -156,12 +156,25 @@ cp-helm-charts:
   ## The interval between refreshing metrics
   pollIntervalSeconds: 15
 
-  prometheus:
-    serviceMonitor:
-      enabled: true
-      interval: "5s"
-      additionalLabels:
-        appScope: titan-ccp
+strimzi-kafka-operator:
+  enabled: true
+
+  kafka:
+    listeners:
+      - name: plain
+        port: 9092
+        type: internal
+        tls: false
+    replicas: 3
+    config:
+      message.max.bytes: "134217728" # 128 MB
+      replica.fetch.max.bytes: "134217728" #128 MB
+      auto.create.topics.enable: false
+      log.retention.ms: "7200000" # 2h
+      metrics.sample.window.ms: "5000" #5s
+  
+  zookeeper:
+    replicas: 3
 
 
 ###