revert: Use v1beta1 gateway API

Dcard · Apr 9, 2024 · 8fb41ee · 8fb41ee
1 parent febe293
commit 8fb41ee
Show file tree

Hide file tree

Showing 523 changed files with 1,230 additions and 1,204 deletions.
diff --git a/api/v1alpha1/basic_auth_types.go b/api/v1alpha1/basic_auth_types.go
@@ -5,7 +5,7 @@
 
 package v1alpha1
 
-import gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+import gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 
 const BasicAuthUsersSecretKey = ".htpasswd"
 
@@ -23,5 +23,5 @@ type BasicAuth struct {
 	// for more details.
 	//
 	// Note: The secret must be in the same namespace as the SecurityPolicy.
-	Users gwapiv1b1.SecretObjectReference `json:"users"`
+	Users gwapiv1.SecretObjectReference `json:"users"`
 }
diff --git a/api/v1alpha1/oidc_types.go b/api/v1alpha1/oidc_types.go
@@ -5,9 +5,7 @@
 
 package v1alpha1
 
-import (
-	gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1"
-)
+import gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 
 const OIDCClientSecretKey = "client-secret"
 
@@ -28,7 +26,7 @@ type OIDC struct {
 	// This is an Opaque secret. The client secret should be stored in the key
 	// "client-secret".
 	// +kubebuilder:validation:Required
-	ClientSecret gwapiv1b1.SecretObjectReference `json:"clientSecret"`
+	ClientSecret gwapiv1.SecretObjectReference `json:"clientSecret"`
 
 	// The OIDC scopes to be used in the
 	// [Authentication Request](https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest).

diff --git a/internal/cmd/egctl/status.go b/internal/cmd/egctl/status.go
@@ -18,8 +18,8 @@ import (
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	gwv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
+	gwv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1"
 
 	egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
 )
@@ -119,21 +119,21 @@ func runStatus(ctx context.Context, cli client.Client, resourceType, namespace s
 
 	switch strings.ToLower(resourceType) {
 	case "gc", "gatewayclass":
-		gc := gwv1.GatewayClassList{}
+		gc := gwv1b1.GatewayClassList{}
 		if err := cli.List(ctx, &gc, client.InNamespace(namespace)); err != nil {
 			return err
 		}
 		resourcesList = &gc
 
 	case "gtw", "gateway":
-		gtw := gwv1.GatewayList{}
+		gtw := gwv1b1.GatewayList{}
 		if err := cli.List(ctx, &gtw, client.InNamespace(namespace)); err != nil {
 			return err
 		}
 		resourcesList = &gtw
 
 	case "httproute":
-		httproute := gwv1.HTTPRouteList{}
+		httproute := gwv1b1.HTTPRouteList{}
 		if err := cli.List(ctx, &httproute, client.InNamespace(namespace)); err != nil {
 			return err
 		}

diff --git a/internal/cmd/egctl/status_test.go b/internal/cmd/egctl/status_test.go
@@ -10,13 +10,14 @@ import (
 	"testing"
 	"time"
 
+	egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
+
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gwv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
-
-	egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
+	gwv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1"
 )
 
 func TestWriteStatus(t *testing.T) {
@@ -37,7 +38,7 @@ func TestWriteStatus(t *testing.T) {
 	}{
 		{
 			name:               "egctl x status gc -v, but no resources",
-			resourceList:       &gwv1.GatewayClassList{},
+			resourceList:       &gwv1b1.GatewayClassList{},
 			resourceNamespaced: false,
 			resourceType:       "gatewayclass",
 			quiet:              false,
@@ -50,8 +51,8 @@ func TestWriteStatus(t *testing.T) {
 		},
 		{
 			name: "egctl x status gc",
-			resourceList: &gwv1.GatewayClassList{
-				Items: []gwv1.GatewayClass{
+			resourceList: &gwv1b1.GatewayClassList{
+				Items: []gwv1b1.GatewayClass{
 					{
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "gc",
@@ -93,8 +94,8 @@ gc        foobar2   test-status-2   test reason 2
 		},
 		{
 			name: "egctl x status gc -v",
-			resourceList: &gwv1.GatewayClassList{
-				Items: []gwv1.GatewayClass{
+			resourceList: &gwv1b1.GatewayClassList{
+				Items: []gwv1b1.GatewayClass{
 					{
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "gc",
@@ -136,8 +137,8 @@ gc        foobar2   test-status-2   test reason 2   test message 2   123457
 		},
 		{
 			name: "egctl x status gc -v -q",
-			resourceList: &gwv1.GatewayClassList{
-				Items: []gwv1.GatewayClass{
+			resourceList: &gwv1b1.GatewayClassList{
+				Items: []gwv1b1.GatewayClass{
 					{
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "gc",
@@ -178,7 +179,7 @@ gc        foobar2   test-status-2   test reason 2   test message 2   123457
 		},
 		{
 			name:               "egctl x status gtw -v -A, no resources",
-			resourceList:       &gwv1.GatewayList{},
+			resourceList:       &gwv1b1.GatewayList{},
 			resourceNamespaced: true,
 			resourceType:       "gateway",
 			quiet:              false,
@@ -191,8 +192,8 @@ gc        foobar2   test-status-2   test reason 2   test message 2   123457
 		},
 		{
 			name: "egctl x status gtw -v -A",
-			resourceList: &gwv1.GatewayList{
-				Items: []gwv1.Gateway{
+			resourceList: &gwv1b1.GatewayList{
+				Items: []gwv1b1.Gateway{
 					{
 						ObjectMeta: metav1.ObjectMeta{
 							Name:      "gtw",
@@ -235,8 +236,8 @@ default     gtw       foobar2   test-status-2   test reason 2   test message 2
 		},
 		{
 			name: "egctl x status gtw -v -q -A",
-			resourceList: &gwv1.GatewayList{
-				Items: []gwv1.Gateway{
+			resourceList: &gwv1b1.GatewayList{
+				Items: []gwv1b1.Gateway{
 					{
 						ObjectMeta: metav1.ObjectMeta{
 							Name:      "gtw1",
@@ -305,8 +306,8 @@ default2    gtw2      foobar4   test-status-4   test reason 4   test message 4
 		},
 		{
 			name: "egctl x status httproute -A",
-			resourceList: &gwv1.HTTPRouteList{
-				Items: []gwv1.HTTPRoute{
+			resourceList: &gwv1b1.HTTPRouteList{
+				Items: []gwv1b1.HTTPRoute{
 					{
 						ObjectMeta: metav1.ObjectMeta{
 							Name:      "http1",
@@ -389,8 +390,8 @@ default2    http2     foobar4   test-status-4   test reason 4
 		},
 		{
 			name: "egctl x status httproute -q -n default1",
-			resourceList: &gwv1.HTTPRouteList{
-				Items: []gwv1.HTTPRoute{
+			resourceList: &gwv1b1.HTTPRouteList{
+				Items: []gwv1b1.HTTPRoute{
 					{
 						ObjectMeta: metav1.ObjectMeta{
 							Name:      "http1",

diff --git a/internal/cmd/egctl/testdata/translate/in/default-resources.yaml b/internal/cmd/egctl/testdata/translate/in/default-resources.yaml
@@ -1,11 +1,11 @@
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: GatewayClass
 metadata:
   name: eg
 spec:
   controllerName: gateway.envoyproxy.io/gatewayclass-controller
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
 metadata:
   name: eg
@@ -91,7 +91,7 @@ spec:
           port: 3000
           weight: 1
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: backend

diff --git a/internal/cmd/egctl/testdata/translate/in/echo-gateway-api.yaml b/internal/cmd/egctl/testdata/translate/in/echo-gateway-api.yaml
@@ -1,11 +1,11 @@
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: GatewayClass
 metadata:
   name: eg
 spec:
   controllerName: gateway.envoyproxy.io/gatewayclass-controller
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
 metadata:
   name: eg
@@ -70,7 +70,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: backend

diff --git a/internal/cmd/egctl/testdata/translate/in/envoy-patch-policy.yaml b/internal/cmd/egctl/testdata/translate/in/envoy-patch-policy.yaml
@@ -1,11 +1,11 @@
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: GatewayClass
 metadata:
   name: eg
 spec:
   controllerName: gateway.envoyproxy.io/gatewayclass-controller
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
 metadata:
   name: eg
@@ -74,7 +74,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: backend

diff --git a/internal/cmd/egctl/testdata/translate/in/from-gateway-api-to-xds.yaml b/internal/cmd/egctl/testdata/translate/in/from-gateway-api-to-xds.yaml
@@ -1,11 +1,11 @@
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: GatewayClass
 metadata:
   name: eg
 spec:
   controllerName: gateway.envoyproxy.io/gatewayclass-controller
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
 metadata:
   name: eg
@@ -123,7 +123,7 @@ spec:
           port: 3000
           weight: 1
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: backend

diff --git a/internal/cmd/egctl/testdata/translate/in/invalid-envoyproxy.yaml b/internal/cmd/egctl/testdata/translate/in/invalid-envoyproxy.yaml
@@ -18,7 +18,7 @@ spec:
             address: 127.0.0.1
             port_value: 19000
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: GatewayClass
 metadata:
   name: eg
@@ -30,7 +30,7 @@ spec:
     name: example
     namespace: default
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
 metadata:
   name: eg
@@ -148,7 +148,7 @@ spec:
           port: 3000
           weight: 1
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: backend

diff --git a/internal/cmd/egctl/testdata/translate/in/jwt-single-route-single-match-to-xds.yaml b/internal/cmd/egctl/testdata/translate/in/jwt-single-route-single-match-to-xds.yaml
@@ -1,11 +1,11 @@
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: GatewayClass
 metadata:
   name: eg
 spec:
   controllerName: gateway.envoyproxy.io/gatewayclass-controller
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
 metadata:
   name: eg
@@ -85,7 +85,7 @@ spec:
         remoteJWKS:
           uri: https://raw.githubusercontent.com/envoyproxy/gateway/main/examples/kubernetes/jwt/jwks.json
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: backend

diff --git a/internal/cmd/egctl/testdata/translate/in/multiple-xds.yaml b/internal/cmd/egctl/testdata/translate/in/multiple-xds.yaml
@@ -1,11 +1,11 @@
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: GatewayClass
 metadata:
   name: eg
 spec:
   controllerName: gateway.envoyproxy.io/gatewayclass-controller
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
 metadata:
   name: eg
@@ -41,7 +41,7 @@ spec:
   selector:
     app: backend
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: backend
@@ -63,7 +63,7 @@ spec:
             type: PathPrefix
             value: /
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
 metadata:
   name: eg2
@@ -75,7 +75,7 @@ spec:
       protocol: HTTP
       port: 80
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: backend

diff --git a/internal/cmd/egctl/testdata/translate/in/no-gateway-class-resources.yaml b/internal/cmd/egctl/testdata/translate/in/no-gateway-class-resources.yaml
@@ -1,4 +1,4 @@
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
 metadata:
   name: eg
@@ -9,7 +9,7 @@ spec:
       protocol: HTTP
       port: 80
 ---
-apiVersion: gateway.networking.k8s.io/v1
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: backend