From 8dba9d1cb0d58dfa580c02231126da154b5814a6 Mon Sep 17 00:00:00 2001
From: tompizmor <tompizmor@gmail.com>
Date: Mon, 27 Jan 2020 17:58:02 +0100
Subject: [PATCH 1/5] [stable/bitnami] Allow to access Kafka brokers from
 outside K8s cluster

---
 bitnami/kafka/Chart.yaml                      |  2 +-
 bitnami/kafka/README.md                       |  6 +++
 bitnami/kafka/templates/NOTES.txt             | 37 +++++++++++-----
 bitnami/kafka/templates/_helpers.tpl          | 44 +++++++++++++++++++
 bitnami/kafka/templates/statefulset.yaml      | 39 ++++++++++++++++
 .../kafka/templates/svc-external-access.yaml  | 44 +++++++++++++++++++
 bitnami/kafka/values-production.yaml          | 19 ++++++++
 bitnami/kafka/values.yaml                     | 19 ++++++++
 8 files changed, 198 insertions(+), 12 deletions(-)
 create mode 100644 bitnami/kafka/templates/svc-external-access.yaml

diff --git a/bitnami/kafka/Chart.yaml b/bitnami/kafka/Chart.yaml
index 8fb338f2b9b589..bd8250d1b26291 100644
--- a/bitnami/kafka/Chart.yaml
+++ b/bitnami/kafka/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kafka
-version: 7.1.3
+version: 7.2.0
 appVersion: 2.4.0
 description: Apache Kafka is a distributed streaming platform.
 keywords:
diff --git a/bitnami/kafka/README.md b/bitnami/kafka/README.md
index fe1a47bf0d0b80..b22993c06777b3 100644
--- a/bitnami/kafka/README.md
+++ b/bitnami/kafka/README.md
@@ -122,6 +122,12 @@ The following tables lists the configurable parameters of the Kafka chart and th
 | `service.nodePort`                      | Kubernetes Service nodePort                                                                                                                               | `nil`                                                   |
 | `service.loadBalancerIP`                | loadBalancerIP for Kafka Service                                                                                                                          | `nil`                                                   |
 | `service.annotations`                   | Service annotations                                                                                                                                       | ``                                                      |
+| `externalAccess.enabled`               | Enable Kubernetes external cluster access to Kafka brokers                                                                                                 | `false`                                                 |
+| `externalAccess.service.type`          | Kubernetes Servive type for external access. It can be NodePort or LoadBalancer                                                                            | `LoadBalancer`                                          |
+| `externalAccess.service.port`          | Kafka port used for external access when service type is LoadBalancer                                                                                      | `19092`                                                 |
+| `externalAccess.service.loadBalancerIP`| Array of load balancer IPs for Kafka brokers.                                                                                                              | `[]`                                                    |
+| `externalAccess.service.domain`        | Domain or external ip used to configure Kafka external listener when service type is NodePort                                                              | `nil`                                                   |
+| `externalAccess.service.nodePort`      | Array of node ports used to configure Kafka external listener when service type is NodePort                                                                | `[]`                                                    |
 | `serviceAccount.create`                 | Enable creation of ServiceAccount for kafka pod                                                                                                           | `false`                                                 |
 | `serviceAccount.name`                   | Name of the created serviceAccount                                                                                                                        | Generated using the `kafka.fullname` template           |
 | `persistence.enabled`                   | Enable Kafka persistence using PVC, note that Zookeeper perisstency is unaffected                                                                         | `true`                                                  |
diff --git a/bitnami/kafka/templates/NOTES.txt b/bitnami/kafka/templates/NOTES.txt
index 4fd2ce14a858d9..fac55938ea3d24 100644
--- a/bitnami/kafka/templates/NOTES.txt
+++ b/bitnami/kafka/templates/NOTES.txt
@@ -48,26 +48,39 @@ To start a kafka consumer run the following command:
     kubectl --namespace {{ .Release.Namespace }} exec -it $POD_NAME -- kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic test --from-beginning
     {{- end }}
 
-To connect to your Kafka server from outside the cluster execute the following commands:
+{{- if .Values.externalAccess.enabled }}
 
-{{- if contains "NodePort" .Values.service.type }}
+To connect to your Kafka server from outside the cluster check the following information:
 
-    export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-    export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "kafka.fullname" . }})
-    echo "Kafka Broker Endpoint: $NODE_IP:$NODE_PORT"
+{{- if contains "NodePort" .Values.externalAccess.service.type }}
 
-{{- else if contains "LoadBalancer" .Values.service.type }}
+{{- if .Values.externalAccess.service.domain }}
+
+    Kafka brokers domain: Use your provided hostname to reach Kafka brokers, {{ .Values.externalAccess.service.domain }}
+
+{{- else }}
+
+    Kafka brokers domain: You can get the external node ip from the Kafka configuration file with the following command (Check the EXTERNAL listener)
+
+        kubectl exec -it KAFKA_POD -- cat /opt/bitnami/kafka/conf/server.properties | grep advertised.listeners
+
+{{- end }}
+
+    Kafka brokers port: You should have a different node port for each Kafka broker. The list of configured node ports is {{ .Values.externalAccess.service.nodePort }}
+
+{{- else if contains "LoadBalancer" .Values.externalAccess.service.type }}
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
         Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "kafka.fullname" . }}'
 
-    export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kafka.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-    echo "Kafka Broker Endpoint: $SERVICE_IP:9092"
+    Kafka Brokers domain: You will have a different external IP for each Kafka broker. Get the external ip from `-external` suffixed services: `kubectl get svc`.
+    Kafka Brokers port: {{ .Values.externalAccess.service.port }}
 
-{{- else if contains "ClusterIP" .Values.service.type }}
+{{- else }}
 
-    kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "kafka.fullname" . }} 9092:9092 &
-    echo "Kafka Broker Endpoint: 127.0.0.1:9092"
+    Unsupported service type for external access.
+
+{{- end }}
 
 {{- end }}
 {{ if .Values.auth.enabled }}
@@ -98,3 +111,5 @@ WARNING: Rolling tag detected ({{ .Values.image.repository }}:{{ .Values.image.t
 +info https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/
 
 {{- end }}
+
+{{ include "kafka.validateValues" . }}
\ No newline at end of file
diff --git a/bitnami/kafka/templates/_helpers.tpl b/bitnami/kafka/templates/_helpers.tpl
index bc0d74f6fffa0e..2756a70e193a06 100644
--- a/bitnami/kafka/templates/_helpers.tpl
+++ b/bitnami/kafka/templates/_helpers.tpl
@@ -259,3 +259,47 @@ Usage:
         {{- tpl (.value | toYaml) .context }}
     {{- end }}
 {{- end -}}
+
+{{/*
+Compile all warnings into a single message, and call fail.
+*/}}
+{{- define "kafka.validateValues" -}}
+{{- $messages := list -}}
+{{- $messages := append $messages (include "kafka.validateValues.loadBalancerIPListLength" .) -}}
+{{- $messages := append $messages (include "kafka.validateValues.nodePortListLength" .) -}}
+{{- $messages := append $messages (include "kafka.validateValues.externalAccessServiceType" .) -}}
+{{- $messages := without $messages "" -}}
+{{- $message := join "\n" $messages -}}
+
+{{- if $message -}}
+{{-   printf "\nVALUES VALIDATION:\n%s" $message | fail -}}
+{{- end -}}
+{{- end -}}
+
+{{/* Validate values of Kafka - number of replicas must be the same than loadBalancerIP list */}}
+{{- define "kafka.validateValues.loadBalancerIPListLength" -}}
+{{- $replicaCount := int .Values.replicaCount }}
+{{- $loadBalancerIPListLength := len .Values.externalAccess.service.loadBalancerIP }}
+{{- if and ( .Values.externalAccess.enabled ) ( not (eq $replicaCount $loadBalancerIPListLength )) (eq .Values.externalAccess.service.type "LoadBalancer") -}}
+kafka: .Values.externalAccess.service.loadBalancerIP
+    Number of replicas and loadBalancerIP array length must be the same.
+{{- end -}}
+{{- end -}}
+
+{{/* Validate values of Kafka - number of replicas must be the same than NodePort list */}}
+{{- define "kafka.validateValues.nodePortListLength" -}}
+{{- $replicaCount := int .Values.replicaCount }}
+{{- $nodePortListLength := len .Values.externalAccess.service.nodePort }}
+{{- if and ( .Values.externalAccess.enabled ) ( not (eq $replicaCount $nodePortListLength )) (eq .Values.externalAccess.service.type "NodePort") -}}
+kafka: .Values.externalAccess.service.nodePort
+    Number of replicas and nodePort array length must be the same.
+{{- end -}}
+{{- end -}}
+
+{{/* Validate values of Kafka - service type for external access */}}
+{{- define "kafka.validateValues.externalAccessServiceType" -}}
+{{- if and (not (eq .Values.externalAccess.service.type "NodePort")) (not (eq .Values.externalAccess.service.type "LoadBalancer")) -}}
+kafka: .Values.externalAccess.service.type
+    Available servive type for external access are NodePort or LoadBalancer.
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/bitnami/kafka/templates/statefulset.yaml b/bitnami/kafka/templates/statefulset.yaml
index 3937dd7f8f737b..9fb69f67007adc 100644
--- a/bitnami/kafka/templates/statefulset.yaml
+++ b/bitnami/kafka/templates/statefulset.yaml
@@ -59,6 +59,39 @@ spec:
           {{- if .Values.resources }}
           resources: {{ toYaml .Values.resources | nindent 12 }}
           {{- end }}
+          command:
+            - bash
+            - -ec
+            - |
+                HOSTNAME=$(hostname -s)
+                ID=${HOSTNAME:(-1)}
+
+                # Configure external ip and port
+                {{- if eq .Values.externalAccess.service.type "LoadBalancer" }}
+                export EXTERNAL_ACCESS_IP=$(echo '{{ .Values.externalAccess.service.loadBalancerIP }}' | tr -d '[]' | cut -d ' ' -f "$(($ID + 1))")
+                export EXTERNAL_ACCESS_PORT={{ .Values.externalAccess.service.port }}
+                {{- else if eq .Values.externalAccess.service.type "NodePort" }}
+                {{- if .Values.externalAccess.service.domain }}
+                export EXTERNAL_ACCESS_IP={{ .Values.externalAccess.service.domain }}
+                {{- else }}
+                export EXTERNAL_ACCESS_IP=$(curl -s https://ipinfo.io/ip)
+                {{- end }}
+                export EXTERNAL_ACCESS_PORT=$(echo '{{ .Values.externalAccess.service.nodePort }}' | tr -d '[]' | cut -d ' ' -f "$(($ID + 1))")
+                {{- end }}
+
+                # Configure Kafka internal and external listeners
+                {{- if .Values.externalAccess.enabled }}
+                export KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT
+                export KAFKA_CFG_LISTENERS=INTERNAL://:{{ .Values.service.port }},EXTERNAL://:{{ .Values.externalAccess.service.port }}
+                export KAFKA_INTER_BROKER_LISTENER_NAME=INTERNAL
+                {{- if .Values.advertisedListeners }}
+                export KAFKA_CFG_ADVERTISED_LISTENERS={{ .Values.advertisedListeners }}
+                {{- else }}
+                export KAFKA_CFG_ADVERTISED_LISTENERS="INTERNAL://${MY_POD_NAME}.{{ template "kafka.fullname" . }}-headless.{{.Release.Namespace}}.svc.{{ .Values.clusterDomain }}:{{ .Values.service.port }},EXTERNAL://${EXTERNAL_ACCESS_IP}:${EXTERNAL_ACCESS_PORT}"
+                {{- end }}
+                {{- end }}
+
+                exec /entrypoint.sh /run.sh
           env:
             - name: BITNAMI_DEBUG
               value: {{ ternary "true" "false" .Values.image.debug | quote }}
@@ -78,6 +111,7 @@ spec:
               {{- end }}
             - name: KAFKA_PORT_NUMBER
               value: {{ .Values.service.port | quote }}
+            {{- if not .Values.externalAccess.enabled }}
             - name: KAFKA_CFG_LISTENERS
               {{- if .Values.listeners }}
               value: {{ .Values.listeners }}
@@ -98,6 +132,7 @@ spec:
               {{- else }}
               value: 'PLAINTEXT://$(MY_POD_NAME).{{ template "kafka.fullname" . }}-headless.{{.Release.Namespace}}.svc.{{ .Values.clusterDomain }}:$(KAFKA_PORT_NUMBER)'
               {{- end }}
+            {{- end }}
             {{- if .Values.listenerSecurityProtocolMap }}
             - name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP
               value: {{ .Values.listenerSecurityProtocolMap }}
@@ -207,6 +242,10 @@ spec:
             - name: kafka-ssl
               containerPort: 9093
             {{- end }}
+            {{- if and .Values.externalAccess.enabled (eq .Values.externalAccess.service.type "LoadBalancer") }}
+            - name: kafka-external
+              containerPort: 19092
+            {{- end }}
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             tcpSocket:
diff --git a/bitnami/kafka/templates/svc-external-access.yaml b/bitnami/kafka/templates/svc-external-access.yaml
new file mode 100644
index 00000000000000..2620336db10d39
--- /dev/null
+++ b/bitnami/kafka/templates/svc-external-access.yaml
@@ -0,0 +1,44 @@
+{{- if .Values.externalAccess.enabled -}}
+  {{- $fullName := include "kafka.fullname" . }}
+  {{- $replicaCount := .Values.replicaCount | int }}
+  {{- $root := . }}
+
+{{- range $i, $e := until $replicaCount }}
+  {{- $targetPod := printf "%s-%d" (printf "%s" $fullName) $i }}
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "kafka.fullname" $ }}-{{ $i }}-external
+  labels: {{- include "kafka.labels" $ | nindent 4 }}
+    app.kubernetes.io/component: kafka
+    pod: {{ $targetPod }}
+spec:
+  type: {{ $root.Values.externalAccess.service.type }}
+  {{- if eq $root.Values.externalAccess.service.type "LoadBalancer" }}
+  {{- if $root.Values.externalAccess.service.loadBalancerIP }}
+  loadBalancerIP: {{ index $root.Values.externalAccess.service.loadBalancerIP $i }}
+  {{- end }}
+  {{- end }}
+  ports:
+    - name: kafka
+      {{- if eq $root.Values.externalAccess.service.type "LoadBalancer" }}
+      port: {{ $root.Values.externalAccess.service.port }}
+      {{- else }}
+      port: {{ index $root.Values.externalAccess.service.nodePort $i }}
+      {{- end }}
+      {{- if and $root.Values.externalAccess.service.nodePort (eq $root.Values.externalAccess.service.type "NodePort") }}
+      nodePort: {{ index $root.Values.externalAccess.service.nodePort $i }}
+      {{- end }}
+      {{- if eq $root.Values.externalAccess.service.type "LoadBalancer" }}
+      targetPort: kafka-external
+      {{- else }}
+      targetPort: {{ index $root.Values.externalAccess.service.nodePort $i }}
+      {{- end }}
+  selector: {{- include "kafka.matchLabels" $ | nindent 4 }}
+    app.kubernetes.io/component: kafka
+    statefulset.kubernetes.io/pod-name: {{ $targetPod }}
+---
+{{- end }}
+{{- end -}}
\ No newline at end of file
diff --git a/bitnami/kafka/values-production.yaml b/bitnami/kafka/values-production.yaml
index 8926c5e33c2474..e10613f3af6758 100644
--- a/bitnami/kafka/values-production.yaml
+++ b/bitnami/kafka/values-production.yaml
@@ -265,6 +265,25 @@ service:
   ## Service annotations done as key:value pairs
   annotations: {}
 
+externalAccess:
+  enabled: false
+  service:
+    ## Type of service for external access. It can be LoadBalancer or NodePort.
+    ##
+    type: LoadBalancer
+    ## Port used when service type is LoadBalancer
+    ##
+    port: 19092
+    ## Array of load balancer IPs for each Kafka broker. Length must be the same as replicas
+    ##
+    loadBalancerIP: []
+    ## When service type is NodePort, you can specify the domain used for Kafka advertised listeners.
+    ## If not specified, the container will try to get the kubernetes node external IP using: 'curl -s https://ipinfo.io/ip'
+    # domain: mydomain.com
+    ## Array of node ports used for each Kafka broker. Length must be the same as replicas
+    ##
+    nodePort: []
+
 ## Service account for Kafka to use.
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
 ##
diff --git a/bitnami/kafka/values.yaml b/bitnami/kafka/values.yaml
index 95117e3e894ceb..0f8c4aa17f3223 100644
--- a/bitnami/kafka/values.yaml
+++ b/bitnami/kafka/values.yaml
@@ -265,6 +265,25 @@ service:
   ## Service annotations done as key:value pairs
   annotations: {}
 
+externalAccess:
+  enabled: false
+  service:
+    ## Type of service for external access. It can be LoadBalancer or NodePort.
+    ##
+    type: LoadBalancer
+    ## Port used when service type is LoadBalancer
+    ##
+    port: 19092
+    ## Array of load balancer IPs for each Kafka broker. Length must be the same as replicas
+    ##
+    loadBalancerIP: []
+    ## When service type is NodePort, you can specify the domain used for Kafka advertised listeners.
+    ## If not specified, the container will try to get the kubernetes node external IP using: 'curl -s https://ipinfo.io/ip'
+    # domain: mydomain.com
+    ## Array of node ports used for each Kafka broker. Length must be the same as replicas
+    ##
+    nodePort: []
+
 ## Service account for Kafka to use.
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
 ##

From b887560101cede566b054e6990d830fb7203c62a Mon Sep 17 00:00:00 2001
From: tompizmor <tompizmor@gmail.com>
Date: Mon, 27 Jan 2020 18:01:45 +0100
Subject: [PATCH 2/5] Fix linter issues

---
 bitnami/kafka/values-production.yaml | 26 +++++++++++++-------------
 bitnami/kafka/values.yaml            | 26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/bitnami/kafka/values-production.yaml b/bitnami/kafka/values-production.yaml
index e10613f3af6758..78b78f0790e8b9 100644
--- a/bitnami/kafka/values-production.yaml
+++ b/bitnami/kafka/values-production.yaml
@@ -35,7 +35,7 @@ image:
 ## String to partially override kafka.fullname template (will maintain the release name)
 # nameOverride:
 
- ## String to fully override kafka.fullname template
+## String to fully override kafka.fullname template
 # fullnameOverride:
 
 ## Init containers parameters:
@@ -207,16 +207,16 @@ auth:
   enabled: true
 
   ## Enable SSL to be used with brokers and consumers
-  #ssl: false
+  # ssl: false
 
   ## Name of the existing secret containing credentials for brokerUser, interBrokerUser and zookeeperUser.
-  #existingSecret:
+  # existingSecret:
 
   ## Name of the existing secret containing the certificate files that will be used by Kafka.
-  #certificatesSecret:
+  # certificatesSecret:
 
   ## Password for the above certificates if they are password protected.
-  #certificatesPassword:
+  # certificatesPassword:
 
   ## Kafka client user.
   brokerUser: user
@@ -231,10 +231,10 @@ auth:
   # interBrokerPassword:
 
   ## Kafka Zookeeper user.
-  #zookeeperUser:
+  # zookeeperUser:
 
   ## Kafka Zookeeper password.
-  #zookeeperPassword:
+  # zookeeperPassword:
 
 ## Kubernetes Security Context
 ## https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
@@ -515,12 +515,12 @@ metrics:
       ## `whitelistObjectNames: []`
       ##
       overrideConfig: {}
-        # jmxUrl: service:jmx:rmi:///jndi/rmi://127.0.0.1:5555/jmxrmi
-        # lowercaseOutputName: true
-        # lowercaseOutputLabelNames: true
-        # ssl: false
-        # rules:
-        # - pattern: ".*"
+      #   jmxUrl: service:jmx:rmi:///jndi/rmi://127.0.0.1:5555/jmxrmi
+      #   lowercaseOutputName: true
+      #   lowercaseOutputLabelNames: true
+      #   ssl: false
+      #   rules:
+      #   - pattern: ".*"
       ## If you would like to supply your own ConfigMap for JMX metrics, supply the name of that
       ## ConfigMap as an `overrideName` here.
       ##
diff --git a/bitnami/kafka/values.yaml b/bitnami/kafka/values.yaml
index 0f8c4aa17f3223..b7dfdcd1ce0fa3 100644
--- a/bitnami/kafka/values.yaml
+++ b/bitnami/kafka/values.yaml
@@ -35,7 +35,7 @@ image:
 ## String to partially override kafka.fullname template (will maintain the release name)
 # nameOverride:
 
- ## String to fully override kafka.fullname template
+## String to fully override kafka.fullname template
 # fullnameOverride:
 
 ## Init containers parameters:
@@ -207,16 +207,16 @@ auth:
   enabled: false
 
   ## Enable SSL to be used with brokers and consumers
-  #ssl: false
+  # ssl: false
 
   ## Name of the existing secret containing credentials for brokerUser, interBrokerUser and zookeeperUser.
-  #existingSecret:
+  # existingSecret:
 
   ## Name of the existing secret containing the certificate files that will be used by Kafka.
-  #certificatesSecret:
+  # certificatesSecret:
 
   ## Password for the above certificates if they are password protected.
-  #certificatesPassword:
+  # certificatesPassword:
 
   ## Kafka client user.
   brokerUser: user
@@ -231,10 +231,10 @@ auth:
   # interBrokerPassword:
 
   ## Kafka Zookeeper user.
-  #zookeeperUser:
+  # zookeeperUser:
 
   ## Kafka Zookeeper password.
-  #zookeeperPassword:
+  # zookeeperPassword:
 
 ## Kubernetes Security Context
 ## https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
@@ -515,12 +515,12 @@ metrics:
       ## `whitelistObjectNames: []`
       ##
       overrideConfig: {}
-        # jmxUrl: service:jmx:rmi:///jndi/rmi://127.0.0.1:5555/jmxrmi
-        # lowercaseOutputName: true
-        # lowercaseOutputLabelNames: true
-        # ssl: false
-        # rules:
-        # - pattern: ".*"
+      #   jmxUrl: service:jmx:rmi:///jndi/rmi://127.0.0.1:5555/jmxrmi
+      #   lowercaseOutputName: true
+      #   lowercaseOutputLabelNames: true
+      #   ssl: false
+      #   rules:
+      #   - pattern: ".*"
       ## If you would like to supply your own ConfigMap for JMX metrics, supply the name of that
       ## ConfigMap as an `overrideName` here.
       ##

From 136776bf40de8ebc7fcb7d46626e2227ac4347ad Mon Sep 17 00:00:00 2001
From: tompizmor <tompizmor@gmail.com>
Date: Mon, 27 Jan 2020 18:09:54 +0100
Subject: [PATCH 3/5] Set external port for listeners

---
 bitnami/kafka/templates/statefulset.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bitnami/kafka/templates/statefulset.yaml b/bitnami/kafka/templates/statefulset.yaml
index 9fb69f67007adc..aa91a1aae9b5ad 100644
--- a/bitnami/kafka/templates/statefulset.yaml
+++ b/bitnami/kafka/templates/statefulset.yaml
@@ -82,7 +82,7 @@ spec:
                 # Configure Kafka internal and external listeners
                 {{- if .Values.externalAccess.enabled }}
                 export KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT
-                export KAFKA_CFG_LISTENERS=INTERNAL://:{{ .Values.service.port }},EXTERNAL://:{{ .Values.externalAccess.service.port }}
+                export KAFKA_CFG_LISTENERS=INTERNAL://:{{ .Values.service.port }},EXTERNAL://:${EXTERNAL_ACCESS_PORT}
                 export KAFKA_INTER_BROKER_LISTENER_NAME=INTERNAL
                 {{- if .Values.advertisedListeners }}
                 export KAFKA_CFG_ADVERTISED_LISTENERS={{ .Values.advertisedListeners }}

From 32d9f637da450fb239c49925a96c83b31f1de317 Mon Sep 17 00:00:00 2001
From: tompizmor <tompizmor@gmail.com>
Date: Tue, 28 Jan 2020 14:05:27 +0100
Subject: [PATCH 4/5] Add Juan feedback

---
 bitnami/kafka/README.md                       | 29 ++++++++++++
 bitnami/kafka/templates/NOTES.txt             | 10 ++--
 bitnami/kafka/templates/_helpers.tpl          |  6 +--
 .../kafka/templates/scripts-configmap.yaml    | 39 ++++++++++++++++
 bitnami/kafka/templates/statefulset.yaml      | 46 ++++++-------------
 .../kafka/templates/svc-external-access.yaml  | 14 +++---
 6 files changed, 97 insertions(+), 47 deletions(-)
 create mode 100644 bitnami/kafka/templates/scripts-configmap.yaml

diff --git a/bitnami/kafka/README.md b/bitnami/kafka/README.md
index b22993c06777b3..2223d0efb36f77 100644
--- a/bitnami/kafka/README.md
+++ b/bitnami/kafka/README.md
@@ -321,6 +321,35 @@ auth.certificatesSecret=kafka-certificates
 
 > **Note**: If the JKS files are password protected (recommended), you will need to provide the password to get access to the keystores. To do so, use the `auth.certificatesPassword` option to provide your password.
 
+### Accessing Kafka brokers from outside the cluster
+
+In order to access Kafka Brokers from outside the cluster, an additional listener and advertised listener must be configured. Additionally, a specific service per kafka pod will be created.
+
+There are two ways of configuring external access. Using LoadBalancer services or using NodePort services.
+
+#### Using LoadBalancer services
+
+```console
+externalAccess.enabled=true
+externalAccess.service.type=LoadBalancer
+externalAccess.service.port=19092
+externalAccess.service.loadBalancerIP={'external-ip-1', 'external-ip-2'}
+```
+
+You need to know in advance the load balancer IPs so each Kafka broker advertised listener is configured with it.
+
+#### Using NodePort services
+
+```console
+externalAccess.enabled=true
+externalAccess.service.type=NodePort
+externalAccess.service.nodePort={'node-port-1', 'node-port-2'}
+```
+
+You need to know in advance the NodePort that will be exposed for each Kafka broker. It will be used to configure the advertised listener of each broker.
+
+The pod will try to get the external ip of the node using `curl -s https://ipinfo.io/ip` unless `externalAccess.service.domain` is provided.
+
 ## Persistence
 
 The [Bitnami Kafka](https://github.com/bitnami/bitnami-docker-kafka) image stores the Kafka data at the `/bitnami/kafka` path of the container.
diff --git a/bitnami/kafka/templates/NOTES.txt b/bitnami/kafka/templates/NOTES.txt
index fac55938ea3d24..33b74dbb178d0d 100644
--- a/bitnami/kafka/templates/NOTES.txt
+++ b/bitnami/kafka/templates/NOTES.txt
@@ -60,8 +60,12 @@ To connect to your Kafka server from outside the cluster check the following inf
 
 {{- else }}
 
-    Kafka brokers domain: You can get the external node ip from the Kafka configuration file with the following command (Check the EXTERNAL listener)
+    Kafka brokers domain: You can get the external node IP from the Kafka configuration file with the following commands (Check the EXTERNAL listener)
 
+        1. Obtain the pod name:
+        kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ template "kafka.name" . }},app.kubernetes.io/instance={{ .Release.Name }},app.kubernetes.io/component=kafka"
+
+        2. Obtain pod configuration
         kubectl exec -it KAFKA_POD -- cat /opt/bitnami/kafka/conf/server.properties | grep advertised.listeners
 
 {{- end }}
@@ -76,10 +80,6 @@ To connect to your Kafka server from outside the cluster check the following inf
     Kafka Brokers domain: You will have a different external IP for each Kafka broker. Get the external ip from `-external` suffixed services: `kubectl get svc`.
     Kafka Brokers port: {{ .Values.externalAccess.service.port }}
 
-{{- else }}
-
-    Unsupported service type for external access.
-
 {{- end }}
 
 {{- end }}
diff --git a/bitnami/kafka/templates/_helpers.tpl b/bitnami/kafka/templates/_helpers.tpl
index 2756a70e193a06..b777857c37d52c 100644
--- a/bitnami/kafka/templates/_helpers.tpl
+++ b/bitnami/kafka/templates/_helpers.tpl
@@ -265,8 +265,8 @@ Compile all warnings into a single message, and call fail.
 */}}
 {{- define "kafka.validateValues" -}}
 {{- $messages := list -}}
-{{- $messages := append $messages (include "kafka.validateValues.loadBalancerIPListLength" .) -}}
 {{- $messages := append $messages (include "kafka.validateValues.nodePortListLength" .) -}}
+{{- $messages := append $messages (include "kafka.validateValues.loadBalancerIPListLength" .) -}}
 {{- $messages := append $messages (include "kafka.validateValues.externalAccessServiceType" .) -}}
 {{- $messages := without $messages "" -}}
 {{- $message := join "\n" $messages -}}
@@ -281,7 +281,7 @@ Compile all warnings into a single message, and call fail.
 {{- $replicaCount := int .Values.replicaCount }}
 {{- $loadBalancerIPListLength := len .Values.externalAccess.service.loadBalancerIP }}
 {{- if and ( .Values.externalAccess.enabled ) ( not (eq $replicaCount $loadBalancerIPListLength )) (eq .Values.externalAccess.service.type "LoadBalancer") -}}
-kafka: .Values.externalAccess.service.loadBalancerIP
+kafka: externalAccess.service.loadBalancerIP
     Number of replicas and loadBalancerIP array length must be the same.
 {{- end -}}
 {{- end -}}
@@ -299,7 +299,7 @@ kafka: .Values.externalAccess.service.nodePort
 {{/* Validate values of Kafka - service type for external access */}}
 {{- define "kafka.validateValues.externalAccessServiceType" -}}
 {{- if and (not (eq .Values.externalAccess.service.type "NodePort")) (not (eq .Values.externalAccess.service.type "LoadBalancer")) -}}
-kafka: .Values.externalAccess.service.type
+kafka: externalAccess.service.type
     Available servive type for external access are NodePort or LoadBalancer.
 {{- end -}}
 {{- end -}}
\ No newline at end of file
diff --git a/bitnami/kafka/templates/scripts-configmap.yaml b/bitnami/kafka/templates/scripts-configmap.yaml
new file mode 100644
index 00000000000000..ca7a4b584ab94c
--- /dev/null
+++ b/bitnami/kafka/templates/scripts-configmap.yaml
@@ -0,0 +1,39 @@
+{{- if .Values.externalAccess.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "kafka.fullname" . }}-scripts
+  labels: {{- include "kafka.labels" . | nindent 4 }}
+data:
+  setup.sh: |-
+    #!/bin/bash
+
+    HOSTNAME=$(hostname -s)
+    ID=${HOSTNAME:(-1)}
+
+    # Configure external ip and port
+    {{- if eq .Values.externalAccess.service.type "LoadBalancer" }}
+    export EXTERNAL_ACCESS_IP=$(echo '{{ .Values.externalAccess.service.loadBalancerIP }}' | tr -d '[]' | cut -d ' ' -f "$(($ID + 1))")
+    export EXTERNAL_ACCESS_PORT={{ .Values.externalAccess.service.port }}
+    {{- else if eq .Values.externalAccess.service.type "NodePort" }}
+    {{- if .Values.externalAccess.service.domain }}
+    export EXTERNAL_ACCESS_IP={{ .Values.externalAccess.service.domain }}
+    {{- else }}
+    export EXTERNAL_ACCESS_IP=$(curl -s https://ipinfo.io/ip)
+    {{- end }}
+    export EXTERNAL_ACCESS_PORT=$(echo '{{ .Values.externalAccess.service.nodePort }}' | tr -d '[]' | cut -d ' ' -f "$(($ID + 1))")
+    {{- end }}
+
+    # Configure Kafka internal and external listeners
+    export KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT
+    export KAFKA_CFG_LISTENERS=INTERNAL://:{{ .Values.service.port }},EXTERNAL://:${EXTERNAL_ACCESS_PORT}
+    export KAFKA_INTER_BROKER_LISTENER_NAME=INTERNAL
+    {{- if .Values.advertisedListeners }}
+    export KAFKA_CFG_ADVERTISED_LISTENERS={{ .Values.advertisedListeners }}
+    {{- else }}
+    export KAFKA_CFG_ADVERTISED_LISTENERS="INTERNAL://${MY_POD_NAME}.{{ template "kafka.fullname" . }}-headless.{{.Release.Namespace}}.svc.{{ .Values.clusterDomain }}:{{ .Values.service.port }},EXTERNAL://${EXTERNAL_ACCESS_IP}:${EXTERNAL_ACCESS_PORT}"
+    {{- end }}
+
+    exec /entrypoint.sh /run.sh
+
+{{- end }}
\ No newline at end of file
diff --git a/bitnami/kafka/templates/statefulset.yaml b/bitnami/kafka/templates/statefulset.yaml
index aa91a1aae9b5ad..61acf41e1d8848 100644
--- a/bitnami/kafka/templates/statefulset.yaml
+++ b/bitnami/kafka/templates/statefulset.yaml
@@ -59,39 +59,10 @@ spec:
           {{- if .Values.resources }}
           resources: {{ toYaml .Values.resources | nindent 12 }}
           {{- end }}
+          {{- if .Values.externalAccess.enabled }}
           command:
-            - bash
-            - -ec
-            - |
-                HOSTNAME=$(hostname -s)
-                ID=${HOSTNAME:(-1)}
-
-                # Configure external ip and port
-                {{- if eq .Values.externalAccess.service.type "LoadBalancer" }}
-                export EXTERNAL_ACCESS_IP=$(echo '{{ .Values.externalAccess.service.loadBalancerIP }}' | tr -d '[]' | cut -d ' ' -f "$(($ID + 1))")
-                export EXTERNAL_ACCESS_PORT={{ .Values.externalAccess.service.port }}
-                {{- else if eq .Values.externalAccess.service.type "NodePort" }}
-                {{- if .Values.externalAccess.service.domain }}
-                export EXTERNAL_ACCESS_IP={{ .Values.externalAccess.service.domain }}
-                {{- else }}
-                export EXTERNAL_ACCESS_IP=$(curl -s https://ipinfo.io/ip)
-                {{- end }}
-                export EXTERNAL_ACCESS_PORT=$(echo '{{ .Values.externalAccess.service.nodePort }}' | tr -d '[]' | cut -d ' ' -f "$(($ID + 1))")
-                {{- end }}
-
-                # Configure Kafka internal and external listeners
-                {{- if .Values.externalAccess.enabled }}
-                export KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT
-                export KAFKA_CFG_LISTENERS=INTERNAL://:{{ .Values.service.port }},EXTERNAL://:${EXTERNAL_ACCESS_PORT}
-                export KAFKA_INTER_BROKER_LISTENER_NAME=INTERNAL
-                {{- if .Values.advertisedListeners }}
-                export KAFKA_CFG_ADVERTISED_LISTENERS={{ .Values.advertisedListeners }}
-                {{- else }}
-                export KAFKA_CFG_ADVERTISED_LISTENERS="INTERNAL://${MY_POD_NAME}.{{ template "kafka.fullname" . }}-headless.{{.Release.Namespace}}.svc.{{ .Values.clusterDomain }}:{{ .Values.service.port }},EXTERNAL://${EXTERNAL_ACCESS_IP}:${EXTERNAL_ACCESS_PORT}"
-                {{- end }}
-                {{- end }}
-
-                exec /entrypoint.sh /run.sh
+            - /scripts/setup.sh
+          {{- end }}
           env:
             - name: BITNAMI_DEBUG
               value: {{ ternary "true" "false" .Values.image.debug | quote }}
@@ -267,6 +238,11 @@ spec:
             failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
           {{- end }}
           volumeMounts:
+            {{- if .Values.externalAccess.enabled }}
+            - name: scripts
+              mountPath: /scripts/setup.sh
+              subPath: setup.sh
+            {{- end }}
             {{- if .Values.persistence.enabled }}
             - name: data
               mountPath: /bitnami/kafka
@@ -306,6 +282,12 @@ spec:
               mountPath: /etc/jmx-kafka
         {{ end }}
       volumes:
+        {{- if .Values.externalAccess.enabled }}
+        - name: scripts
+          configMap:
+            name: {{ include "kafka.fullname" . }}-scripts
+            defaultMode: 0755
+        {{- end }}
         {{ if .Values.metrics.jmx.enabled }}
         - name: jmx-config
           configMap:
diff --git a/bitnami/kafka/templates/svc-external-access.yaml b/bitnami/kafka/templates/svc-external-access.yaml
index 2620336db10d39..7d181430302b83 100644
--- a/bitnami/kafka/templates/svc-external-access.yaml
+++ b/bitnami/kafka/templates/svc-external-access.yaml
@@ -1,10 +1,10 @@
-{{- if .Values.externalAccess.enabled -}}
-  {{- $fullName := include "kafka.fullname" . }}
-  {{- $replicaCount := .Values.replicaCount | int }}
-  {{- $root := . }}
+{{- if .Values.externalAccess.enabled }}
+{{- $fullName := include "kafka.fullname" . }}
+{{- $replicaCount := .Values.replicaCount | int }}
+{{- $root := . }}
 
 {{- range $i, $e := until $replicaCount }}
-  {{- $targetPod := printf "%s-%d" (printf "%s" $fullName) $i }}
+{{- $targetPod := printf "%s-%d" (printf "%s" $fullName) $i }}
 
 ---
 apiVersion: v1
@@ -28,7 +28,7 @@ spec:
       {{- else }}
       port: {{ index $root.Values.externalAccess.service.nodePort $i }}
       {{- end }}
-      {{- if and $root.Values.externalAccess.service.nodePort (eq $root.Values.externalAccess.service.type "NodePort") }}
+      {{- if $root.Values.externalAccess.service.nodePort }}
       nodePort: {{ index $root.Values.externalAccess.service.nodePort $i }}
       {{- end }}
       {{- if eq $root.Values.externalAccess.service.type "LoadBalancer" }}
@@ -41,4 +41,4 @@ spec:
     statefulset.kubernetes.io/pod-name: {{ $targetPod }}
 ---
 {{- end }}
-{{- end -}}
\ No newline at end of file
+{{- end }}
\ No newline at end of file

From 02782c658580090e37a710aea34dc0303f88bf19 Mon Sep 17 00:00:00 2001
From: tompizmor <tompizmor@gmail.com>
Date: Tue, 28 Jan 2020 14:16:39 +0100
Subject: [PATCH 5/5] Add missing colon

---
 bitnami/kafka/templates/NOTES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bitnami/kafka/templates/NOTES.txt b/bitnami/kafka/templates/NOTES.txt
index 33b74dbb178d0d..2ecbaeb79e7e32 100644
--- a/bitnami/kafka/templates/NOTES.txt
+++ b/bitnami/kafka/templates/NOTES.txt
@@ -65,7 +65,7 @@ To connect to your Kafka server from outside the cluster check the following inf
         1. Obtain the pod name:
         kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ template "kafka.name" . }},app.kubernetes.io/instance={{ .Release.Name }},app.kubernetes.io/component=kafka"
 
-        2. Obtain pod configuration
+        2. Obtain pod configuration:
         kubectl exec -it KAFKA_POD -- cat /opt/bitnami/kafka/conf/server.properties | grep advertised.listeners
 
 {{- end }}