From d507f4fb5b9cbc98ae1033ab74f7340c237ab420 Mon Sep 17 00:00:00 2001
From: Marco Ebert <marco_ebert@icloud.com>
Date: Fri, 27 Sep 2024 16:04:01 +0200
Subject: [PATCH] Chart: Rework Controller ConfigMap Add/Proxy Headers values.

---
 ...ml => controller-configmap-addheaders-values.yaml} | 11 ++++-------
 ... => controller-configmap-proxyheaders-values.yaml} | 10 ++++------
 2 files changed, 8 insertions(+), 13 deletions(-)
 rename charts/ingress-nginx/ci/{daemonset-headers-values.yaml => controller-configmap-addheaders-values.yaml} (62%)
 rename charts/ingress-nginx/ci/{deployment-headers-values.yaml => controller-configmap-proxyheaders-values.yaml} (69%)

diff --git a/charts/ingress-nginx/ci/daemonset-headers-values.yaml b/charts/ingress-nginx/ci/controller-configmap-addheaders-values.yaml
similarity index 62%
rename from charts/ingress-nginx/ci/daemonset-headers-values.yaml
rename to charts/ingress-nginx/ci/controller-configmap-addheaders-values.yaml
index ab7d47bd4..460a610ba 100644
--- a/charts/ingress-nginx/ci/daemonset-headers-values.yaml
+++ b/charts/ingress-nginx/ci/controller-configmap-addheaders-values.yaml
@@ -1,14 +1,11 @@
 controller:
-  kind: DaemonSet
   image:
     repository: ingress-controller/controller
     tag: 1.0.0-dev
     digest: null
-  admissionWebhooks:
-    enabled: false
-  addHeaders:
-    X-Frame-Options: deny
-  proxySetHeaders:
-    X-Forwarded-Proto: https
+
   service:
     type: ClusterIP
+
+  addHeaders:
+    X-Frame-Options: deny
diff --git a/charts/ingress-nginx/ci/deployment-headers-values.yaml b/charts/ingress-nginx/ci/controller-configmap-proxyheaders-values.yaml
similarity index 69%
rename from charts/ingress-nginx/ci/deployment-headers-values.yaml
rename to charts/ingress-nginx/ci/controller-configmap-proxyheaders-values.yaml
index 17a11ac37..e23a13c0c 100644
--- a/charts/ingress-nginx/ci/deployment-headers-values.yaml
+++ b/charts/ingress-nginx/ci/controller-configmap-proxyheaders-values.yaml
@@ -3,11 +3,9 @@ controller:
     repository: ingress-controller/controller
     tag: 1.0.0-dev
     digest: null
-  admissionWebhooks:
-    enabled: false
-  addHeaders:
-    X-Frame-Options: deny
-  proxySetHeaders:
-    X-Forwarded-Proto: https
+
   service:
     type: ClusterIP
+
+  proxySetHeaders:
+    X-Forwarded-Proto: https