From 9c8a56d929e3e7706ebf9af41b006806fc4068e1 Mon Sep 17 00:00:00 2001
From: patst <patrick.steinig@googlemail.com>
Date: Wed, 29 Nov 2023 09:59:30 +0100
Subject: [PATCH] feat!: move distroless config under the image key

---
 charts/ingress-nginx/templates/_helpers.tpl | 2 +-
 charts/ingress-nginx/values.yaml            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/ingress-nginx/templates/_helpers.tpl b/charts/ingress-nginx/templates/_helpers.tpl
index 8cd49bd28..05a031cbd 100644
--- a/charts/ingress-nginx/templates/_helpers.tpl
+++ b/charts/ingress-nginx/templates/_helpers.tpl
@@ -259,7 +259,7 @@ Extra modules.
 - name: {{ .name }}
   image: {{ printf "%s/%s:%s" .image.registry .image.image .image.tag }}{{ include "ingress-nginx.imageDigest" .image }}
   command:
-  {{- if .distroless }}
+  {{- if .image.distroless }}
     - /init_module
   {{- else }}
     - sh
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index 721820e2a..75f4885be 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -591,7 +591,7 @@ controller:
   #     registry: registry.k8s.io
   #     image: ingress-nginx/mytestmodule
   #     tag: latest
-  #   distroless: false
+  #     distroless: false
   #   containerSecurityContext:
   #     runAsNonRoot: true
   #     runAsUser: <user-id>
@@ -616,7 +616,7 @@ controller:
       image: ingress-nginx/opentelemetry
       tag: "v20230721-3e2062ee5"
       digest: sha256:13bee3f5223883d3ca62fee7309ad02d22ec00ff0d7033e3e9aca7a9f60fd472
-    distroless: true
+      distroless: true
     containerSecurityContext:
       runAsNonRoot: true
       # -- The image's default user, inherited from its base image `cgr.dev/chainguard/static`.