From 4833cf579f38f2ae4cd295194bb904015265dc3e Mon Sep 17 00:00:00 2001
From: Arko Dasgupta <arko@tetrate.io>
Date: Wed, 18 Oct 2023 19:29:40 -0700
Subject: [PATCH] register for v1beta1 gateway api

* `ReferenceGrant` is still on v1beta1

Fixes: https://github.com/envoyproxy/gateway/issues/2005

Signed-off-by: Arko Dasgupta <arko@tetrate.io>
---
 internal/envoygateway/scheme.go                   | 4 ++++
 site/content/en/latest/user/secure-gateways.md    | 2 +-
 test/conformance/conformance_test.go              | 1 -
 test/conformance/experimental_conformance_test.go | 1 -
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/internal/envoygateway/scheme.go b/internal/envoygateway/scheme.go
index b50af115570..911ae708351 100644
--- a/internal/envoygateway/scheme.go
+++ b/internal/envoygateway/scheme.go
@@ -10,6 +10,7 @@ import (
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
+	gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1"
 	mcsapi "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1"
 
 	egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
@@ -37,6 +38,9 @@ func init() {
 	if err := gwapiv1.AddToScheme(scheme); err != nil {
 		panic(err)
 	}
+	if err := gwapiv1b1.AddToScheme(scheme); err != nil {
+		panic(err)
+	}
 	if err := gwapiv1a2.AddToScheme(scheme); err != nil {
 		panic(err)
 	}
diff --git a/site/content/en/latest/user/secure-gateways.md b/site/content/en/latest/user/secure-gateways.md
index 25f6808292f..c2b91f0b937 100644
--- a/site/content/en/latest/user/secure-gateways.md
+++ b/site/content/en/latest/user/secure-gateways.md
@@ -173,7 +173,7 @@ namespace to reference Secrets in the "envoy-gateway-system" namespace:
 
 ```console
 $ cat <<EOF | kubectl apply -f -
-apiVersion: gateway.networking.k8s.io/v1alpha2
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: ReferenceGrant
 metadata:
   name: example
diff --git a/test/conformance/conformance_test.go b/test/conformance/conformance_test.go
index b0b49c4fd2b..aa62bce887c 100644
--- a/test/conformance/conformance_test.go
+++ b/test/conformance/conformance_test.go
@@ -47,7 +47,6 @@ func TestGatewayAPIConformance(t *testing.T) {
 		SupportedFeatures:    suite.AllFeatures,
 		SkipTests: []string{
 			tests.GatewaySecretInvalidReferenceGrant.ShortName,
-			tests.HTTPRouteReferenceGrant.ShortName,
 			tests.HTTPRouteRewritePath.ShortName,
 			tests.GatewayStaticAddresses.ShortName,
 		},
diff --git a/test/conformance/experimental_conformance_test.go b/test/conformance/experimental_conformance_test.go
index 814bd88a225..c0443ab9e2f 100644
--- a/test/conformance/experimental_conformance_test.go
+++ b/test/conformance/experimental_conformance_test.go
@@ -94,7 +94,6 @@ func experimentalConformance(t *testing.T) {
 				CleanupBaseResources: *flags.CleanupBaseResources,
 				SkipTests: []string{
 					tests.GatewaySecretInvalidReferenceGrant.ShortName,
-					tests.HTTPRouteReferenceGrant.ShortName,
 					tests.HTTPRouteRewritePath.ShortName,
 					tests.GatewayStaticAddresses.ShortName,
 				},