fix: align struct fields and convert gatewayclass_envtest_test.go to GenerateName

- Fix gci lint: align Namespace field with longer GenerateName field
- Convert gatewayclass_envtest_test.go Gateway names to GenerateName
- Move pre-Create log to after Create so .Name is populated

Author: superyyrrzz

test/envtest/adminapi_discoverer_envtest_test.go

@@ -83,7 +83,7 @@ func TestDiscoverer_GetAdminAPIsForServiceReturnsAllAddressesCorrectlyPagingThro
 					es := discoveryv1.EndpointSlice{
 						ObjectMeta: metav1.ObjectMeta{
 							GenerateName: "endpointslice-",
-							Namespace: ns.Name,
+							Namespace:    ns.Name,
 							Labels: map[string]string{
 								"kubernetes.io/service-name": serviceName,
 							},

test/envtest/gateway_envtest_test.go

@@ -152,7 +152,7 @@ func createHTTPRoutes(
 		httpRoute := &gatewayapi.HTTPRoute{
 			ObjectMeta: metav1.ObjectMeta{
 				GenerateName: "httproute-",
-				Namespace: gw.Namespace,
+				Namespace:    gw.Namespace,
 			},
 			Spec: gatewayapi.HTTPRouteSpec{
 				CommonRouteSpec: gatewayapi.CommonRouteSpec{

test/envtest/gatewayclass_envtest_test.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -77,7 +76,7 @@ func TestGatewayWithGatewayClassReconciliation(t *testing.T) {
 						IntoSlice(),
 				},
 				ObjectMeta: metav1.ObjectMeta{
-					Name: uuid.NewString(),
+					GenerateName: "gw-",
 				},
 			},
 			Test: func(
@@ -147,7 +146,7 @@ func TestGatewayWithGatewayClassReconciliation(t *testing.T) {
 						IntoSlice(),
 				},
 				ObjectMeta: metav1.ObjectMeta{
-					Name: uuid.NewString(),
+					GenerateName: "gw-",
 				},
 			},
 			Test: func(
@@ -237,7 +236,7 @@ func TestGatewayWithGatewayClassReconciliation(t *testing.T) {
 						IntoSlice(),
 				},
 				ObjectMeta: metav1.ObjectMeta{
-					Name: uuid.NewString(),
+					GenerateName: "gw-",
 				},
 			},
 			Test: func(
@@ -381,9 +380,9 @@ func testGatewayWithGatewayClassReconciliation(
 			}
 			StartReconciler(ctx, t, scheme, cfg, gwReconciler, WithWatchNamespace(ns.Name))
 
-			t.Logf("deploying gateway %s using %s gateway class", tc.Gateway.Name, tc.GatewayClass.Name)
 			tc.Gateway.Namespace = ns.Name
 			require.NoError(t, clNamespaced.Create(ctx, &tc.Gateway))
+			t.Logf("deployed gateway %s using %s gateway class", tc.Gateway.Name, tc.GatewayClass.Name)
 			t.Cleanup(func() { _ = clNamespaced.Delete(t.Context(), &tc.Gateway) })
 
 			tc.Test(ctx, t, clNamespaced, tc.GatewayClass, tc.Gateway, ns)

test/envtest/ingress_test.go

@@ -92,7 +92,7 @@ func TestIngressWorksWithServiceBackendsSpecifyingOnlyPortNames(t *testing.T) {
 	es := discoveryv1.EndpointSlice{
 		ObjectMeta: metav1.ObjectMeta{
 			GenerateName: "endpointslice-",
-			Namespace: ns.Name,
+			Namespace:    ns.Name,
 			Labels: map[string]string{
 				"kubernetes.io/service-name": service.Name,
 			},

test/envtest/k8s.go

@@ -34,7 +34,7 @@ func CreatePod(ctx context.Context, t *testing.T, client ctrlclient.Client, ns s
 
 	pod := corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
-			Namespace: ns,
+			Namespace:    ns,
 			GenerateName: "pod-",
 		},
 		Spec: corev1.PodSpec{

test/envtest/kongadminapi_controller_envtest_test.go

@@ -143,7 +143,7 @@ func TestKongAdminAPIController(t *testing.T) {
 					},
 				},
 				GenerateName: "endpointslice-",
-				Namespace: adminService.Namespace,
+				Namespace:    adminService.Namespace,
 				Labels: map[string]string{
 					"kubernetes.io/service-name": adminService.Name,
 				},
@@ -222,7 +222,7 @@ func TestKongAdminAPIController(t *testing.T) {
 					},
 				},
 				GenerateName: "endpointslice-",
-				Namespace: adminService.Namespace,
+				Namespace:    adminService.Namespace,
 				Labels: map[string]string{
 					"kubernetes.io/service-name": adminService.Name,
 				},
@@ -289,7 +289,7 @@ func TestKongAdminAPIController(t *testing.T) {
 					},
 				},
 				GenerateName: "endpointslice-",
-				Namespace: adminService.Namespace,
+				Namespace:    adminService.Namespace,
 				Labels: map[string]string{
 					"kubernetes.io/service-name": adminService.Name,
 				},
@@ -334,7 +334,7 @@ func TestKongAdminAPIController(t *testing.T) {
 					},
 				},
 				GenerateName: "endpointslice-",
-				Namespace: adminService.Namespace,
+				Namespace:    adminService.Namespace,
 				Labels: map[string]string{
 					"kubernetes.io/service-name": adminService.Name,
 				},
@@ -425,7 +425,7 @@ func TestKongAdminAPIController(t *testing.T) {
 					},
 				},
 				GenerateName: "endpointslice-",
-				Namespace: adminService.Namespace,
+				Namespace:    adminService.Namespace,
 				Labels: map[string]string{
 					"kubernetes.io/service-name": adminService.Name,
 				},
@@ -529,7 +529,7 @@ func TestKongAdminAPIController(t *testing.T) {
 					},
 				},
 				GenerateName: "endpointslice-",
-				Namespace: adminService.Namespace,
+				Namespace:    adminService.Namespace,
 				Labels: map[string]string{
 					"kubernetes.io/service-name": adminService.Name,
 				},

test/envtest/setup.go

@@ -235,7 +235,7 @@ func deployGatewayUsingGatewayClass(ctx context.Context, t *testing.T, client cl
 			},
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Namespace: ns.Name,
+			Namespace:    ns.Name,
 			GenerateName: "gw-",
 		},
 	}