Fix path issues when restarting on configmap changes (#79)

* Minor fixes for Burnell compat * Fix path issues when restarting on configmap changes
kafkaesque-io · Nov 13, 2020 · f091aae · f091aae
1 parent 4e08145
commit f091aae
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/helm-chart-sources/pulsar/templates/broker-deployment/broker-deployment.yaml b/helm-chart-sources/pulsar/templates/broker-deployment/broker-deployment.yaml
@@ -49,7 +49,7 @@ spec:
         cluster: {{ template "pulsar.fullname" . }}
       annotations:
       {{- if .Values.restartOnConfigMapChange.enabled }}
-        checksum/config: {{ include (print $.Template.BasePath "/broker-configmap.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/broker-deployment/broker-configmap.yaml") . | sha256sum }}
       {{- end }}
 {{ toYaml .Values.broker.annotations | indent 8 }}
     spec:

diff --git a/helm-chart-sources/pulsar/templates/broker-sts/broker-sts-statefulset.yaml b/helm-chart-sources/pulsar/templates/broker-sts/broker-sts-statefulset.yaml
@@ -46,7 +46,7 @@ spec:
         cluster: {{ template "pulsar.fullname" . }}
       annotations:
       {{- if .Values.restartOnConfigMapChange.enabled }}
-        checksum/config: {{ include (print $.Template.BasePath "/brokerSts-configmap.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/broker-sts/broker-sts-configmap.yaml") . | sha256sum }}
       {{- end }}
 {{ toYaml .Values.brokerSts.annotations | indent 8 }}
     spec:

diff --git a/helm-chart-sources/pulsar/templates/deprecated/state-statefulset.yaml b/helm-chart-sources/pulsar/templates/deprecated/state-statefulset.yaml
@@ -52,7 +52,7 @@ spec:
         publishNotReadyAddresses: "true"
         service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
       {{- if .Values.restartOnConfigMapChange.enabled }}
-        checksum/config: {{ include (print $.Template.BasePath "/state-configmap.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/deprecated/state-configmap.yaml") . | sha256sum }}
       {{- end }}
 {{ toYaml .Values.stateStorage.annotations | indent 8 }}
     spec:

diff --git a/helm-chart-sources/pulsar/templates/proxy-deployment.yaml b/helm-chart-sources/pulsar/templates/proxy-deployment.yaml
@@ -538,7 +538,7 @@ spec:
           - name: KeyFile
             value: /pulsar/certs/tls.key
           - name: TrustStore
-            value: {{ .Values.burnell.trustStore }}
+            value: {{ .Values.burnell.trustStore | default "/pulsar/certs/ca.crt" }}
           {{- end }}
           - name: FederatedPromURL
             value: {{ .Values.burnell.federatedPromUrl }}

diff --git a/helm-chart-sources/pulsar/templates/zookeeper-nonpersist/zookeepernp-statefulset.yaml b/helm-chart-sources/pulsar/templates/zookeeper-nonpersist/zookeepernp-statefulset.yaml
@@ -31,7 +31,7 @@ spec:
         cluster: {{ template "pulsar.fullname" . }}
       annotations:
       {{- if .Values.restartOnConfigMapChange.enabled }}
-        checksum/config: {{ include (print $.Template.BasePath "/zookeeper-configmap.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/zookeeper-nonpersist/zookeeper-configmap.yaml") . | sha256sum }}
       {{- end }}
 {{ toYaml .Values.zookeepernp.annotations | indent 8 }}
     spec:

diff --git a/helm-chart-sources/pulsar/templates/zookeeper/zookeeper-statefulset.yaml b/helm-chart-sources/pulsar/templates/zookeeper/zookeeper-statefulset.yaml
@@ -49,7 +49,7 @@ spec:
         cluster: {{ template "pulsar.fullname" . }}
       annotations:
       {{- if .Values.restartOnConfigMapChange.enabled }}
-        checksum/config: {{ include (print $.Template.BasePath "/zookeeper-configmap.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/zookeeper/zookeeper-configmap.yaml") . | sha256sum }}
       {{- end }}
 {{ toYaml .Values.zookeeper.annotations | indent 8 }}
     spec:

diff --git a/helm-chart-sources/pulsar/values.yaml b/helm-chart-sources/pulsar/values.yaml
@@ -323,9 +323,9 @@ image:
     pullPolicy: IfNotPresent
     tag: 0.23.21
   burnell:
-    repository: kafkaesqueio/burnell
+    repository: kesque/burnell
     pullPolicy: Always
-    tag: 0.2.6
+    tag: 1.2.54
   burnellLogCollector:
     repository: kafkaesqueio/burnell-logcollector
     pullPolicy: IfNotPresent
@@ -1117,6 +1117,8 @@ tardigrade:
     port: 7777
     type: ClusterIP
 
+# Placeholder for Burnell config options
+burnell: {}
 
 stateStorage:
   component: statestorage