fix unit test by creating gw class

kgateway-dev · Jul 23, 2024 · dc55a66 · dc55a66
1 parent 46aecbb
commit dc55a66
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/projects/gateway2/controller/controller_suite_test.go b/projects/gateway2/controller/controller_suite_test.go
@@ -40,6 +40,8 @@ var (
 	cancel    context.CancelFunc
 
 	kubeconfig string
+
+	gwClasses = sets.New(gatewayClassName, altGatewayClassName)
 )
 
 const (
@@ -108,29 +110,31 @@ var _ = BeforeSuite(func() {
 	cfg := controller.GatewayConfig{
 		Mgr:            mgr,
 		ControllerName: gatewayControllerName,
-		GWClasses:      sets.New(gatewayClassName, altGatewayClassName),
+		GWClasses:      gwClasses,
 		AutoProvision:  true,
 		Kick:           func(ctx context.Context) { return },
 		Extensions:     exts,
 	}
 	err = controller.NewBaseGatewayController(ctx, cfg)
 	Expect(err).ToNot(HaveOccurred())
 
-	err = k8sClient.Create(ctx, &api.GatewayClass{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: gatewayClassName,
-		},
-		Spec: api.GatewayClassSpec{
-			ControllerName: api.GatewayController(gatewayControllerName),
-			ParametersRef: &api.ParametersReference{
-				Group:     api.Group(v1alpha1.GroupVersion.Group),
-				Kind:      api.Kind("GatewayParameters"),
-				Name:      wellknown.DefaultGatewayParametersName,
-				Namespace: ptr.To(api.Namespace("default")),
+	for class := range gwClasses {
+		err = k8sClient.Create(ctx, &api.GatewayClass{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: class,
 			},
-		},
-	})
-	Expect(err).NotTo(HaveOccurred())
+			Spec: api.GatewayClassSpec{
+				ControllerName: api.GatewayController(gatewayControllerName),
+				ParametersRef: &api.ParametersReference{
+					Group:     api.Group(v1alpha1.GroupVersion.Group),
+					Kind:      api.Kind("GatewayParameters"),
+					Name:      wellknown.DefaultGatewayParametersName,
+					Namespace: ptr.To(api.Namespace("default")),
+				},
+			},
+		})
+		Expect(err).NotTo(HaveOccurred())
+	}
 
 	err = k8sClient.Create(ctx, &v1alpha1.GatewayParameters{
 		ObjectMeta: metav1.ObjectMeta{

diff --git a/projects/gateway2/controller/gw_controller_test.go b/projects/gateway2/controller/gw_controller_test.go
@@ -20,7 +20,6 @@ var _ = Describe("GwController", func() {
 	DescribeTable(
 		"should add status to gateway",
 		func(gwClass string) {
-			print(gwClass)
 			same := api.NamespacesFromSame
 			gwName := "gw-" + gwClass
 			gw := api.Gateway{