Validated Cp 6.0.1 release

- generated binary package
- generated updated doc

Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Confluent Platform Community Edition
 name: cp-helm-charts
-version: 0.5.0
+version: 0.6.0

README.adoc

@@ -29,17 +29,17 @@ The https://github.com/confluentinc/cp-helm-charts[Confluent Platform Helm Chart
 ----
 helm repo add confluentinc https://confluentinc.github.io/cp-helm-charts/   #<1>
 helm repo update    #<2>
-helm install confluentinc/cp-helm-charts --name my-confluent --version 0.5.0    #<3>
+helm install confluentinc/cp-helm-charts --name my-confluent --version 0.6.0    #<3>
 ----
 <1> Add `confluentinc` helm charts repo
 <2> Update repo information 
-<3> Install Confluent Platform with release name «my-confluent» and version `0.5.0` 
+<3> Install Confluent Platform with release name «my-confluent» and version `0.6.0` 
 
 == Contributing
 
 We welcome any contributions:
 
-NOTE: It's not officially supported repo, hence support is on "best effort" basis.
+NOTE: It's not officially supported repo, hence support is on __"best effort"__ basis.
 
 * Report all enhancements, bugs, and tasks as https://github.com/confluentinc/cp-helm-charts/issues[GitHub issues]
 * Provide fixes or enhancements by opening pull requests in GitHub
@@ -73,6 +73,9 @@ These Helm charts have been tested with the following software versions:
 * https://helm.sh/[Helm] 2.8.2+
 * https://hub.docker.com/u/confluentinc/[Confluent Platform Docker Images]
 
+WARNING: This guide assumes that you're Helm 2 (tested with Helm `2.16`).
+You can follow up on Helm 3 issues in https://github.com/confluentinc/cp-helm-charts/issues/480
+
 For local Kubernetes installation with Minikube, see <<create-local-minikube>>.
 
 ==== Install Helm on Kubernetes

charts/cp-kafka-rest/templates/_helpers.tpl

@@ -69,3 +69,19 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- printf "http://%s:8081" (include "cp-kafka-rest.cp-schema-registry.fullname" .) -}}
 {{- end -}}
 {{- end -}}
+
+{{/*Create a default fully qualified kafka headless name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "cp-kafka-rest.cp-kafka-headless.fullname" -}}
+{{- $name := "cp-kafka-headless" -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "cp-kafka-rest.kafka.bootstrapServers" -}}
+{{- if (index .Values "cp-kafka" "bootstrapServers") -}}
+{{- printf "%s" (index .Values "cp-kafka" "bootstrapServers") -}}
+{{- else -}}
+{{- printf "PLAINTEXT://%s:9092" (include "cp-kafka-rest.cp-kafka-headless.fullname" .) -}}
+{{- end -}}
+{{- end -}}

charts/cp-kafka-rest/templates/deployment.yaml

@@ -74,8 +74,8 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: status.podIP
-          - name: KAFKA_REST_ZOOKEEPER_CONNECT
-            value: {{ template "cp-kafka-rest.cp-zookeeper.service-name" . }}
+          - name: KAFKA_REST_BOOTSTRAP_SERVERS
+            value: {{ template "cp-kafka-rest.kafka.bootstrapServers" . }}
           - name: KAFKA_REST_SCHEMA_REGISTRY_URL
             value: {{ template "cp-kafka-rest.cp-schema-registry.service-name" . }}
           - name: KAFKAREST_HEAP_OPTS

charts/cp-kafka-rest/values.yaml

@@ -94,3 +94,6 @@ cp-zookeeper:
 ## e.g. gnoble-panther-cp-schema-registry:8081
 cp-schema-registry:
   url: ""
+
+cp-kafka:
+  bootstrapServers: ""

charts/cp-kafka/templates/NOTES.txt

@@ -25,16 +25,16 @@ To connect from a client pod:
 3. Explore with kafka commands:
 
   # Delete the topic if it exists
-  kafka-topics --zookeeper {{ template "cp-kafka.cp-zookeeper.service-name" . }} --topic {{ template "cp-kafka.fullname" . }}-topic --delete --if-exists
+  kafka-topics --bootstrap-server {{ template "cp-kafka.fullname" . }}-headless:9092 --topic {{ template "cp-kafka.fullname" . }}-topic --delete --if-exists
 
   # Create the topic
-  kafka-topics --zookeeper {{ template "cp-kafka.cp-zookeeper.service-name" . }} --topic {{ template "cp-kafka.fullname" . }}-topic --create --partitions 1 --replication-factor 1 --if-not-exists
+  kafka-topics --bootstrap-server {{ template "cp-kafka.fullname" . }}-headless:9092 --topic {{ template "cp-kafka.fullname" . }}-topic --create --partitions 1 --replication-factor 1 --if-not-exists
 
   # Create a message
   MESSAGE="`date -u`"
 
   # Produce a test message to the topic
-  echo "$MESSAGE" | kafka-console-producer --broker-list {{ template "cp-kafka.fullname" . }}:9092 --topic {{ template "cp-kafka.fullname" . }}-topic && \
+  echo "$MESSAGE" | kafka-console-producer --bootstrap-server {{ template "cp-kafka.fullname" . }}:9092 --topic {{ template "cp-kafka.fullname" . }}-topic && \
 
   # Consume a test message from the topic
   kafka-console-consumer --bootstrap-server {{ template "cp-kafka.fullname" . }}-headless:9092 --topic {{ template "cp-kafka.fullname" . }}-topic --from-beginning --timeout-ms 2000 | grep "$MESSAGE"