From 095ae5eb4d245e308039e4a0e338a34a36f07ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro?= Date: Thu, 7 May 2020 18:25:09 +0200 Subject: [PATCH] [incubator/kafka] Added external.labels to external services similar to external.annotations (#21390) Signed-off-by: Alvaro Gonzalez --- incubator/kafka/Chart.yaml | 2 +- incubator/kafka/README.md | 1 + incubator/kafka/templates/service-brokers-external.yaml | 3 +++ incubator/kafka/values.yaml | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/incubator/kafka/Chart.yaml b/incubator/kafka/Chart.yaml index 120a340ccb..cec68a11bc 100755 --- 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.21.1 +version: 0.21.2 appVersion: 5.0.1 keywords: - kafka diff --git a/incubator/kafka/README.md b/incubator/kafka/README.md index 25f7fc7b3a..d0011e0e05 100644 --- a/incubator/kafka/README.md +++ b/incubator/kafka/README.md @@ -82,6 +82,7 @@ following configurable parameters: | `external.type` | Service Type. | `NodePort` | | `external.distinct` | Distinct DNS entries for each created A record. | `false` | | `external.annotations` | Additional annotations for the external service. | `{}` | +| `external.labels` | Additional labels for the external service. | `{}` | | `external.loadBalancerIP` | Add Static IP to the type Load Balancer. Depends on the provider if enabled | `[]` | `external.loadBalancerSourceRanges` | Add IP ranges that are allowed to access the Load Balancer. | `[]` | `podAnnotations` | Annotation to be added to Kafka pods | `{}` | diff --git a/incubator/kafka/templates/service-brokers-external.yaml b/incubator/kafka/templates/service-brokers-external.yaml index 3d35a8e3ff..e862728ced 100644 --- a/incubator/kafka/templates/service-brokers-external.yaml +++ b/incubator/kafka/templates/service-brokers-external.yaml @@ -38,6 +38,9 @@ metadata: labels: {{- include "kafka.broker.labels" $root | nindent 4 }} pod: {{ $responsiblePod | quote }} + {{- if $root.Values.external.labels }} +{{ toYaml $root.Values.external.labels | indent 4 }} + {{- end }} spec: type: {{ $root.Values.external.type }} ports: diff --git a/incubator/kafka/values.yaml b/incubator/kafka/values.yaml index ceddc24913..c9e608cb29 100644 --- a/incubator/kafka/values.yaml +++ b/incubator/kafka/values.yaml @@ -142,6 +142,9 @@ external: type: NodePort # annotations: # service.beta.kubernetes.io/openstack-internal-load-balancer: "true" + # Labels to be added to external services + # labels: + # aLabel: "value" dns: useInternal: false useExternal: true