Merge pull request #2511 from dprotaso/add-v1-to-scheme

add v1 to various client schemes

Author: k8s-ci-robot

conformance/conformance_test.go

@@ -20,6 +20,7 @@ package conformance_test
 import (
 	"testing"
 
+	v1 "sigs.k8s.io/gateway-api/apis/v1"
 	"sigs.k8s.io/gateway-api/apis/v1alpha2"
 	"sigs.k8s.io/gateway-api/apis/v1beta1"
 	"sigs.k8s.io/gateway-api/conformance/tests"
@@ -48,6 +49,7 @@ func TestConformance(t *testing.T) {
 
 	v1alpha2.AddToScheme(client.Scheme())
 	v1beta1.AddToScheme(client.Scheme())
+	v1.AddToScheme(client.Scheme())
 
 	supportedFeatures := suite.ParseSupportedFeatures(*flags.SupportedFeatures)
 	exemptFeatures := suite.ParseSupportedFeatures(*flags.ExemptFeatures)

conformance/experimental_conformance_test.go

@@ -27,6 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/yaml"
 
+	v1 "sigs.k8s.io/gateway-api/apis/v1"
 	"sigs.k8s.io/gateway-api/apis/v1alpha2"
 	"sigs.k8s.io/gateway-api/apis/v1beta1"
 	confv1a1 "sigs.k8s.io/gateway-api/conformance/apis/v1alpha1"
@@ -65,6 +66,7 @@ func TestExperimentalConformance(t *testing.T) {
 
 	v1alpha2.AddToScheme(mgrClient.Scheme())
 	v1beta1.AddToScheme(mgrClient.Scheme())
+	v1.AddToScheme(mgrClient.Scheme())
 
 	// standard conformance flags
 	supportedFeatures = suite.ParseSupportedFeatures(*flags.SupportedFeatures)

gwctl/pkg/common/clients.go

@@ -30,6 +30,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
 )
@@ -52,6 +53,7 @@ func NewK8sClients(kubeconfig string) (*K8sClients, error) {
 	}
 	gatewayv1alpha2.AddToScheme(client.Scheme())
 	gatewayv1beta1.AddToScheme(client.Scheme())
+	gatewayv1.AddToScheme(client.Scheme())
 
 	dc := dynamic.NewForConfigOrDie(restConfig)
 
@@ -66,6 +68,7 @@ func MustClientsForTest(t *testing.T, initRuntimeObjects ...runtime.Object) *K8s
 	scheme := scheme.Scheme
 	gatewayv1alpha2.AddToScheme(scheme)
 	gatewayv1beta1.AddToScheme(scheme)
+	gatewayv1.AddToScheme(scheme)
 	apiextensionsv1.AddToScheme(scheme)
 
 	fakeClient := fakeclient.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(initRuntimeObjects...).Build()