Update Gateway APIs to v1.0.0

solo-io · Nov 10, 2023 · 4aaa180 · 4aaa180
1 parent 333bf87
commit 4aaa180
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 104 deletions.
diff --git a/codegen/k8s_groups.go b/codegen/k8s_groups.go
@@ -12,8 +12,7 @@ import (
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
-	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
 const (
@@ -173,8 +172,8 @@ func k8sGroups() []model.Group {
 		},
 		{
 			GroupVersion: schema.GroupVersion{
-				Group:   gatewayv1beta1.GroupName,
-				Version: gatewayv1beta1.GroupVersion.Version,
+				Group:   gatewayapiv1.GroupName,
+				Version: gatewayapiv1.GroupVersion.Version,
 			},
 			Module: "sigs.k8s.io/gateway-api",
 			Resources: []model.Resource{
@@ -188,34 +187,8 @@ func k8sGroups() []model.Group {
 				{
 					Kind: "HTTPRoute",
 				},
-				{
-					Kind: "ReferenceGrant",
-				},
-			},
-			CustomTypesImportPath: "sigs.k8s.io/gateway-api/apis/v1beta1",
-			ApiRoot:               k8sApiRoot,
-		},
-		{
-			GroupVersion: schema.GroupVersion{
-				Group:   gatewayv1alpha2.GroupName,
-				Version: gatewayv1alpha2.GroupVersion.Version,
-			},
-			Module: "sigs.k8s.io/gateway-api",
-			Resources: []model.Resource{
-				{
-					Kind: "GRPCRoute",
-				},
-				{
-					Kind: "TCPRoute",
-				},
-				{
-					Kind: "TLSRoute",
-				},
-				{
-					Kind: "UDPRoute",
-				},
 			},
-			CustomTypesImportPath: "sigs.k8s.io/gateway-api/apis/v1alpha2",
+			CustomTypesImportPath: "sigs.k8s.io/gateway-api/apis/v1",
 			ApiRoot:               k8sApiRoot,
 		},
 	}

diff --git a/go.mod b/go.mod
@@ -86,7 +86,7 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mattn/go-zglob v0.0.3 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/hashstructure v1.0.0 // indirect