conformance: update tests to use gatewayv1 APIs (#4722)

cnvergence · web-flow · commit 6176b0fe0cc6 · 2026-04-08T01:41:36.000+05:30
* update Gateway version to v1 in UDP conformance test

Signed-off-by: Karol Szwaj &lt;karol.szwaj@gmail.com&gt;

* update conformance tests v1beta1 apis to v1

Signed-off-by: Karol Szwaj &lt;karol.szwaj@gmail.com&gt;

---------

Signed-off-by: Karol Szwaj &lt;karol.szwaj@gmail.com&gt;
diff --git a/conformance/base/manifests.yaml b/conformance/base/manifests.yaml
@@ -13,7 +13,7 @@ metadata:
   labels:
     gateway-conformance: infra
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
   name: same-namespace
@@ -28,7 +28,7 @@ spec:
       namespaces:
         from: Same
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
   name: same-namespace-with-https-listener
@@ -88,7 +88,7 @@ spec:
         name: tls-validity-checks-certificate
         namespace: gateway-conformance-infra
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
   name: all-namespaces
@@ -103,7 +103,7 @@ spec:
       namespaces:
         from: All
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
   name: backend-namespaces
diff --git a/conformance/conformance.go b/conformance/conformance.go
@@ -25,7 +25,6 @@ import (
 	v1 "sigs.k8s.io/gateway-api/apis/v1"
 	"sigs.k8s.io/gateway-api/apis/v1alpha2"
 	"sigs.k8s.io/gateway-api/apis/v1alpha3"
-	"sigs.k8s.io/gateway-api/apis/v1beta1"
 	xv1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1"
 	confv1 "sigs.k8s.io/gateway-api/conformance/apis/v1"
 	"sigs.k8s.io/gateway-api/conformance/tests"
@@ -65,7 +64,6 @@ func DefaultOptions(t *testing.T) suite.ConformanceOptions {
 
 	require.NoError(t, v1alpha3.Install(client.Scheme()))
 	require.NoError(t, v1alpha2.Install(client.Scheme()))
-	require.NoError(t, v1beta1.Install(client.Scheme()))
 	require.NoError(t, xv1alpha1.Install(client.Scheme()))
 	require.NoError(t, v1.Install(client.Scheme()))
 	require.NoError(t, apiextensionsv1.AddToScheme(client.Scheme()))
@@ -84,7 +82,7 @@ func DefaultOptions(t *testing.T) suite.ConformanceOptions {
 		*flags.ImplementationVersion,
 		*flags.ImplementationContact,
 	)
-	var usable, unusable []v1beta1.GatewaySpecAddress
+	var usable, unusable []v1.GatewaySpecAddress
 	if v := *flags.UsableAddress; v != "" {
 		usable = append(usable, parseAddress(v))
 	}
@@ -122,16 +120,16 @@ func DefaultOptions(t *testing.T) suite.ConformanceOptions {
 	}
 }
 
-func parseAddress(v string) v1beta1.GatewaySpecAddress {
+func parseAddress(v string) v1.GatewaySpecAddress {
 	_, err := netip.ParseAddr(v)
 	if err == nil {
-		return v1beta1.GatewaySpecAddress{
-			Type:  ptr.To(v1beta1.IPAddressType),
+		return v1.GatewaySpecAddress{
+			Type:  ptr.To(v1.IPAddressType),
 			Value: v,
 		}
 	}
-	return v1beta1.GatewaySpecAddress{
-		Type:  ptr.To(v1beta1.HostnameAddressType),
+	return v1.GatewaySpecAddress{
+		Type:  ptr.To(v1.HostnameAddressType),
 		Value: v,
 	}
 }
diff --git a/conformance/tests/gateway-secret-invalid-reference-grant.yaml b/conformance/tests/gateway-secret-invalid-reference-grant.yaml
@@ -19,7 +19,7 @@ spec:
             name: certificate
             namespace: gateway-conformance-web-backend
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-wrong-namespace
@@ -34,7 +34,7 @@ spec:
       kind: Secret
       name: certificate
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-wrong-from-group
@@ -49,7 +49,7 @@ spec:
       kind: Secret
       name: certificate
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-wrong-from-kind
@@ -64,7 +64,7 @@ spec:
       kind: Secret
       name: certificate
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-wrong-from-namespace
@@ -79,7 +79,7 @@ spec:
       kind: Secret
       name: certificate
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-wrong-to-group
@@ -94,7 +94,7 @@ spec:
       kind: Secret
       name: not-the-certificate-youre-looking-for
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-wrong-to-kind
@@ -109,7 +109,7 @@ spec:
       kind: Service
       name: certificate
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-wrong-to-name
diff --git a/conformance/tests/gateway-secret-reference-grant-all-in-namespace.yaml b/conformance/tests/gateway-secret-reference-grant-all-in-namespace.yaml
@@ -19,7 +19,7 @@ spec:
             name: certificate
             namespace: gateway-conformance-web-backend
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-all-in-namespace
diff --git a/conformance/tests/gateway-secret-reference-grant-specific.yaml b/conformance/tests/gateway-secret-reference-grant-specific.yaml
@@ -19,7 +19,7 @@ spec:
             name: certificate
             namespace: gateway-conformance-web-backend
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-specific
diff --git a/conformance/tests/gateway-with-attached-routes.yaml b/conformance/tests/gateway-with-attached-routes.yaml
@@ -106,7 +106,7 @@ spec:
     - name: infra-backend-v1
       port: 8080
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
   name: unresolved-gateway-with-one-attached-unresolved-route
@@ -134,7 +134,7 @@ spec:
         name: does-not-exist
       mode: Terminate
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
   name: http-route-4
diff --git a/conformance/tests/httproute-invalid-reference-grant.yaml b/conformance/tests/httproute-invalid-reference-grant.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-wrong-namespace
@@ -14,7 +14,7 @@ spec:
       kind: Service
       name: web-backend
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-wrong-from-group
@@ -29,7 +29,7 @@ spec:
       kind: Service
       name: web-backend
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-wrong-from-kind
@@ -44,7 +44,7 @@ spec:
       kind: Service
       name: web-backend
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-wrong-from-namespace
@@ -59,7 +59,7 @@ spec:
       kind: Service
       name: web-backend
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-wrong-to-group
@@ -74,7 +74,7 @@ spec:
       kind: Service
       name: web-backend
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-wrong-to-kind
@@ -89,7 +89,7 @@ spec:
       kind: Secret
       name: web-backend
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-wrong-to-name
diff --git a/conformance/tests/httproute-partially-invalid-via-invalid-reference-grant.yaml b/conformance/tests/httproute-partially-invalid-via-invalid-reference-grant.yaml
@@ -1,4 +1,4 @@
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: invalid-reference-grant
diff --git a/conformance/tests/httproute-reference-grant.go b/conformance/tests/httproute-reference-grant.go
@@ -24,7 +24,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
-	"sigs.k8s.io/gateway-api/apis/v1beta1"
+	v1 "sigs.k8s.io/gateway-api/apis/v1"
 	"sigs.k8s.io/gateway-api/conformance/utils/http"
 	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
 	confsuite "sigs.k8s.io/gateway-api/conformance/utils/suite"
@@ -64,7 +64,7 @@ var HTTPRouteReferenceGrant = confsuite.ConformanceTest{
 
 		ctx, cancel := context.WithTimeout(context.Background(), suite.TimeoutConfig.DeleteTimeout)
 		defer cancel()
-		rg := v1beta1.ReferenceGrant{
+		rg := v1.ReferenceGrant{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "reference-grant",
 				Namespace: confsuite.WebBackendNamespace,
diff --git a/conformance/tests/httproute-reference-grant.yaml b/conformance/tests/httproute-reference-grant.yaml
@@ -1,4 +1,4 @@
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant
diff --git a/conformance/tests/httproute-simple-same-namespace.go b/conformance/tests/httproute-simple-same-namespace.go
@@ -21,7 +21,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/types"
 
-	"sigs.k8s.io/gateway-api/apis/v1beta1"
+	v1 "sigs.k8s.io/gateway-api/apis/v1"
 	"sigs.k8s.io/gateway-api/conformance/utils/http"
 	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
 	confsuite "sigs.k8s.io/gateway-api/conformance/utils/suite"
@@ -41,7 +41,7 @@ var HTTPRouteSimpleSameNamespace = confsuite.ConformanceTest{
 	},
 	Manifests: []string{"tests/httproute-simple-same-namespace.yaml"},
 	Test: func(t *testing.T, suite *confsuite.ConformanceTestSuite) {
-		ns := v1beta1.Namespace(confsuite.InfrastructureNamespace)
+		ns := v1.Namespace(confsuite.InfrastructureNamespace)
 		routeNN := types.NamespacedName{Name: confsuite.InfrastructureGatewayName, Namespace: string(ns)}
 		gwNN := types.NamespacedName{Name: "same-namespace", Namespace: string(ns)}
 		gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeAccepted(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)
diff --git a/conformance/tests/listenerset-allowed-routes-namespaces.yaml b/conformance/tests/listenerset-allowed-routes-namespaces.yaml
@@ -131,7 +131,7 @@ spec:
       port: 8080
 ---
 kind: ReferenceGrant
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 metadata:
   name: listenerset-test-allowed-routes-namespaces-reference-grant
   namespace: gateway-conformance-infra
diff --git a/conformance/tests/listenerset-reference-grant.yaml b/conformance/tests/listenerset-reference-grant.yaml
@@ -23,7 +23,7 @@ spec:
     namespaces:
       from: All
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-for-gateway
@@ -63,7 +63,7 @@ spec:
         name: certificate
         namespace: gateway-conformance-web-backend
 ---
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: ReferenceGrant
 metadata:
   name: reference-grant-for-listener-set
diff --git a/conformance/tests/tlsroute-invalid-reference-grant.go b/conformance/tests/tlsroute-invalid-reference-grant.go
@@ -22,7 +22,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
-	"sigs.k8s.io/gateway-api/apis/v1beta1"
+	v1 "sigs.k8s.io/gateway-api/apis/v1"
 	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
 	confsuite "sigs.k8s.io/gateway-api/conformance/utils/suite"
 	"sigs.k8s.io/gateway-api/pkg/features"
@@ -49,9 +49,9 @@ var TLSRouteInvalidReferenceGrant = confsuite.ConformanceTest{
 
 		t.Run("TLSRoute with BackendRef in another namespace and no ReferenceGrant covering the Service has a ResolvedRefs Condition with status False and Reason RefNotPermitted", func(t *testing.T) {
 			resolvedRefsCond := metav1.Condition{
-				Type:   string(v1beta1.RouteConditionResolvedRefs),
+				Type:   string(v1.RouteConditionResolvedRefs),
 				Status: metav1.ConditionFalse,
-				Reason: string(v1beta1.RouteReasonRefNotPermitted),
+				Reason: string(v1.RouteReasonRefNotPermitted),
 			}
 
 			kubernetes.TLSRouteMustHaveCondition(t, suite.Client, suite.TimeoutConfig, routeNN, gwNN, resolvedRefsCond)
diff --git a/conformance/tests/tlsroute-invalid-reference-grant.yaml b/conformance/tests/tlsroute-invalid-reference-grant.yaml
diff --git a/conformance/tests/tlsroute-simple-same-namespace.yaml b/conformance/tests/tlsroute-simple-same-namespace.yaml
diff --git a/conformance/tests/udproute-simple.yaml b/conformance/tests/udproute-simple.yaml
diff --git a/conformance/utils/kubernetes/apply.go b/conformance/utils/kubernetes/apply.go
diff --git a/conformance/utils/kubernetes/apply_test.go b/conformance/utils/kubernetes/apply_test.go
diff --git a/conformance/utils/kubernetes/helpers_test.go b/conformance/utils/kubernetes/helpers_test.go
diff --git a/conformance/utils/suite/suite.go b/conformance/utils/suite/suite.go

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ import (`
`25`	`25`	`v1 "sigs.k8s.io/gateway-api/apis/v1"`
`26`	`26`	`"sigs.k8s.io/gateway-api/apis/v1alpha2"`
`27`	`27`	`"sigs.k8s.io/gateway-api/apis/v1alpha3"`
`28`		`- "sigs.k8s.io/gateway-api/apis/v1beta1"`
`29`	`28`	`xv1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1"`
`30`	`29`	`confv1 "sigs.k8s.io/gateway-api/conformance/apis/v1"`
`31`	`30`	`"sigs.k8s.io/gateway-api/conformance/tests"`
`@@ -65,7 +64,6 @@ func DefaultOptions(t *testing.T) suite.ConformanceOptions {`
`65`	`64`
`66`	`65`	`require.NoError(t, v1alpha3.Install(client.Scheme()))`
`67`	`66`	`require.NoError(t, v1alpha2.Install(client.Scheme()))`
`68`		`- require.NoError(t, v1beta1.Install(client.Scheme()))`
`69`	`67`	`require.NoError(t, xv1alpha1.Install(client.Scheme()))`
`70`	`68`	`require.NoError(t, v1.Install(client.Scheme()))`
`71`	`69`	`require.NoError(t, apiextensionsv1.AddToScheme(client.Scheme()))`
`@@ -84,7 +82,7 @@ func DefaultOptions(t *testing.T) suite.ConformanceOptions {`
`84`	`82`	`*flags.ImplementationVersion,`
`85`	`83`	`*flags.ImplementationContact,`
`86`	`84`	`)`
`87`		`- var usable, unusable []v1beta1.GatewaySpecAddress`
	`85`	`+ var usable, unusable []v1.GatewaySpecAddress`
`88`	`86`	`if v := *flags.UsableAddress; v != "" {`
`89`	`87`	`usable = append(usable, parseAddress(v))`
`90`	`88`	`}`
`@@ -122,16 +120,16 @@ func DefaultOptions(t *testing.T) suite.ConformanceOptions {`
`122`	`120`	`}`
`123`	`121`	`}`
`124`	`122`
`125`		`-func parseAddress(v string) v1beta1.GatewaySpecAddress {`
	`123`	`+func parseAddress(v string) v1.GatewaySpecAddress {`
`126`	`124`	`_, err := netip.ParseAddr(v)`
`127`	`125`	`if err == nil {`
`128`		`- return v1beta1.GatewaySpecAddress{`
`129`		`- Type: ptr.To(v1beta1.IPAddressType),`
	`126`	`+ return v1.GatewaySpecAddress{`
	`127`	`+ Type: ptr.To(v1.IPAddressType),`
`130`	`128`	`Value: v,`
`131`	`129`	`}`
`132`	`130`	`}`
`133`		`- return v1beta1.GatewaySpecAddress{`
`134`		`- Type: ptr.To(v1beta1.HostnameAddressType),`
	`131`	`+ return v1.GatewaySpecAddress{`
	`132`	`+ Type: ptr.To(v1.HostnameAddressType),`
`135`	`133`	`Value: v,`
`136`	`134`	`}`
`137`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-apiVersion: gateway.networking.k8s.io/v1beta1`
	`1`	`+apiVersion: gateway.networking.k8s.io/v1`
`2`	`2`	`kind: ReferenceGrant`
`3`	`3`	`metadata:`
`4`	`4`	`name: invalid-reference-grant`