feat!: move distroless config under the image key

This commit is contained in:
patst 2023-11-29 09:59:30 +01:00
parent 6972f8bd25
commit 9c8a56d929
2 changed files with 3 additions and 3 deletions

View file

@ -259,7 +259,7 @@ Extra modules.
- name: {{ .name }} - name: {{ .name }}
image: {{ printf "%s/%s:%s" .image.registry .image.image .image.tag }}{{ include "ingress-nginx.imageDigest" .image }} image: {{ printf "%s/%s:%s" .image.registry .image.image .image.tag }}{{ include "ingress-nginx.imageDigest" .image }}
command: command:
{{- if .distroless }} {{- if .image.distroless }}
- /init_module - /init_module
{{- else }} {{- else }}
- sh - sh

View file

@ -591,7 +591,7 @@ controller:
# registry: registry.k8s.io # registry: registry.k8s.io
# image: ingress-nginx/mytestmodule # image: ingress-nginx/mytestmodule
# tag: latest # tag: latest
# distroless: false # distroless: false
# containerSecurityContext: # containerSecurityContext:
# runAsNonRoot: true # runAsNonRoot: true
# runAsUser: <user-id> # runAsUser: <user-id>
@ -616,7 +616,7 @@ controller:
image: ingress-nginx/opentelemetry image: ingress-nginx/opentelemetry
tag: "v20230721-3e2062ee5" tag: "v20230721-3e2062ee5"
digest: sha256:13bee3f5223883d3ca62fee7309ad02d22ec00ff0d7033e3e9aca7a9f60fd472 digest: sha256:13bee3f5223883d3ca62fee7309ad02d22ec00ff0d7033e3e9aca7a9f60fd472
distroless: true distroless: true
containerSecurityContext: containerSecurityContext:
runAsNonRoot: true runAsNonRoot: true
# -- The image's default user, inherited from its base image `cgr.dev/chainguard/static`. # -- The image's default user, inherited from its base image `cgr.dev/chainguard/static`.