From 6ac47383407b71c51ca321730b479f8a8d15a613 Mon Sep 17 00:00:00 2001 From: fabien-marchand <121696575+fabien-marchand@users.noreply.github.com> Date: Mon, 16 Jan 2023 11:17:01 +0100 Subject: [PATCH] [bitnami/zookeeper] Configure headless service name (#14144) * [bitnami/zookeeper] Configure headless service name suffix A new configuration parameter `service.headless.nameSuffix` now allows to override the default "headless" name given to the headless service. Signed-off-by: Fabien Marchand * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers Signed-off-by: Fabien Marchand Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/zookeeper/Chart.yaml | 2 +- bitnami/zookeeper/README.md | 1 + bitnami/zookeeper/templates/statefulset.yaml | 2 +- bitnami/zookeeper/templates/svc-headless.yaml | 2 +- bitnami/zookeeper/values.yaml | 2 ++ 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bitnami/zookeeper/Chart.yaml b/bitnami/zookeeper/Chart.yaml index cd2e3bc3d6..f6043e72de 100644 --- a/bitnami/zookeeper/Chart.yaml +++ b/bitnami/zookeeper/Chart.yaml @@ -22,4 +22,4 @@ name: zookeeper sources: - https://github.com/bitnami/containers/tree/main/bitnami/zookeeper - https://zookeeper.apache.org/ -version: 11.0.3 +version: 11.1.0 diff --git a/bitnami/zookeeper/README.md b/bitnami/zookeeper/README.md index a320784671..7a1c17ffb8 100644 --- a/bitnami/zookeeper/README.md +++ b/bitnami/zookeeper/README.md @@ -216,6 +216,7 @@ The command removes all the Kubernetes components associated with the chart and | `service.extraPorts` | Extra ports to expose in the ZooKeeper service (normally used with the `sidecar` value) | `[]` | | `service.headless.annotations` | Annotations for the Headless Service | `{}` | | `service.headless.publishNotReadyAddresses` | If the ZooKeeper headless service should publish DNS records for not ready pods | `true` | +| `service.headless.servicenameOverride` | String to partially override headless service name | `""` | | `networkPolicy.enabled` | Specifies whether a NetworkPolicy should be created | `false` | | `networkPolicy.allowExternal` | Don't require client label for connections | `true` | diff --git a/bitnami/zookeeper/templates/statefulset.yaml b/bitnami/zookeeper/templates/statefulset.yaml index 025d3630b2..aa4f1a9714 100644 --- a/bitnami/zookeeper/templates/statefulset.yaml +++ b/bitnami/zookeeper/templates/statefulset.yaml @@ -18,7 +18,7 @@ spec: selector: matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} app.kubernetes.io/component: zookeeper - serviceName: {{ printf "%s-headless" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }} + serviceName: {{ printf "%s-%s" (include "common.names.fullname" .) (default "headless" .Values.service.headless.servicenameOverride) | trunc 63 | trimSuffix "-" }} {{- if .Values.updateStrategy }} updateStrategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/bitnami/zookeeper/templates/svc-headless.yaml b/bitnami/zookeeper/templates/svc-headless.yaml index ee05e1decc..e7ab496cfd 100644 --- a/bitnami/zookeeper/templates/svc-headless.yaml +++ b/bitnami/zookeeper/templates/svc-headless.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ printf "%s-headless" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }} + name: {{ printf "%s-%s" (include "common.names.fullname" .) (default "headless" .Values.service.headless.servicenameOverride) | trunc 63 | trimSuffix "-" }} namespace: {{ template "zookeeper.namespace" . }} labels: {{- include "common.labels.standard" . | nindent 4 }} app.kubernetes.io/component: zookeeper diff --git a/bitnami/zookeeper/values.yaml b/bitnami/zookeeper/values.yaml index ab56bd27de..b9d59000df 100644 --- a/bitnami/zookeeper/values.yaml +++ b/bitnami/zookeeper/values.yaml @@ -539,10 +539,12 @@ service: extraPorts: [] ## @param service.headless.annotations Annotations for the Headless Service ## @param service.headless.publishNotReadyAddresses If the ZooKeeper headless service should publish DNS records for not ready pods + ## @param service.headless.servicenameOverride String to partially override headless service name ## headless: publishNotReadyAddresses: true annotations: {} + servicenameOverride: "" ## Network policies ## Ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/ ##