From 0f92db5dd4f9a95f7dd12e4044a42d99bf81f9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n-Garc=C3=ADa?= Date: Fri, 19 Jan 2024 10:15:40 +0100 Subject: [PATCH] [bitnami/rabbitmq] fix: :lock: Move service-account token auto-mount to pod declaration (#22453) Signed-off-by: Javier Salmeron Garcia --- bitnami/rabbitmq/Chart.yaml | 2 +- bitnami/rabbitmq/README.md | 15 ++++++++------- bitnami/rabbitmq/templates/statefulset.yaml | 1 + bitnami/rabbitmq/values.yaml | 5 ++++- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/bitnami/rabbitmq/Chart.yaml b/bitnami/rabbitmq/Chart.yaml index 183bd6ad0f..1d9052361b 100644 --- a/bitnami/rabbitmq/Chart.yaml +++ b/bitnami/rabbitmq/Chart.yaml @@ -30,4 +30,4 @@ maintainers: name: rabbitmq sources: - https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq -version: 12.7.1 +version: 12.8.0 diff --git a/bitnami/rabbitmq/README.md b/bitnami/rabbitmq/README.md index 1ef730390f..535ab5cec8 100644 --- a/bitnami/rabbitmq/README.md +++ b/bitnami/rabbitmq/README.md @@ -91,6 +91,7 @@ The command removes all the Kubernetes components associated with the chart and | `diagnosticMode.enabled` | Enable diagnostic mode (all probes will be disabled and the command will be overridden) | `false` | | `diagnosticMode.command` | Command to override all containers in the deployment | `["sleep"]` | | `diagnosticMode.args` | Args to override all containers in the deployment | `["infinity"]` | +| `automountServiceAccountToken` | Mount Service Account token in pod | `true` | | `hostAliases` | Deployment pod host aliases | `[]` | | `dnsPolicy` | DNS Policy for pod | `""` | | `dnsConfig` | DNS Configuration pod | `{}` | @@ -254,13 +255,13 @@ The command removes all the Kubernetes components associated with the chart and ### RBAC parameters -| Name | Description | Value | -| --------------------------------------------- | ------------------------------------------------------------------------------------------ | ------ | -| `serviceAccount.create` | Enable creation of ServiceAccount for RabbitMQ pods | `true` | -| `serviceAccount.name` | Name of the created serviceAccount | `""` | -| `serviceAccount.automountServiceAccountToken` | Auto-mount the service account token in the pod | `true` | -| `serviceAccount.annotations` | Annotations for service account. Evaluated as a template. Only used if `create` is `true`. | `{}` | -| `rbac.create` | Whether RBAC rules should be created | `true` | +| Name | Description | Value | +| --------------------------------------------- | ------------------------------------------------------------------------------------------ | ------- | +| `serviceAccount.create` | Enable creation of ServiceAccount for RabbitMQ pods | `true` | +| `serviceAccount.name` | Name of the created serviceAccount | `""` | +| `serviceAccount.automountServiceAccountToken` | Auto-mount the service account token in the pod | `false` | +| `serviceAccount.annotations` | Annotations for service account. Evaluated as a template. Only used if `create` is `true`. | `{}` | +| `rbac.create` | Whether RBAC rules should be created | `true` | ### Persistence parameters diff --git a/bitnami/rabbitmq/templates/statefulset.yaml b/bitnami/rabbitmq/templates/statefulset.yaml index 619c09991b..74fe0207e2 100644 --- a/bitnami/rabbitmq/templates/statefulset.yaml +++ b/bitnami/rabbitmq/templates/statefulset.yaml @@ -58,6 +58,7 @@ spec: podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAntiAffinityPreset "customLabels" $podLabels "context" $) | nindent 10 }} nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.nodeAffinityPreset.type "key" .Values.nodeAffinityPreset.key "values" .Values.nodeAffinityPreset.values) | nindent 10 }} {{- end }} + automountServiceAccountToken: {{ .Values.automountServiceAccountToken }} {{- if .Values.hostAliases }} hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }} {{- end }} diff --git a/bitnami/rabbitmq/values.yaml b/bitnami/rabbitmq/values.yaml index 7a7ae79f9e..0691089604 100644 --- a/bitnami/rabbitmq/values.yaml +++ b/bitnami/rabbitmq/values.yaml @@ -112,6 +112,9 @@ diagnosticMode: args: - infinity +## @param automountServiceAccountToken Mount Service Account token in pod +## +automountServiceAccountToken: true ## @param hostAliases Deployment pod host aliases ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ ## @@ -919,7 +922,7 @@ serviceAccount: name: "" ## @param serviceAccount.automountServiceAccountToken Auto-mount the service account token in the pod ## - automountServiceAccountToken: true + automountServiceAccountToken: false ## @param serviceAccount.annotations Annotations for service account. Evaluated as a template. Only used if `create` is `true`. ## annotations: {}