use v1 directly instead of type alias

Signed-off-by: zirain <[email protected]>
envoyproxy · Sep 10, 2024 · 5f04b28 · 5f04b28
1 parent 34a117f
commit 5f04b28
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/api/v1alpha1/basic_auth_types.go b/api/v1alpha1/basic_auth_types.go
@@ -5,7 +5,9 @@
 
 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 +25,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
@@ -7,7 +7,7 @@ package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
 const OIDCClientSecretKey = "client-secret"
@@ -29,7 +29,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 optional cookie name overrides to be used for Bearer and IdToken cookies in the
 	// [Authentication Request](https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest).

diff --git a/api/v1alpha1/policy_helpers.go b/api/v1alpha1/policy_helpers.go
@@ -6,6 +6,7 @@
 package v1alpha1
 
 import (
+	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 )
 
@@ -30,7 +31,7 @@ type TargetSelector struct {
 	// Group is the group that this selector targets. Defaults to gateway.networking.k8s.io
 	//
 	// +kubebuilder:default:="gateway.networking.k8s.io"
-	Group *gwapiv1a2.Group `json:"group,omitempty"`
+	Group *gwapiv1.Group `json:"group,omitempty"`
 
 	// Kind is the resource kind that this selector targets.
 	Kind gwapiv1a2.Kind `json:"kind"`

diff --git a/api/v1alpha1/wasm_types.go b/api/v1alpha1/wasm_types.go
@@ -7,7 +7,7 @@ package v1alpha1
 
 import (
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	gwapiv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
 // Wasm defines a Wasm extension.
@@ -136,7 +136,7 @@ type ImageWasmCodeSource struct {
 	// Only support Kubernetes Secret resource from the same namespace.
 	// +kubebuilder:validation:XValidation:message="only support Secret kind.",rule="self.kind == 'Secret'"
 	// +optional
-	PullSecretRef *gwapiv1b1.SecretObjectReference `json:"pullSecretRef,omitempty"`
+	PullSecretRef *gwapiv1.SecretObjectReference `json:"pullSecretRef,omitempty"`
 }
 
 // ImagePullPolicy defines the policy to use when pulling an OIC image.

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go