diff --git a/bitnami/nginx/Chart.yaml b/bitnami/nginx/Chart.yaml index 9ac8713ff..9cf681fef 100644 --- a/bitnami/nginx/Chart.yaml +++ b/bitnami/nginx/Chart.yaml @@ -25,4 +25,4 @@ name: nginx sources: - https://github.com/bitnami/bitnami-docker-nginx - http://www.nginx.org -version: 9.5.13 +version: 9.5.14 diff --git a/bitnami/nginx/README.md b/bitnami/nginx/README.md index 306f6f5fa..7f70abba3 100644 --- a/bitnami/nginx/README.md +++ b/bitnami/nginx/README.md @@ -105,9 +105,9 @@ The command removes all the Kubernetes components associated with the chart and | `podSecurityContext.enabled` | Enabled NGINX pods' Security Context | `false` | | `podSecurityContext.fsGroup` | Set NGINX pod's Security Context fsGroup | `1001` | | `podSecurityContext.sysctls` | sysctl settings of the NGINX pods | `[]` | -| `containerSecurityContext.enabled` | Enabled NGINX Core containers' Security Context | `false` | -| `containerSecurityContext.runAsUser` | Set NGINX Core container's Security Context runAsUser | `1001` | -| `containerSecurityContext.runAsNonRoot` | Set NGINX Core container's Security Context runAsNonRoot | `true` | +| `containerSecurityContext.enabled` | Enabled NGINX containers' Security Context | `false` | +| `containerSecurityContext.runAsUser` | Set NGINX container's Security Context runAsUser | `1001` | +| `containerSecurityContext.runAsNonRoot` | Set NGINX container's Security Context runAsNonRoot | `true` | | `containerPorts.http` | Sets http port inside NGINX container | `8080` | | `containerPorts.https` | Sets https port inside NGINX container | `""` | | `resources.limits` | The resources limits for the NGINX container | `{}` | diff --git a/bitnami/nginx/templates/deployment.yaml b/bitnami/nginx/templates/deployment.yaml index ba88c8bdd..8e353032c 100644 --- a/bitnami/nginx/templates/deployment.yaml +++ b/bitnami/nginx/templates/deployment.yaml @@ -64,6 +64,9 @@ spec: - name: git-clone-repository image: {{ include "nginx.cloneStaticSiteFromGit.image" . }} imagePullPolicy: {{ .Values.cloneStaticSiteFromGit.image.pullPolicy | quote }} + {{- if .Values.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} {{- if .Values.cloneStaticSiteFromGit.gitClone.command }} command: {{- include "common.tplvalues.render" (dict "value" .Values.cloneStaticSiteFromGit.gitClone.command "context" $) | nindent 12 }} {{- else}} @@ -91,6 +94,9 @@ spec: - name: git-repo-syncer image: {{ include "nginx.cloneStaticSiteFromGit.image" . }} imagePullPolicy: {{ .Values.cloneStaticSiteFromGit.image.pullPolicy | quote }} + {{- if .Values.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} {{- if .Values.cloneStaticSiteFromGit.gitSync.command }} command: {{- include "common.tplvalues.render" (dict "value" .Values.cloneStaticSiteFromGit.gitSync.command "context" $) | nindent 12 }} {{- else}} diff --git a/bitnami/nginx/values.yaml b/bitnami/nginx/values.yaml index 9ffaad878..610e3e88f 100644 --- a/bitnami/nginx/values.yaml +++ b/bitnami/nginx/values.yaml @@ -166,11 +166,11 @@ podSecurityContext: ## value: "10000" ## sysctls: [] -## NGINX Core containers' Security Context (only main container). +## NGINX containers' Security Context. ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container -## @param containerSecurityContext.enabled Enabled NGINX Core containers' Security Context -## @param containerSecurityContext.runAsUser Set NGINX Core container's Security Context runAsUser -## @param containerSecurityContext.runAsNonRoot Set NGINX Core container's Security Context runAsNonRoot +## @param containerSecurityContext.enabled Enabled NGINX containers' Security Context +## @param containerSecurityContext.runAsUser Set NGINX container's Security Context runAsUser +## @param containerSecurityContext.runAsNonRoot Set NGINX container's Security Context runAsNonRoot ## containerSecurityContext: enabled: false