8b026f42d5
* Values: Fix docs of `controller.podSecurityContext` & `controller.sysctls`. * Values: Add missing `controller.containerSecurityContext`. Already in use, but has never been added to values. * Values: Fix docs of `defaultBackend.podSecurityContext` & `defaultBackend.containerSecurityContext`. * Helpers: Rename `controller.containerSecurityContext` to `ingress-nginx.controller.containerSecurityContext`. Due to alignment with other templates. * Helpers: Improve `extraModules`. - Make `command` a multiline list. - Fix `toYaml` usage. - Remove `toYaml` where not necessary. * Helpers: Move `ingress-nginx.defaultBackend.fullname`. * Helpers: Add `ingress-nginx.defaultBackend.containerSecurityContext`. Extracts the default backend `securityContext` into a template, as for the controller. * Controller: Fix indentation of `controller.podSecurityContext` & `controller.sysctls`. * Controller: Improve `controller.extraModules` & `controller.opentelemetry`. - Add `controller.extraModules.distroless` & `controller.extraModules.resources`. - Add `controller.opentelemetry.name` & `controller.opentelemetry.distroless`. - Align `extraModules` inclusion for `controller.extraModules` & `controller.opentelemetry`. - Remove redundant whitespaces. * Controller/PSP: Align indentation. * Controller/PSP: Remove quotes. * Controller/PSP: Improve comments. * Controller/PSP: Reorder fields. See https://v1-24.docs.kubernetes.io/docs/concepts/security/pod-security-policy. * Admission Webhooks: Fix indentation of `controller.admissionWebhooks.patch.securityContext`. * Admission Webhooks/PSP: Align indentation. * Admission Webhooks/PSP: Reorder fields. * Admission Webhooks/PSP: Align condition. * Admission Webhooks/ClusterRole: Align PSP rule. * Default Backend/PSP: Align indentation. * Default Backend/PSP: Reorder fields. See https://v1-24.docs.kubernetes.io/docs/concepts/security/pod-security-policy. * Values: Tighten `controller.image`. Due to recent changes, the controller image can be run without privilege escalation: - https://github.com/kubernetes/ingress-nginx/issues/8499 - https://github.com/kubernetes/ingress-nginx/pull/7449 * Values: Tighten `controller.extraModules.containerSecurityContext`. * Values: Tighten `controller.opentelemetry.containerSecurityContext`. * Values: Tighten `controller.admissionWebhooks.*.securityContext`. Moves the pod `securityContext` to the containers to not interfere with injected containers. * Values: Tighten `defaultBackend.image`.
246 lines
11 KiB
YAML
246 lines
11 KiB
YAML
{{- if eq .Values.controller.kind "Deployment" -}}
|
|
{{- include "isControllerTagValid" . -}}
|
|
apiVersion: apps/v1
|
|
kind: Deployment
|
|
metadata:
|
|
labels:
|
|
{{- include "ingress-nginx.labels" . | nindent 4 }}
|
|
app.kubernetes.io/component: controller
|
|
{{- with .Values.controller.labels }}
|
|
{{- toYaml . | nindent 4 }}
|
|
{{- end }}
|
|
name: {{ include "ingress-nginx.controller.fullname" . }}
|
|
namespace: {{ include "ingress-nginx.namespace" . }}
|
|
{{- if .Values.controller.annotations }}
|
|
annotations: {{ toYaml .Values.controller.annotations | nindent 4 }}
|
|
{{- end }}
|
|
spec:
|
|
selector:
|
|
matchLabels:
|
|
{{- include "ingress-nginx.selectorLabels" . | nindent 6 }}
|
|
app.kubernetes.io/component: controller
|
|
{{- if not (or .Values.controller.autoscaling.enabled .Values.controller.keda.enabled) }}
|
|
replicas: {{ .Values.controller.replicaCount }}
|
|
{{- end }}
|
|
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
|
|
{{- if .Values.controller.updateStrategy }}
|
|
strategy: {{ toYaml .Values.controller.updateStrategy | nindent 4 }}
|
|
{{- end }}
|
|
minReadySeconds: {{ .Values.controller.minReadySeconds }}
|
|
template:
|
|
metadata:
|
|
{{- if .Values.controller.podAnnotations }}
|
|
annotations:
|
|
{{- range $key, $value := .Values.controller.podAnnotations }}
|
|
{{ $key }}: {{ $value | quote }}
|
|
{{- end }}
|
|
{{- end }}
|
|
labels:
|
|
{{- include "ingress-nginx.labels" . | nindent 8 }}
|
|
app.kubernetes.io/component: controller
|
|
{{- with .Values.controller.labels }}
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- if .Values.controller.podLabels }}
|
|
{{- toYaml .Values.controller.podLabels | nindent 8 }}
|
|
{{- end }}
|
|
spec:
|
|
{{- if .Values.controller.dnsConfig }}
|
|
dnsConfig: {{ toYaml .Values.controller.dnsConfig | nindent 8 }}
|
|
{{- end }}
|
|
{{- if .Values.controller.hostAliases }}
|
|
hostAliases: {{ tpl (toYaml .Values.controller.hostAliases) $ | nindent 8 }}
|
|
{{- end }}
|
|
{{- if .Values.controller.hostname }}
|
|
hostname: {{ toYaml .Values.controller.hostname | nindent 8 }}
|
|
{{- end }}
|
|
dnsPolicy: {{ .Values.controller.dnsPolicy }}
|
|
{{- if .Values.imagePullSecrets }}
|
|
imagePullSecrets: {{ toYaml .Values.imagePullSecrets | nindent 8 }}
|
|
{{- end }}
|
|
{{- if .Values.controller.priorityClassName }}
|
|
priorityClassName: {{ .Values.controller.priorityClassName | quote }}
|
|
{{- end }}
|
|
{{- if or .Values.controller.podSecurityContext .Values.controller.sysctls }}
|
|
securityContext:
|
|
{{- if .Values.controller.podSecurityContext }}
|
|
{{- toYaml .Values.controller.podSecurityContext | nindent 8 }}
|
|
{{- end }}
|
|
{{- if .Values.controller.sysctls }}
|
|
sysctls:
|
|
{{- range $sysctl, $value := .Values.controller.sysctls }}
|
|
- name: {{ $sysctl | quote }}
|
|
value: {{ $value | quote }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- if .Values.controller.shareProcessNamespace }}
|
|
shareProcessNamespace: {{ .Values.controller.shareProcessNamespace }}
|
|
{{- end }}
|
|
containers:
|
|
- name: {{ .Values.controller.containerName }}
|
|
{{- with .Values.controller.image }}
|
|
image: "{{- if .repository -}}{{ .repository }}{{ else }}{{ .registry }}/{{ include "ingress-nginx.image" . }}{{- end -}}:{{ .tag }}{{ include "ingress-nginx.imageDigest" . }}"
|
|
{{- end }}
|
|
imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
|
|
{{- if .Values.controller.lifecycle }}
|
|
lifecycle: {{ toYaml .Values.controller.lifecycle | nindent 12 }}
|
|
{{- end }}
|
|
args: {{ include "ingress-nginx.params" . | nindent 12 }}
|
|
securityContext: {{ include "ingress-nginx.controller.containerSecurityContext" . | nindent 12 }}
|
|
env:
|
|
- name: POD_NAME
|
|
valueFrom:
|
|
fieldRef:
|
|
fieldPath: metadata.name
|
|
- name: POD_NAMESPACE
|
|
valueFrom:
|
|
fieldRef:
|
|
fieldPath: metadata.namespace
|
|
{{- if .Values.controller.enableMimalloc }}
|
|
- name: LD_PRELOAD
|
|
value: /usr/local/lib/libmimalloc.so
|
|
{{- end }}
|
|
{{- if .Values.controller.extraEnvs }}
|
|
{{- toYaml .Values.controller.extraEnvs | nindent 12 }}
|
|
{{- end }}
|
|
{{- if .Values.controller.startupProbe }}
|
|
startupProbe: {{ toYaml .Values.controller.startupProbe | nindent 12 }}
|
|
{{- end }}
|
|
{{- if .Values.controller.livenessProbe }}
|
|
livenessProbe: {{ toYaml .Values.controller.livenessProbe | nindent 12 }}
|
|
{{- end }}
|
|
{{- if .Values.controller.readinessProbe }}
|
|
readinessProbe: {{ toYaml .Values.controller.readinessProbe | nindent 12 }}
|
|
{{- end }}
|
|
ports:
|
|
{{- range $key, $value := .Values.controller.containerPort }}
|
|
- name: {{ $key }}
|
|
containerPort: {{ $value }}
|
|
protocol: TCP
|
|
{{- if $.Values.controller.hostPort.enabled }}
|
|
hostPort: {{ index $.Values.controller.hostPort.ports $key | default $value }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- if .Values.controller.metrics.enabled }}
|
|
- name: {{ .Values.controller.metrics.portName }}
|
|
containerPort: {{ .Values.controller.metrics.port }}
|
|
protocol: TCP
|
|
{{- end }}
|
|
{{- if .Values.controller.admissionWebhooks.enabled }}
|
|
- name: webhook
|
|
containerPort: {{ .Values.controller.admissionWebhooks.port }}
|
|
protocol: TCP
|
|
{{- end }}
|
|
{{- range $key, $value := .Values.tcp }}
|
|
- name: {{ if $.Values.portNamePrefix }}{{ $.Values.portNamePrefix }}-{{ end }}{{ $key }}-tcp
|
|
containerPort: {{ $key }}
|
|
protocol: TCP
|
|
{{- if $.Values.controller.hostPort.enabled }}
|
|
hostPort: {{ $key }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- range $key, $value := .Values.udp }}
|
|
- name: {{ if $.Values.portNamePrefix }}{{ $.Values.portNamePrefix }}-{{ end }}{{ $key }}-udp
|
|
containerPort: {{ $key }}
|
|
protocol: UDP
|
|
{{- if $.Values.controller.hostPort.enabled }}
|
|
hostPort: {{ $key }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- if (or .Values.controller.customTemplate.configMapName .Values.controller.extraVolumeMounts .Values.controller.admissionWebhooks.enabled .Values.controller.extraModules .Values.controller.opentelemetry.enabled) }}
|
|
volumeMounts:
|
|
{{- if (or .Values.controller.extraModules .Values.controller.opentelemetry.enabled) }}
|
|
- name: modules
|
|
{{- if .Values.controller.image.chroot }}
|
|
mountPath: /chroot/modules_mount
|
|
{{- else }}
|
|
mountPath: /modules_mount
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- if .Values.controller.customTemplate.configMapName }}
|
|
- mountPath: /etc/nginx/template
|
|
name: nginx-template-volume
|
|
readOnly: true
|
|
{{- end }}
|
|
{{- if .Values.controller.admissionWebhooks.enabled }}
|
|
- name: webhook-cert
|
|
mountPath: /usr/local/certificates/
|
|
readOnly: true
|
|
{{- end }}
|
|
{{- if .Values.controller.extraVolumeMounts }}
|
|
{{- toYaml .Values.controller.extraVolumeMounts | nindent 12 }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- if .Values.controller.resources }}
|
|
resources: {{ toYaml .Values.controller.resources | nindent 12 }}
|
|
{{- end }}
|
|
{{- if .Values.controller.extraContainers }}
|
|
{{- toYaml .Values.controller.extraContainers | nindent 8 }}
|
|
{{- end }}
|
|
{{- if (or .Values.controller.extraInitContainers .Values.controller.extraModules .Values.controller.opentelemetry.enabled) }}
|
|
initContainers:
|
|
{{- if .Values.controller.extraInitContainers }}
|
|
{{- toYaml .Values.controller.extraInitContainers | nindent 8 }}
|
|
{{- end }}
|
|
{{- if .Values.controller.extraModules }}
|
|
{{- range .Values.controller.extraModules }}
|
|
{{- $containerSecurityContext := .containerSecurityContext | default $.Values.controller.containerSecurityContext }}
|
|
{{- include "extraModules" (dict "name" .name "image" .image "distroless" .distroless "containerSecurityContext" $containerSecurityContext "resources" .resources) | nindent 8 }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- if .Values.controller.opentelemetry.enabled }}
|
|
{{- with .Values.controller.opentelemetry }}
|
|
{{- $containerSecurityContext := .containerSecurityContext | default $.Values.controller.containerSecurityContext }}
|
|
{{- include "extraModules" (dict "name" .name "image" .image "distroless" .distroless "containerSecurityContext" $containerSecurityContext "resources" .resources) | nindent 8 }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- if .Values.controller.hostNetwork }}
|
|
hostNetwork: {{ .Values.controller.hostNetwork }}
|
|
{{- end }}
|
|
{{- if .Values.controller.nodeSelector }}
|
|
nodeSelector: {{ toYaml .Values.controller.nodeSelector | nindent 8 }}
|
|
{{- end }}
|
|
{{- if .Values.controller.tolerations }}
|
|
tolerations: {{ toYaml .Values.controller.tolerations | nindent 8 }}
|
|
{{- end }}
|
|
{{- if .Values.controller.affinity }}
|
|
affinity: {{ toYaml .Values.controller.affinity | nindent 8 }}
|
|
{{- end }}
|
|
{{- if .Values.controller.topologySpreadConstraints }}
|
|
topologySpreadConstraints: {{ tpl (toYaml .Values.controller.topologySpreadConstraints) $ | nindent 8 }}
|
|
{{- end }}
|
|
serviceAccountName: {{ template "ingress-nginx.serviceAccountName" . }}
|
|
terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
|
|
{{- if (or .Values.controller.customTemplate.configMapName .Values.controller.extraVolumeMounts .Values.controller.admissionWebhooks.enabled .Values.controller.extraVolumes .Values.controller.extraModules .Values.controller.opentelemetry.enabled) }}
|
|
volumes:
|
|
{{- if (or .Values.controller.extraModules .Values.controller.opentelemetry.enabled)}}
|
|
- name: modules
|
|
emptyDir: {}
|
|
{{- end }}
|
|
{{- if .Values.controller.customTemplate.configMapName }}
|
|
- name: nginx-template-volume
|
|
configMap:
|
|
name: {{ .Values.controller.customTemplate.configMapName }}
|
|
items:
|
|
- key: {{ .Values.controller.customTemplate.configMapKey }}
|
|
path: nginx.tmpl
|
|
{{- end }}
|
|
{{- if .Values.controller.admissionWebhooks.enabled }}
|
|
- name: webhook-cert
|
|
secret:
|
|
secretName: {{ include "ingress-nginx.admissionWebhooks.fullname" . }}
|
|
{{- if .Values.controller.admissionWebhooks.certManager.enabled }}
|
|
items:
|
|
- key: tls.crt
|
|
path: cert
|
|
- key: tls.key
|
|
path: key
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- if .Values.controller.extraVolumes }}
|
|
{{ toYaml .Values.controller.extraVolumes | nindent 8 }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|