[incubator/kafka] Allow configurationOverride of zookeeper.connect (#…

…4027) * [incubator/kafka] Allow configurationOverride of zookeeper.connect * [incubator/kafka] DRY the zookeeper.connect override * Add benjigoldberg to OWNERS
helm · Mar 7, 2018 · 4e05126 · 4e05126
1 parent 1230e8a
commit 4e05126
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/incubator/kafka/Chart.yaml b/incubator/kafka/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: Apache Kafka is publish-subscribe messaging rethought as a distributed
   commit log.
 name: kafka
-version: 0.4.0
+version: 0.4.1
 keywords:
 - kafka
 - zookeeper

diff --git a/incubator/kafka/OWNERS b/incubator/kafka/OWNERS
@@ -0,0 +1,4 @@
+approvers:
+- benjigoldberg
+reviewers:
+- benjigoldberg
diff --git a/incubator/kafka/templates/_helpers.tpl b/incubator/kafka/templates/_helpers.tpl
@@ -40,6 +40,8 @@ else use user-provided URL
 {{- if .Values.zookeeper.enabled -}}
 {{- printf "%s:%s" (include "kafka.zookeeper.fullname" .) $port }}
 {{- else -}}
-{{- printf "%s:%s" .Values.zookeeper.url $port }}
+{{- $zookeeperConnect := printf "%s:%s" .Values.zookeeper.url $port }}
+{{- $zookeeperConnectOverride := index .Values "configurationOverrides" "zookeeper.connect" }}
+{{- default $zookeeperConnect $zookeeperConnectOverride }}
 {{- end -}}
 {{- end -}}
diff --git a/incubator/kafka/templates/configmap.yaml b/incubator/kafka/templates/configmap.yaml
@@ -11,5 +11,7 @@ data:
   zookeeper.connect: "{{ template "zookeeper.url" . }}"
   log.dirs: "{{ printf "%s/%s" .Values.persistence.mountPath .Values.logSubPath }}"
 {{- range $configName, $configValue := .Values.configurationOverrides }}
+{{- if not ( eq $configName "zookeeper.connect" ) }}
   {{ $configName }}: "{{ $configValue -}}"
 {{- end -}}
+{{- end -}}