Merge branch 'master' into patch-1

pmint93 · Nov 14, 2024 · b45c45f · b45c45f
2 parents fecacaf + 1ea484d
commit b45c45f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/charts/metabase/README.md b/charts/metabase/README.md
@@ -151,6 +151,7 @@ The following table lists the configurable parameters of the Metabase chart and
 | extraEnv                                        | Mapping of extra environment variables                                     | {}                |
 | envFrom                                         | Mapping of extra environment variables from secret and/or configMap        | []                |
 | sidecars                                        | Mapping of container sidecars for the main deployment                      | []                |
-| securityContext                                 | Security Context for the Metabase pod                                      | {}                | 
+| securityContext                                 | Security Context for the Metabase container                                | {}                |
+| podSecurityContext                              | Security Context for the Metabase pod                                      | {}                |
 
 The above parameters map to the env variables defined in [metabase](http://github.com/metabase/metabase). For more information please refer to the [metabase documentations](https://www.metabase.com/docs/v0.41/operations-guide/environment-variables.html).
diff --git a/charts/metabase/templates/deployment.yaml b/charts/metabase/templates/deployment.yaml
@@ -311,6 +311,10 @@ spec:
         {{- if .Values.sidecars }}
         {{ toYaml .Values.sidecars | nindent 8 }}
         {{- end }}
+    {{- if .Values.podSecurityContext}}
+      securityContext:
+    {{- .Values.podSecurityContext | toYaml | nindent 8 }}
+    {{- end }}
     {{- with .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}

diff --git a/charts/metabase/values.yaml b/charts/metabase/values.yaml
@@ -23,6 +23,7 @@ deploymentAnnotations: {}
 deploymentLabels: {}
 podAnnotations: {}
 podLabels: {}
+podSecurityContext: {}
 image:
   repository: metabase/metabase
   # Overrides the image tag whose default is the chart appVersion.