From 7097f5fc438d1fbe9fa2c52dee9baa2672a2d52a Mon Sep 17 00:00:00 2001
From: Marco Ebert <marco_ebert@icloud.com>
Date: Fri, 17 Jan 2025 11:26:25 +0100
Subject: [PATCH] Apply suggestions from code review

---
 .../controller-service-internal_test.yaml     | 27 +------------------
 .../tests/controller-service_test.yaml        | 27 +++----------------
 2 files changed, 5 insertions(+), 49 deletions(-)

diff --git a/charts/ingress-nginx/tests/controller-service-internal_test.yaml b/charts/ingress-nginx/tests/controller-service-internal_test.yaml
index 3356cda2d2..7b3ad4ae12 100644
--- a/charts/ingress-nginx/tests/controller-service-internal_test.yaml
+++ b/charts/ingress-nginx/tests/controller-service-internal_test.yaml
@@ -62,7 +62,7 @@ tests:
           path: spec.trafficDistribution
           value: PreferClose
 
- - it: should create a Service with custom labels if `controller.service.internal.labels` is set
+ - it: should create a Service with labels if `controller.service.internal.labels` is set
    set: 
      controller.service.internal.enabled: true
      controller.service.internal.annotations:
@@ -70,31 +70,6 @@ tests:
      controller.service.internal.labels:
        external-dns.alpha.kubernetes.io/hostname: internal.example.com
    asserts:
-     - hasDocuments:
-         count: 1
-     - isKind:
-         of: Service
      - equal:
          path: metadata.labels.external-dns\.alpha\.kubernetes\.io/hostname
          value: internal.example.com
-
- - it: should merge service labels with internal labels maintaining backward compatibility
-   set:
-     controller.service.internal.enabled: true
-     controller.service.internal.annotations:
-       test.annotation: "true"
-     controller.service.labels:
-       global-service: "true"
-     controller.service.internal.labels:
-       internal-specific: "true"
-   asserts:
-     - hasDocuments:
-         count: 1
-     - isKind:
-         of: Service
-     - equal:
-         path: metadata.labels.global-service
-         value: "true"
-     - equal:
-         path: metadata.labels.internal-specific
-         value: "true"
diff --git a/charts/ingress-nginx/tests/controller-service_test.yaml b/charts/ingress-nginx/tests/controller-service_test.yaml
index e072a91bd8..21bf899b1a 100644
--- a/charts/ingress-nginx/tests/controller-service_test.yaml
+++ b/charts/ingress-nginx/tests/controller-service_test.yaml
@@ -63,35 +63,16 @@ tests:
           path: spec.trafficDistribution
           value: PreferClose
 
- - it: should create a Service with custom external labels if `controller.service.external.labels` is set
+ - it: should create a Service with labels if `controller.service.external.labels` is set
    set:
      controller.service.external.enabled: true
      controller.service.external.labels:
-       custom-external: test-value
+       external-dns.alpha.kubernetes.io/hostname: external.example.com
    asserts:
      - hasDocuments:
          count: 1
      - isKind:
          of: Service
      - equal:
-         path: metadata.labels.custom-external
-         value: test-value
-
- - it: should merge service labels with external labels maintaining backward compatibility
-   set:
-     controller.service.external.enabled: true
-     controller.service.labels:
-       global-service: "true"
-     controller.service.external.labels:
-       external-specific: "true"
-   asserts:
-     - hasDocuments:
-         count: 1
-     - isKind:
-         of: Service
-     - equal:
-         path: metadats.labels.global-service
-         value: "true"
-     - equal:
-         path: metadata.labels.external-specific
-         value: "true"
+         path: metadata.labels.external-dns\.alpha\.kubernetes\.io/hostname
+         value: external.example.com