Merge branch 'master' into bugfix/hpa-version

pmint93 · Jun 4, 2024 · c20059f · c20059f
2 parents 3c47f85 + d34d68c
commit c20059f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/charts/metabase/templates/deployment.yaml b/charts/metabase/templates/deployment.yaml
@@ -307,6 +307,7 @@ spec:
       priorityClassName: {{ .Values.priorityClass }}
       {{- end }}
       serviceAccountName: {{ template "metabase.serviceAccountName" . }}
+      automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
       volumes:
         {{- if or .Values.log4jProperties .Values.log4j2XML }}
         - name: config

diff --git a/charts/metabase/templates/serviceaccount.yaml b/charts/metabase/templates/serviceaccount.yaml
@@ -1,6 +1,7 @@
 {{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
+automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
 metadata:
   name: {{ include "metabase.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}

diff --git a/charts/metabase/values.yaml b/charts/metabase/values.yaml
@@ -234,6 +234,10 @@ serviceAccount:
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
   name:
+  # autoMount is deprecated in favor of automountServiceAccountToken
+  # If you want to disable auto mount of Service Account Token then you can set the value to false;
+  # https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#opt-out-of-api-credential-automounting
+  automountServiceAccountToken: false
 
 resources:
   {}
@@ -248,6 +252,10 @@ resources:
   #  cpu: 100m
   #  memory: 128Mi
 
+# You can also opt out of automounting API credentials for a particular Pod;
+# https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#opt-out-of-api-credential-automounting
+automountServiceAccountToken: true
+
 ## Node labels for pod assignment
 ## ref: https://kubernetes.io/docs/user-guide/node-selection/
 #