Skip to content

Commit 97d4a83

Browse files
authored
Deployment/DaemonSet: Remove distroless from extraModules templating. (#10742)
1 parent 759ac63 commit 97d4a83

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

charts/ingress-nginx/templates/controller-daemonset.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,13 @@ spec:
183183
{{- if .Values.controller.extraModules }}
184184
{{- range .Values.controller.extraModules }}
185185
{{- $containerSecurityContext := .containerSecurityContext | default $.Values.controller.containerSecurityContext }}
186-
{{- include "extraModules" (dict "name" .name "image" .image "distroless" .distroless "containerSecurityContext" $containerSecurityContext "resources" .resources) | nindent 8 }}
186+
{{- include "extraModules" (dict "name" .name "image" .image "containerSecurityContext" $containerSecurityContext "resources" .resources) | nindent 8 }}
187187
{{- end }}
188188
{{- end }}
189189
{{- if .Values.controller.opentelemetry.enabled }}
190190
{{- with .Values.controller.opentelemetry }}
191191
{{- $containerSecurityContext := .containerSecurityContext | default $.Values.controller.containerSecurityContext }}
192-
{{- include "extraModules" (dict "name" .name "image" .image "distroless" .distroless "containerSecurityContext" $containerSecurityContext "resources" .resources) | nindent 8 }}
192+
{{- include "extraModules" (dict "name" .name "image" .image "containerSecurityContext" $containerSecurityContext "resources" .resources) | nindent 8 }}
193193
{{- end }}
194194
{{- end }}
195195
{{- end }}

charts/ingress-nginx/templates/controller-deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,13 @@ spec:
186186
{{- if .Values.controller.extraModules }}
187187
{{- range .Values.controller.extraModules }}
188188
{{- $containerSecurityContext := .containerSecurityContext | default $.Values.controller.containerSecurityContext }}
189-
{{- include "extraModules" (dict "name" .name "image" .image "distroless" .distroless "containerSecurityContext" $containerSecurityContext "resources" .resources) | nindent 8 }}
189+
{{- include "extraModules" (dict "name" .name "image" .image "containerSecurityContext" $containerSecurityContext "resources" .resources) | nindent 8 }}
190190
{{- end }}
191191
{{- end }}
192192
{{- if .Values.controller.opentelemetry.enabled }}
193193
{{- with .Values.controller.opentelemetry }}
194194
{{- $containerSecurityContext := .containerSecurityContext | default $.Values.controller.containerSecurityContext }}
195-
{{- include "extraModules" (dict "name" .name "image" .image "distroless" .distroless "containerSecurityContext" $containerSecurityContext "resources" .resources) | nindent 8 }}
195+
{{- include "extraModules" (dict "name" .name "image" .image "containerSecurityContext" $containerSecurityContext "resources" .resources) | nindent 8 }}
196196
{{- end }}
197197
{{- end }}
198198
{{- end }}

0 commit comments

Comments
 (0)