github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[incubator/kafka] Fixes zookeeper URL when kafka is included as subchart (#3276)

Browse Source 
* Fixes kafka zookeeper url

* Removes non-existent values from docs

* Fixes zookeeper url (for real this time)
This commit is contained in:
Federico Nusymowicz
2018-01-10 20:34:11 -08:00
committed by k8s-ci-robot
parent 69e5059dd5
commit 7b4d26ba4e
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
incubator/kafka/Chart.yaml
+1 -1
View File
@@ -2,7 +2,7 @@ apiVersion: v1
description: Apache Kafka is publish-subscribe messaging rethought as a distributed
commit log.
name: kafka
version: 0.2.10
version: 0.2.11
keywords:
- kafka
- zookeeper
incubator/kafka/README.md
-3
View File
@@ -67,9 +67,6 @@ following configurable parameters:
| `schema-registry.enabled` | If True, installs Schema Registry Chart | `false` |
| `updateStrategy` | The type of StatefulSet update strategy to use. One of `OnDelete` or `RollingUpdate` | `OnDelete` |
| `rollingUpdatePartition` | When `RollingUpdate` is the `updateStrategy`, which `partition` of the statefulset is updated first. | `0` |
| `zookeeperAntiAffinityEnabled` | If `true`, apply anti-affinity rules between kafka and zookeeper pods. | `true` |
| `zookeeperAntiAffinity` | If `hard` disallow colocation of Kafka and Zookeeper pods, if `soft`, make a best effort-attempt to prevent colocation | `soft` |
| `zookeeperAntiAffinityPodName` | Pod Metadata app label of zookeeper pods for anti-affinity rules for use with `In` prefix of affinity rules. | `zookeeper` |
| `zookeeper.enabled` | If True, installs Zookeeper Chart | `true` |
| `zookeeper.url` | URL of Zookeeper Cluster (unneeded if installing Zookeeper Chart) | `""` |
| `zookeeper.port` | Port of Zookeeper Cluster | `2181` |
incubator/kafka/templates/_helpers.tpl
+10 -1
View File
@@ -15,6 +15,15 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified zookeeper name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "kafka.zookeeper.fullname" -}}
{{- $name := default "zookeeper" .Values.zookeeper.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create the name for our kafka configmap.
*/}}
@@ -29,7 +38,7 @@ else use user-provided URL
{{- define "zookeeper.url" }}
{{- $port := .Values.zookeeper.port | toString }}
{{- if .Values.zookeeper.enabled -}}
{{- printf "%s-zookeeper:%s" .Release.Name $port }}
{{- printf "%s:%s" (include "kafka.zookeeper.fullname" .) $port }}
{{- else -}}
{{- printf "%s:%s" .Values.zookeeper.url $port }}
{{- end -}}