Add support for custom annotations on headless service (helm#7086)

* Add support for custom annotations & targetPort on the Kafka headless service * Add docs for headless. * Add missing starting space in comment
Chr1st0ph · Aug 8, 2018 · 1b3c4eb · 1b3c4eb
1 parent eb70660
commit 1b3c4eb
Show file tree

Hide file tree

Showing 4 changed files with 18 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.8.5
+version: 0.8.6
 appVersion: 4.1.1
 keywords:
 - kafka

diff --git a/incubator/kafka/README.md b/incubator/kafka/README.md
@@ -67,6 +67,9 @@ following configurable parameters:
 | `schedulerName`                                | Name of Kubernetes scheduler (other than the default)                                                                                                                    | `nil`                                                              |
 | `affinity`                                     | Defines affinities and anti-affinities for pods as defined in: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity preferences | `{}`                                                               |
 | `tolerations`                                  | List of node tolerations for the pods. https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/                                                           | `[]`                                                               |
+| `headless.annotations`                                  | List of annotations for the headless service. https://kubernetes.io/docs/concepts/services-networking/service/#headless-services                                                            | `[]`                                                               |
+| `headless.targetPort`                                  | Target port to be used for the headless service. This is not a required value.                                                            | `nil`                                                               |
+| `headless.port`                                  | Port to be used for the headless service. https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/                                                           | `9092`                                                               |
 | `external.enabled`                             | If True, exposes Kafka brokers via NodePort (PLAINTEXT by default)                                                                                                       | `false`                                                            |
 | `external.servicePort`                         | TCP port configured at external services (one per pod) to relay from NodePort to the external listener port.                                                             | '19092'                                                            |
 | `external.firstListenerPort`                   | TCP port which is added pod index number to arrive at the port used for NodePort and external listener port.                                                             | '31090'                                                            |

diff --git a/incubator/kafka/templates/service-headless.yaml b/incubator/kafka/templates/service-headless.yaml
@@ -9,10 +9,16 @@ metadata:
     heritage: {{ .Release.Service }}
   annotations:
     service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+{{- if .Values.headless.annotations }}
+{{ .Values.headless.annotations | toYaml | trimSuffix "\n" | indent 4 }}
+{{- end }}
 spec:
   ports:
   - name: broker
-    port: 9092
+    port: {{ .Values.headless.port }}
+{{- if .Values.headless.targetPort }}
+    targetPort: {{ .Values.headless.targetPort }}
+{{- end }}
   clusterIP: None
   selector:
     app: {{ include "kafka.name" . }}

diff --git a/incubator/kafka/values.yaml b/incubator/kafka/values.yaml
@@ -110,6 +110,13 @@ tolerations: []
 #   value: "value"
 #   effect: "NoSchedule"
 
+## Headless service.
+##
+headless:
+  # annotations:
+  # targetPort:
+  port: 9092
+
 ## External access.
 ##
 external: