address review comments

Author: demonCoder95

cmd/e2e/test_environment.go

@@ -23,13 +23,15 @@ import (
 var (
 	kubernetesClient, stacksetClient, routegroupClient = createClients()
 	namespace                                          = requiredEnvar("E2E_NAMESPACE")
-	clusterDomain                                      = requiredEnvar("CLUSTER_DOMAIN")
-	clusterDomainInternal                              = requiredEnvar("CLUSTER_DOMAIN_INTERNAL")
-	clusterDomains                                     = []string{clusterDomain, clusterDomainInternal}
-	perStackDomains                                    = []string{"ingress.cluster.local"}
-	controllerId                                       = os.Getenv("CONTROLLER_ID")
-	waitTimeout                                        time.Duration
-	trafficSwitchWaitTimeout                           time.Duration
+	// Domains used to generate hostnames for the main Stackset Ingresses.
+	clusterDomain         = requiredEnvar("CLUSTER_DOMAIN")
+	clusterDomainInternal = requiredEnvar("CLUSTER_DOMAIN_INTERNAL")
+	clusterDomains        = []string{clusterDomain, clusterDomainInternal}
+	// Domains used to generate hostnames for the per Stackset Ingresses.
+	perStackDomains          = []string{"ingress.cluster.local"}
+	controllerId             = os.Getenv("CONTROLLER_ID")
+	waitTimeout              time.Duration
+	trafficSwitchWaitTimeout time.Duration
 )
 
 func init() {

pkg/core/stack_resources_test.go

@@ -2,7 +2,6 @@ package core
 
 import (
 	"errors"
-	"fmt"
 	"reflect"
 	"slices"
 	"strconv"
@@ -312,9 +311,7 @@ func TestStackGenerateIngress(t *testing.T) {
 				stackGenerationAnnotationKey: "11",
 				"ingress":                    "annotation",
 			},
-			expectedHosts: []string{
-				fmt.Sprintf("foo-v1.%s", perStackDomain),
-			},
+			expectedHosts: []string{"foo-v1.ingress.cluster.local"},
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
@@ -626,9 +623,7 @@ func TestStackGenerateRouteGroup(t *testing.T) {
 				stackGenerationAnnotationKey: "11",
 				"routegroup":                 "annotation",
 			},
-			expectedHosts: []string{
-				fmt.Sprintf("foo-v1.%s", perStackDomain),
-			},
+			expectedHosts: []string{"foo-v1.ingress.cluster.local"},
 		},
 		{
 			name: "custom load balancer",
@@ -645,9 +640,7 @@ func TestStackGenerateRouteGroup(t *testing.T) {
 			expectedAnnotations: map[string]string{
 				stackGenerationAnnotationKey: "11",
 			},
-			expectedHosts: []string{
-				fmt.Sprintf("foo-v1.%s", perStackDomain),
-			},
+			expectedHosts: []string{"foo-v1.ingress.cluster.local"},
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {