Add bump2version and bump to 600 (confluentinc#477)

* Add bumpversion config * Bump Version: 5.5.0 → 6.0.0 * Bump Version: 6.0.0 → 6.0.1
wdshrk · Dec 9, 2020 · ced4f67 · ced4f67
2 parents 7b15e2a + 1d9dc18
commit ced4f67
Show file tree

Hide file tree

Showing 28 changed files with 355 additions and 292 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -0,0 +1,14 @@
+[bumpversion]
+current_version = 6.0.1
+commit = true
+message = Bump Version: {current_version} → {new_version}
+tag = false
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
+serialize = 
+	{major}.{minor}.{patch}
+
+[bumpversion:glob:**/values.yaml]
+
+[bumpversion:glob:examples/*.yaml]
+
+[bumpversion:glob:**/README.md]
diff --git a/Chart.yaml b/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
diff --git a/README.adoc b/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

diff --git a/charts/cp-control-center/values.yaml b/charts/cp-control-center/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 ## Image Info
 ## ref: https://hub.docker.com/r/confluentinc/cp-kafka/
 image: confluentinc/cp-enterprise-control-center
-imageTag: 5.5.0
+imageTag: 6.0.1
 
 ## Specify a imagePullPolicy
 ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

diff --git a/charts/cp-kafka-connect/README.md b/charts/cp-kafka-connect/README.md
@@ -93,7 +93,7 @@ The configuration parameters in this section control the resources requested and
 | Parameter | Description | Default |
 | --------- | ----------- | ------- |
 | `image` | Docker Image of Confluent Kafka Connect. | `confluentinc/cp-kafka-connect` |
-| `imageTag` | Docker Image Tag of Confluent Kafka Connect. | `5.5.0` |
+| `imageTag` | Docker Image Tag of Confluent Kafka Connect. | `6.0.1` |
 | `imagePullPolicy` | Docker Image Tag of Confluent Kafka Connect. | `IfNotPresent` |
 | `imagePullSecrets` | Secrets to be used for private registries. | see [values.yaml](values.yaml) for details |
 

diff --git a/charts/cp-kafka-connect/values.yaml b/charts/cp-kafka-connect/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 ## Image Info
 ## ref: https://hub.docker.com/r/confluentinc/cp-kafka/
 image: confluentinc/cp-kafka-connect
-imageTag: 5.5.0
+imageTag: 6.0.1
 
 ## Specify a imagePullPolicy
 ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

diff --git a/charts/cp-kafka-rest/README.md b/charts/cp-kafka-rest/README.md
@@ -98,7 +98,7 @@ The configuration parameters in this section control the resources requested and
 | Parameter | Description | Default |
 | --------- | ----------- | ------- |
 | `image` | Docker Image of Confluent REST Proxy. | `confluentinc/cp-kafka-rest` |
-| `imageTag` | Docker Image Tag of Confluent REST Proxy. | `5.5.0` |
+| `imageTag` | Docker Image Tag of Confluent REST Proxy. | `6.0.1` |
 | `imagePullPolicy` | Docker Image Tag of Confluent REST Proxy. | `IfNotPresent` |
 | `imagePullSecrets` | Secrets to be used for private registries. | see [values.yaml](values.yaml) for details |
 

diff --git a/charts/cp-kafka-rest/templates/_helpers.tpl b/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 -}}
diff --git a/charts/cp-kafka-rest/templates/deployment.yaml b/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

diff --git a/charts/cp-kafka-rest/values.yaml b/charts/cp-kafka-rest/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 ## Image Info
 ## ref: https://hub.docker.com/r/confluentinc/cp-kafka/
 image: confluentinc/cp-kafka-rest
-imageTag: 5.5.0
+imageTag: 6.0.1
 
 ## Specify a imagePullPolicy
 ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -94,3 +94,6 @@ cp-zookeeper:
 ## e.g. gnoble-panther-cp-schema-registry:8081
 cp-schema-registry:
   url: ""
+
+cp-kafka:
+  bootstrapServers: ""
diff --git a/charts/cp-kafka/README.md b/charts/cp-kafka/README.md
@@ -115,7 +115,7 @@ The configuration parameters in this section control the resources requested and
 | Parameter | Description | Default |
 | --------- | ----------- | ------- |
 | `image` | Docker Image of Confluent Kafka. | `confluentinc/cp-enterprise-kafka` |
-| `imageTag` | Docker Image Tag of Confluent Kafka. | `5.5.0` |
+| `imageTag` | Docker Image Tag of Confluent Kafka. | `6.0.1` |
 | `imagePullPolicy` | Docker Image Tag of Confluent Kafka. | `IfNotPresent` |
 | `imagePullSecrets` | Secrets to be used for private registries. | see [values.yaml](values.yaml) for details |
 

diff --git a/charts/cp-kafka/templates/NOTES.txt b/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"
diff --git a/charts/cp-kafka/values.yaml b/charts/cp-kafka/values.yaml
@@ -12,7 +12,7 @@ brokers: 3
 ## Image Info
 ## ref: https://hub.docker.com/r/confluentinc/cp-kafka/
 image: confluentinc/cp-enterprise-kafka
-imageTag: 5.5.0
+imageTag: 6.0.1
 
 ## Specify a imagePullPolicy
 ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

diff --git a/charts/cp-ksql-server/README.md b/charts/cp-ksql-server/README.md
@@ -108,7 +108,7 @@ The configuration parameters in this section control the resources requested and
 | Parameter | Description | Default |
 | --------- | ----------- | ------- |
 | `image` | Docker Image of Confluent KSQL Server. | `confluentinc/cp-ksql-server` |
-| `imageTag` | Docker Image Tag of Confluent KSQL Server. | `5.5.0` |
+| `imageTag` | Docker Image Tag of Confluent KSQL Server. | `6.0.1` |
 | `imagePullPolicy` | Docker Image Tag of Confluent KSQL Server. | `IfNotPresent` |
 | `imagePullSecrets` | Secrets to be used for private registries. | see [values.yaml](values.yaml) for details |
 

diff --git a/charts/cp-ksql-server/values.yaml b/charts/cp-ksql-server/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 ## Image Info
 ## ref: https://hub.docker.com/r/confluentinc/cp-ksql-server/
 image: confluentinc/cp-ksqldb-server
-imageTag: 5.5.0
+imageTag: 6.0.1
 
 ## Specify a imagePullPolicy
 ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

diff --git a/charts/cp-schema-registry/README.md b/charts/cp-schema-registry/README.md
@@ -95,7 +95,7 @@ The configuration parameters in this section control the resources requested and
 | Parameter | Description | Default |
 | --------- | ----------- | ------- |
 | `image` | Docker Image of Confluent Schema Registry. | `confluentinc/cp-schema-registry` |
-| `imageTag` | Docker Image Tag of Confluent Schema Registry. | `5.5.0` |
+| `imageTag` | Docker Image Tag of Confluent Schema Registry. | `6.0.1` |
 | `imagePullPolicy` | Docker Image Tag of Confluent Schema Registry. | `IfNotPresent` |
 | `imagePullSecrets` | Secrets to be used for private registries. | see [values.yaml](values.yaml) for details |
 

diff --git a/charts/cp-schema-registry/values.yaml b/charts/cp-schema-registry/values.yaml
@@ -12,7 +12,7 @@ replicaCount: 1
 ## Image Info
 ## ref: https://hub.docker.com/r/confluentinc/cp-schema-registry/
 image: confluentinc/cp-schema-registry
-imageTag: 5.5.0
+imageTag: 6.0.1
 
 ## Specify a imagePullPolicy
 ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

diff --git a/charts/cp-zookeeper/README.md b/charts/cp-zookeeper/README.md
@@ -109,7 +109,7 @@ The configuration parameters in this section control the resources requested and
 | Parameter | Description | Default |
 | --------- | ----------- | ------- |
 | `image` | Docker Image of Confluent Zookeeper. | `confluentinc/cp-zookeeper` |
-| `imageTag` | Docker Image Tag of Confluent Zookeeper. | `5.5.0` |
+| `imageTag` | Docker Image Tag of Confluent Zookeeper. | `6.0.1` |
 | `imagePullPolicy` | Docker Image Tag of Confluent Zookeeper. | `IfNotPresent` |
 | `imagePullSecrets` | Secrets to be used for private registries. | see [values.yaml](values.yaml) for details |
 

diff --git a/charts/cp-zookeeper/values.yaml b/charts/cp-zookeeper/values.yaml
@@ -15,7 +15,7 @@ servers: 3
 ## Images Info
 ## ref: https://hub.docker.com/r/confluentinc/cp-zookeeper/
 image: confluentinc/cp-zookeeper
-imageTag: 5.5.0
+imageTag: 6.0.1
 
 ## Specify a imagePullPolicy
 ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

diff --git a/docs/cp-helm-charts-0.6.0.tgz b/docs/cp-helm-charts-0.6.0.tgz