From b9d03a6d715bc380241d74bc76c9a0a71a116ebb Mon Sep 17 00:00:00 2001
From: Marco Ebert <marco_ebert@icloud.com>
Date: Fri, 27 Sep 2024 16:23:25 +0200
Subject: [PATCH] Chart: Rework Controller Deployment/DaemonSet Metrics values.

---
 ....yaml => controller-daemonset-metrics-values.yaml} | 11 ++++++-----
 ...yaml => controller-deployment-metrics-values.yaml} | 10 ++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)
 rename charts/ingress-nginx/ci/{deamonset-metrics-values.yaml => controller-daemonset-metrics-values.yaml} (81%)
 rename charts/ingress-nginx/ci/{deployment-metrics-values.yaml => controller-deployment-metrics-values.yaml} (80%)

diff --git a/charts/ingress-nginx/ci/deamonset-metrics-values.yaml b/charts/ingress-nginx/ci/controller-daemonset-metrics-values.yaml
similarity index 81%
rename from charts/ingress-nginx/ci/deamonset-metrics-values.yaml
rename to charts/ingress-nginx/ci/controller-daemonset-metrics-values.yaml
index cb3cb54be..7a98580cd 100644
--- a/charts/ingress-nginx/ci/deamonset-metrics-values.yaml
+++ b/charts/ingress-nginx/ci/controller-daemonset-metrics-values.yaml
@@ -1,12 +1,13 @@
 controller:
-  kind: DaemonSet
   image:
     repository: ingress-controller/controller
     tag: 1.0.0-dev
     digest: null
-  admissionWebhooks:
-    enabled: false
-  metrics:
-    enabled: true
+
   service:
     type: ClusterIP
+
+  kind: DaemonSet
+
+  metrics:
+    enabled: true
diff --git a/charts/ingress-nginx/ci/deployment-metrics-values.yaml b/charts/ingress-nginx/ci/controller-deployment-metrics-values.yaml
similarity index 80%
rename from charts/ingress-nginx/ci/deployment-metrics-values.yaml
rename to charts/ingress-nginx/ci/controller-deployment-metrics-values.yaml
index 9209ad5a6..9c95d347c 100644
--- a/charts/ingress-nginx/ci/deployment-metrics-values.yaml
+++ b/charts/ingress-nginx/ci/controller-deployment-metrics-values.yaml
@@ -3,9 +3,11 @@ controller:
     repository: ingress-controller/controller
     tag: 1.0.0-dev
     digest: null
-  admissionWebhooks:
-    enabled: false
-  metrics:
-    enabled: true
+
   service:
     type: ClusterIP
+
+  kind: Deployment
+
+  metrics:
+    enabled: true