From 5937c6d5cf65451e5bf6713312d6efcb8819ac8f Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Tue, 21 Mar 2023 17:13:15 +0100 Subject: [PATCH] [bitnami/nats] Add support for service.headless.annotations (#15437) * [bitnami/nats] Add support for service.headless.annotations Signed-off-by: Miguel Ruiz * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers --------- Signed-off-by: Miguel Ruiz Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/nats/Chart.yaml | 2 +- bitnami/nats/README.md | 1 + bitnami/nats/templates/headless-svc.yaml | 10 ++++++++-- bitnami/nats/values.yaml | 6 ++++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/bitnami/nats/Chart.yaml b/bitnami/nats/Chart.yaml index eb16277bd0..ebde2ff013 100644 --- a/bitnami/nats/Chart.yaml +++ b/bitnami/nats/Chart.yaml @@ -24,4 +24,4 @@ name: nats sources: - https://github.com/bitnami/containers/tree/main/bitnami/nats - https://nats.io/ -version: 7.5.13 +version: 7.6.0 diff --git a/bitnami/nats/README.md b/bitnami/nats/README.md index cd2f9a7a9b..bbf53d107e 100644 --- a/bitnami/nats/README.md +++ b/bitnami/nats/README.md @@ -191,6 +191,7 @@ The command removes all the Kubernetes components associated with the chart and | `service.externalTrafficPolicy` | NATS service external traffic policy | `Cluster` | | `service.annotations` | Additional custom annotations for NATS service | `{}` | | `service.extraPorts` | Extra ports to expose in the NATS service (normally used with the `sidecar` value) | `[]` | +| `service.headless.annotations` | Annotations for the headless service. | `{}` | | `ingress.enabled` | Set to true to enable ingress record generation | `false` | | `ingress.pathType` | Ingress Path type | `ImplementationSpecific` | | `ingress.apiVersion` | Override API Version (automatically detected if not set) | `""` | diff --git a/bitnami/nats/templates/headless-svc.yaml b/bitnami/nats/templates/headless-svc.yaml index 0f0eb97ee8..bb1ea56ca7 100644 --- a/bitnami/nats/templates/headless-svc.yaml +++ b/bitnami/nats/templates/headless-svc.yaml @@ -7,8 +7,14 @@ metadata: {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} - {{- if .Values.commonAnnotations }} - annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- if or .Values.commonAnnotations .Values.service.headless.annotations }} + annotations: + {{- if .Values.service.headless.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.service.headless.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} {{- end }} spec: type: ClusterIP diff --git a/bitnami/nats/values.yaml b/bitnami/nats/values.yaml index 4c9fbdd708..0d0270fc62 100644 --- a/bitnami/nats/values.yaml +++ b/bitnami/nats/values.yaml @@ -550,6 +550,12 @@ service: ## @param service.extraPorts Extra ports to expose in the NATS service (normally used with the `sidecar` value) ## extraPorts: [] + ## Headless service properties + ## + headless: + ## @param service.headless.annotations Annotations for the headless service. + ## + annotations: {} ## NATS ingress parameters ## ref: https://kubernetes.io/docs/user-guide/ingress/ ##