Skip to content

Commit 98170bd

Browse files
promote distroless otel init image (#10270)
Co-authored-by: Ehsan Saei <[email protected]>
1 parent 3e2062e commit 98170bd

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

charts/ingress-nginx/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
375375
| controller.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Node labels for controller pod assignment # Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/ # |
376376
| controller.opentelemetry.containerSecurityContext.allowPrivilegeEscalation | bool | `false` | |
377377
| controller.opentelemetry.enabled | bool | `false` | |
378-
| controller.opentelemetry.image | string | `"registry.k8s.io/ingress-nginx/opentelemetry:v20230527@sha256:fd7ec835f31b7b37187238eb4fdad4438806e69f413a203796263131f4f02ed0"` | |
378+
| controller.opentelemetry.image | string | `"registry.k8s.io/ingress-nginx/opentelemetry:v20230721-3e2062ee5@sha256:13bee3f5223883d3ca62fee7309ad02d22ec00ff0d7033e3e9aca7a9f60fd472"` | |
379379
| controller.podAnnotations | object | `{}` | Annotations to be added to controller pods # |
380380
| controller.podLabels | object | `{}` | Labels to add to the pod container metadata |
381381
| controller.podSecurityContext | object | `{}` | Security Context policies for controller pods |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ spec:
190190
{{- end }}
191191
{{- if .Values.controller.opentelemetry.enabled}}
192192
{{ $otelContainerSecurityContext := $.Values.controller.opentelemetry.containerSecurityContext | default $.Values.controller.containerSecurityContext }}
193-
{{- include "extraModules" (dict "name" "opentelemetry" "image" .Values.controller.opentelemetry.image "containerSecurityContext" $otelContainerSecurityContext "distroless" false) | nindent 8}}
193+
{{- include "extraModules" (dict "name" "opentelemetry" "image" .Values.controller.opentelemetry.image "containerSecurityContext" $otelContainerSecurityContext "distroless" true) | nindent 8}}
194194
{{- end}}
195195
{{- end }}
196196
{{- if .Values.controller.hostNetwork }}

charts/ingress-nginx/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ controller:
553553

554554
opentelemetry:
555555
enabled: false
556-
image: registry.k8s.io/ingress-nginx/opentelemetry:v20230527@sha256:fd7ec835f31b7b37187238eb4fdad4438806e69f413a203796263131f4f02ed0
556+
image: registry.k8s.io/ingress-nginx/opentelemetry:v20230721-3e2062ee5@sha256:13bee3f5223883d3ca62fee7309ad02d22ec00ff0d7033e3e9aca7a9f60fd472
557557
containerSecurityContext:
558558
allowPrivilegeEscalation: false
559559
admissionWebhooks:

0 commit comments

Comments
 (0)