Helpers: Rename controller.containerSecurityContext to ingress-nginx.controller.containerSecurityContext.

Due to alignment with other templates.
This commit is contained in:
Marco Ebert 2023-10-04 14:31:50 +02:00
parent dcc3639ce1
commit ee656538b7
3 changed files with 7 additions and 9 deletions

View file

@ -39,9 +39,9 @@ Allows overriding it for multi-namespace deployments in combined charts.
{{- end -}} {{- end -}}
{{/* {{/*
Container SecurityContext. Controller container security context.
*/}} */}}
{{- define "controller.containerSecurityContext" -}} {{- define "ingress-nginx.controller.containerSecurityContext" -}}
{{- if .Values.controller.containerSecurityContext -}} {{- if .Values.controller.containerSecurityContext -}}
{{- toYaml .Values.controller.containerSecurityContext -}} {{- toYaml .Values.controller.containerSecurityContext -}}
{{- else -}} {{- else -}}
@ -55,7 +55,7 @@ capabilities:
{{- end }} {{- end }}
runAsUser: {{ .Values.controller.image.runAsUser }} runAsUser: {{ .Values.controller.image.runAsUser }}
allowPrivilegeEscalation: {{ .Values.controller.image.allowPrivilegeEscalation }} allowPrivilegeEscalation: {{ .Values.controller.image.allowPrivilegeEscalation }}
{{- end }} {{- end -}}
{{- end -}} {{- end -}}
{{/* {{/*

View file

@ -83,9 +83,8 @@ spec:
{{- if .Values.controller.lifecycle }} {{- if .Values.controller.lifecycle }}
lifecycle: {{ toYaml .Values.controller.lifecycle | nindent 12 }} lifecycle: {{ toYaml .Values.controller.lifecycle | nindent 12 }}
{{- end }} {{- end }}
args: args: {{ include "ingress-nginx.params" . | nindent 12 }}
{{- include "ingress-nginx.params" . | nindent 12 }} securityContext: {{ include "ingress-nginx.controller.containerSecurityContext" . | nindent 12 }}
securityContext: {{ include "controller.containerSecurityContext" . | nindent 12 }}
env: env:
- name: POD_NAME - name: POD_NAME
valueFrom: valueFrom:

View file

@ -86,9 +86,8 @@ spec:
{{- if .Values.controller.lifecycle }} {{- if .Values.controller.lifecycle }}
lifecycle: {{ toYaml .Values.controller.lifecycle | nindent 12 }} lifecycle: {{ toYaml .Values.controller.lifecycle | nindent 12 }}
{{- end }} {{- end }}
args: args: {{ include "ingress-nginx.params" . | nindent 12 }}
{{- include "ingress-nginx.params" . | nindent 12 }} securityContext: {{ include "ingress-nginx.controller.containerSecurityContext" . | nindent 12 }}
securityContext: {{ include "controller.containerSecurityContext" . | nindent 12 }}
env: env:
- name: POD_NAME - name: POD_NAME
valueFrom: valueFrom: