Skip to content

Commit 06c64bf

Browse files
authored
helm: add resources to opentelemetry init container (#10300)
1 parent 300cff1 commit 06c64bf

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

charts/ingress-nginx/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
378378
| controller.opentelemetry.containerSecurityContext.allowPrivilegeEscalation | bool | `false` | |
379379
| controller.opentelemetry.enabled | bool | `false` | |
380380
| controller.opentelemetry.image | string | `"registry.k8s.io/ingress-nginx/opentelemetry:v20230721-3e2062ee5@sha256:13bee3f5223883d3ca62fee7309ad02d22ec00ff0d7033e3e9aca7a9f60fd472"` | |
381+
| controller.opentelemetry.resources | object | `{}` | |
381382
| controller.podAnnotations | object | `{}` | Annotations to be added to controller pods # |
382383
| controller.podLabels | object | `{}` | Labels to add to the pod container metadata |
383384
| controller.podSecurityContext | object | `{}` | Security Context policies for controller pods |

charts/ingress-nginx/templates/_helpers.tpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,9 @@ Extra modules.
208208
{{- if .containerSecurityContext }}
209209
securityContext: {{ .containerSecurityContext | toYaml | nindent 4 }}
210210
{{- end }}
211+
{{- if .resources }}
212+
resources: {{ .resources | toYaml | nindent 4 }}
213+
{{- end }}
211214
volumeMounts:
212215
- name: {{ toYaml "modules"}}
213216
mountPath: {{ toYaml "/modules_mount"}}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ spec:
192192
{{- end }}
193193
{{- if .Values.controller.opentelemetry.enabled}}
194194
{{- $otelContainerSecurityContext := $.Values.controller.opentelemetry.containerSecurityContext | default $.Values.controller.containerSecurityContext }}
195-
{{- include "extraModules" (dict "name" "opentelemetry" "image" .Values.controller.opentelemetry.image "containerSecurityContext" $otelContainerSecurityContext "distroless" true) | nindent 8}}
195+
{{ $otelResources := $.Values.controller.opentelemetry.resources | default dict }}
196+
{{- include "extraModules" (dict "name" "opentelemetry" "image" .Values.controller.opentelemetry.image "containerSecurityContext" $otelContainerSecurityContext "distroless" true "resources" $otelResources) | nindent 8}}
196197
{{- end}}
197198
{{- end }}
198199
{{- if .Values.controller.hostNetwork }}

charts/ingress-nginx/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,7 @@ controller:
577577
image: registry.k8s.io/ingress-nginx/opentelemetry:v20230721-3e2062ee5@sha256:13bee3f5223883d3ca62fee7309ad02d22ec00ff0d7033e3e9aca7a9f60fd472
578578
containerSecurityContext:
579579
allowPrivilegeEscalation: false
580+
resources: {}
580581
admissionWebhooks:
581582
annotations: {}
582583
# ignore-check.kube-linter.io/no-read-only-rootfs: "This deployment needs write access to root filesystem".

0 commit comments

Comments
 (0)