update gatewayClassName used in tests (#10708)

jenshu · web-flow · commit 511c876ab1e5 · 2025-02-26T20:38:16.000Z
Signed-off-by: Jenny Shu &lt;jenny.shu@solo.io&gt;
diff --git a/devel/architecture/istio-integration.md b/devel/architecture/istio-integration.md
@@ -224,7 +224,7 @@ kind: Gateway
 metadata:
   name: http
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
   - allowedRoutes:
       namespaces:
diff --git a/install/test/k8sgateway_test.go b/install/test/k8sgateway_test.go
@@ -50,7 +50,7 @@ var _ = Describe("Kubernetes Gateway API integration", func() {
 				Expect(deployment.Spec.Template.Spec.Containers).To(HaveLen(1), "should have exactly 1 container")
 
 				// make sure the GatewayClass and RBAC resources exist (note, since they are all cluster-scoped, they do not have a namespace)
-				testManifest.ExpectUnstructured("GatewayClass", "", "gloo-gateway").NotTo(BeNil())
+				testManifest.ExpectUnstructured("GatewayClass", "", wellknown.GatewayClassName).NotTo(BeNil())
 
 				testManifest.ExpectUnstructured("GatewayParameters", namespace, wellknown.DefaultGatewayParametersName).NotTo(BeNil())
 
@@ -491,7 +491,7 @@ var _ = Describe("Kubernetes Gateway API integration", func() {
 				Expect(deployment.Spec.Template.Spec.Containers).To(HaveLen(1), "should have exactly 1 container")
 
 				// the RBAC resources should not be rendered
-				testManifest.ExpectUnstructured("GatewayClass", "", "gloo-gateway").To(BeNil())
+				testManifest.ExpectUnstructured("GatewayClass", "", wellknown.GatewayClassName).To(BeNil())
 
 				testManifest.ExpectUnstructured("GatewayParameters", namespace, wellknown.DefaultGatewayParametersName).To(BeNil())
 
diff --git a/internal/kgateway/.gitignore b/internal/kgateway/.gitignore
@@ -1,3 +1,2 @@
 # ignore binary that may be created in the current dir
-/gloo-gateway
 /.bin
diff --git a/internal/kgateway/README.md b/internal/kgateway/README.md
@@ -38,7 +38,7 @@ kind: Gateway
 metadata:
   name: http
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
   - allowedRoutes:
       namespaces:
diff --git a/test/kubernetes/e2e/features/deployer/minimal_default_gatewayparameters_suite.go b/test/kubernetes/e2e/features/deployer/minimal_default_gatewayparameters_suite.go
@@ -18,7 +18,7 @@ import (
 var _ e2e.NewSuiteFunc = NewMinimalDefaultGatewayParametersTestingSuite
 
 // minimalDefaultGatewayParametersDeployerSuite tests the "deployer" feature in situations where users have applied `null` values
-// to as many of the helm values controlling the default GatewayParameters for the gloo-gateway GatewayClass as possible.
+// to as many of the helm values controlling the default GatewayParameters for the kgateway GatewayClass as possible.
 // The "deployer" code can be found here: /internal/kgateway/deployer
 type minimalDefaultGatewayParametersDeployerSuite struct {
 	suite.Suite
diff --git a/test/kubernetes/e2e/features/deployer/testdata/gateway-with-parameters.yaml b/test/kubernetes/e2e/features/deployer/testdata/gateway-with-parameters.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     gateway.kgateway.dev/gateway-parameters-name: "gw-params"
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/deployer/testdata/gateway-without-parameters.yaml b/test/kubernetes/e2e/features/deployer/testdata/gateway-without-parameters.yaml
@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
 metadata:
   name: gw
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/deployer/testdata/istio-gateway-parameters.yaml b/test/kubernetes/e2e/features/deployer/testdata/istio-gateway-parameters.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     gateway.kgateway.dev/gateway-parameters-name: "gw-params"
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/deployer/testdata/self-managed-gateway.yaml b/test/kubernetes/e2e/features/deployer/testdata/self-managed-gateway.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     gateway.kgateway.dev/gateway-parameters-name: "gw-params"
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/directresponse/testdata/gateway.yaml b/test/kubernetes/e2e/features/directresponse/testdata/gateway.yaml
@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
 metadata:
   name: gw
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/headless_svc/generate/generated_example/k8s_api.gen.yaml b/test/kubernetes/e2e/features/headless_svc/generate/generated_example/k8s_api.gen.yaml
@@ -4,7 +4,7 @@ metadata:
   name: gw
   namespace: default
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
   - allowedRoutes:
       namespaces:
diff --git a/test/kubernetes/e2e/features/headless_svc/resources.go b/test/kubernetes/e2e/features/headless_svc/resources.go
@@ -20,6 +20,7 @@ import (
 	"github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils"
 
 	gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1"
+	"github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown"
 	"github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/resources"
 )
 
@@ -113,7 +114,7 @@ var (
 			Namespace: "default",
 		},
 		Spec: gwv1.GatewaySpec{
-			GatewayClassName: "gloo-gateway",
+			GatewayClassName: wellknown.GatewayClassName,
 			Listeners: []gwv1.Listener{
 				{
 					Name:     "http",
diff --git a/test/kubernetes/e2e/features/http_listener_options/testdata/gateway.yaml b/test/kubernetes/e2e/features/http_listener_options/testdata/gateway.yaml
@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
 metadata:
   name: gw
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/istio/testdata/k8s-routing-svc.yaml b/test/kubernetes/e2e/features/istio/testdata/k8s-routing-svc.yaml
@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
 metadata:
   name: gw
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/istio/testdata/k8s-routing-upstream.yaml b/test/kubernetes/e2e/features/istio/testdata/k8s-routing-upstream.yaml
@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
 metadata:
   name: gw
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/listener_options/testdata/setup.yaml b/test/kubernetes/e2e/features/listener_options/testdata/setup.yaml
@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
 metadata:
   name: gw
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/metrics/testdata/gateway-and-route-to-service.yaml b/test/kubernetes/e2e/features/metrics/testdata/gateway-and-route-to-service.yaml
@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
 metadata:
   name: gw
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/metrics/testdata/gateway-and-route-to-upstream.yaml b/test/kubernetes/e2e/features/metrics/testdata/gateway-and-route-to-upstream.yaml
@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
 metadata:
   name: gw
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/port_routing/testdata/gateway.yaml b/test/kubernetes/e2e/features/port_routing/testdata/gateway.yaml
@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
 metadata:
   name: gw
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/route_delegation/testdata/common.yaml b/test/kubernetes/e2e/features/route_delegation/testdata/common.yaml
@@ -156,7 +156,7 @@ metadata:
   name: http-gateway
   namespace: infra
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
   - protocol: HTTP
     port: 8080
diff --git a/test/kubernetes/e2e/features/route_delegation/testdata/invalid_child_valid_standalone.yaml b/test/kubernetes/e2e/features/route_delegation/testdata/invalid_child_valid_standalone.yaml
@@ -23,7 +23,7 @@ metadata:
   name: http-gateway-test
   namespace: infra
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
   - protocol: HTTP
     port: 8090
diff --git a/test/kubernetes/e2e/features/route_options/testdata/setup.yaml b/test/kubernetes/e2e/features/route_options/testdata/setup.yaml
@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
 metadata:
   name: gw
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/services/httproute/testdata/route-with-service.yaml b/test/kubernetes/e2e/features/services/httproute/testdata/route-with-service.yaml
@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
 metadata:
   name: gw
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/services/tcproute/testdata/cross-ns-gateway-and-client.yaml b/test/kubernetes/e2e/features/services/tcproute/testdata/cross-ns-gateway-and-client.yaml
@@ -3,7 +3,7 @@ kind: Gateway
 metadata:
   name: gateway
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - name: listener-8080
       port: 8080
diff --git a/test/kubernetes/e2e/features/services/tcproute/testdata/cross-ns-no-refgrant-gateway-and-client.yaml b/test/kubernetes/e2e/features/services/tcproute/testdata/cross-ns-no-refgrant-gateway-and-client.yaml
@@ -3,7 +3,7 @@ kind: Gateway
 metadata:
   name: gateway
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - name: listener-8080
       port: 8080
diff --git a/test/kubernetes/e2e/features/services/tcproute/testdata/multi-listener-gateway-and-client.yaml b/test/kubernetes/e2e/features/services/tcproute/testdata/multi-listener-gateway-and-client.yaml
@@ -3,7 +3,7 @@ kind: Gateway
 metadata:
   name: multi-tcp-gateway
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
   - name: listener-8088
     protocol: TCP
diff --git a/test/kubernetes/e2e/features/services/tcproute/testdata/single-listener-gateway-and-client.yaml b/test/kubernetes/e2e/features/services/tcproute/testdata/single-listener-gateway-and-client.yaml
@@ -3,7 +3,7 @@ kind: Gateway
 metadata:
   name: single-tcp-gateway
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
   - name: listener-8087
     protocol: TCP
diff --git a/test/kubernetes/e2e/features/upstreams/inputs/route-with-upstream.yaml b/test/kubernetes/e2e/features/upstreams/inputs/route-with-upstream.yaml
@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
 metadata:
   name: gw
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/virtualhost_options/testdata/setup.yaml b/test/kubernetes/e2e/features/virtualhost_options/testdata/setup.yaml
@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
 metadata:
   name: gw
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080
diff --git a/test/kubernetes/e2e/features/zero_downtime_rollout/testdata/route-with-service.yaml b/test/kubernetes/e2e/features/zero_downtime_rollout/testdata/route-with-service.yaml
@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
 metadata:
   name: gw
 spec:
-  gatewayClassName: gloo-gateway
+  gatewayClassName: kgateway
   listeners:
     - protocol: HTTP
       port: 8080

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`# ignore binary that may be created in the current dir`
`2`		`-/gloo-gateway`
`3`	`2`	`/.bin`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import (`
`20`	`20`	`"github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils"`
`21`	`21`
`22`	`22`	`gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1"`
	`23`	`+ "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown"`
`23`	`24`	`"github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/resources"`
`24`	`25`	`)`
`25`	`26`
`@@ -113,7 +114,7 @@ var (`
`113`	`114`	`Namespace: "default",`
`114`	`115`	`},`
`115`	`116`	`Spec: gwv1.GatewaySpec{`
`116`		`- GatewayClassName: "gloo-gateway",`
	`117`	`+ GatewayClassName: wellknown.GatewayClassName,`
`117`	`118`	`Listeners: []gwv1.Listener{`
`118`	`119`	`{`
`119`	`120`	`Name: "http",`