Unify apiextv1 imports (#1737)

Signed-off-by: Alena Varkockova <varkockova.a@gmail.com>
kudobuilder · Nov 24, 2020 · e5c14d9 · e5c14d9
1 parent 42a195f
commit e5c14d9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/pkg/kudoctl/cmd/init_test.go b/pkg/kudoctl/cmd/init_test.go
@@ -16,7 +16,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/api/extensions/v1beta1"
 	rbacv1 "k8s.io/api/rbac/v1"
-	extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextfake "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -315,23 +315,23 @@ func MockCRD(client *kube.Client, crdName string, apiVersion string) {
 		getAction, _ := action.(testing2.GetAction)
 		if getAction != nil {
 			if getAction.GetName() == crdName {
-				crd := &extv1.CustomResourceDefinition{
+				crd := &apiextv1.CustomResourceDefinition{
 					TypeMeta: metav1.TypeMeta{
 						APIVersion: apiVersion,
 					},
 					ObjectMeta: metav1.ObjectMeta{
 						Name: crdName,
 					},
-					Spec: extv1.CustomResourceDefinitionSpec{
-						Versions: []extv1.CustomResourceDefinitionVersion{
+					Spec: apiextv1.CustomResourceDefinitionSpec{
+						Versions: []apiextv1.CustomResourceDefinitionVersion{
 							{
 								Name:    apiVersion,
 								Served:  true,
 								Storage: true,
 							},
 						},
 					},
-					Status: extv1.CustomResourceDefinitionStatus{},
+					Status: apiextv1.CustomResourceDefinitionStatus{},
 				}
 				return true, crd, nil
 			}

diff --git a/pkg/kudoctl/kudoinit/prereq/webhook_test.go b/pkg/kudoctl/kudoinit/prereq/webhook_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextensionsfake "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -130,24 +130,24 @@ func TestPrereq_Ok_PreValidate_Webhook_CertManager_MultipleVersions(t *testing.T
 	client := getFakeClient()
 
 	cert := createCrd("certificates.certmanager.k8s.io", "v1alpha1")
-	cert.Spec.Versions = append(cert.Spec.Versions, apiextensions.CustomResourceDefinitionVersion{
+	cert.Spec.Versions = append(cert.Spec.Versions, apiextv1.CustomResourceDefinitionVersion{
 		Name:    "v1beta1",
 		Served:  true,
 		Storage: false,
 	})
-	cert.Spec.Versions = append(cert.Spec.Versions, apiextensions.CustomResourceDefinitionVersion{
+	cert.Spec.Versions = append(cert.Spec.Versions, apiextv1.CustomResourceDefinitionVersion{
 		Name:    "v1beta2",
 		Served:  true,
 		Storage: false,
 	})
 
 	issuer := createCrd("issuers.certmanager.k8s.io", "v1alpha1")
-	issuer.Spec.Versions = append(cert.Spec.Versions, apiextensions.CustomResourceDefinitionVersion{ //nolint:gocritic
+	issuer.Spec.Versions = append(cert.Spec.Versions, apiextv1.CustomResourceDefinitionVersion{ //nolint:gocritic
 		Name:    "v1beta1",
 		Served:  true,
 		Storage: false,
 	})
-	issuer.Spec.Versions = append(cert.Spec.Versions, apiextensions.CustomResourceDefinitionVersion{ //nolint:gocritic
+	issuer.Spec.Versions = append(cert.Spec.Versions, apiextv1.CustomResourceDefinitionVersion{ //nolint:gocritic
 		Name:    "v1beta2",
 		Served:  true,
 		Storage: false,
@@ -166,7 +166,7 @@ func TestPrereq_Ok_PreValidate_Webhook_CertManager_MultipleVersions(t *testing.T
 	assert.Equal(t, 0, len(result.Errors))
 }
 
-func mockFullCRD(client *kube.Client, definition *apiextensions.CustomResourceDefinition) {
+func mockFullCRD(client *kube.Client, definition *apiextv1.CustomResourceDefinition) {
 	client.ExtClient.(*apiextensionsfake.Clientset).Fake.PrependReactor("get", "customresourcedefinitions", func(action testing2.Action) (handled bool, ret runtime.Object, err error) {
 		getAction, _ := action.(testing2.GetAction)
 		if getAction != nil {
@@ -178,24 +178,24 @@ func mockFullCRD(client *kube.Client, definition *apiextensions.CustomResourceDe
 	})
 }
 
-func createCrd(crdName string, apiVersion string) *apiextensions.CustomResourceDefinition {
-	return &apiextensions.CustomResourceDefinition{
+func createCrd(crdName string, apiVersion string) *apiextv1.CustomResourceDefinition {
+	return &apiextv1.CustomResourceDefinition{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: apiVersion,
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name: crdName,
 		},
-		Spec: apiextensions.CustomResourceDefinitionSpec{
-			Versions: []apiextensions.CustomResourceDefinitionVersion{
+		Spec: apiextv1.CustomResourceDefinitionSpec{
+			Versions: []apiextv1.CustomResourceDefinitionVersion{
 				{
 					Name:    apiVersion,
 					Served:  true,
 					Storage: true,
 				},
 			},
 		},
-		Status: apiextensions.CustomResourceDefinitionStatus{},
+		Status: apiextv1.CustomResourceDefinitionStatus{},
 	}
 }
 

diff --git a/pkg/test/fake/client.go b/pkg/test/fake/client.go
@@ -5,7 +5,7 @@ import (
 	batchv1 "k8s.io/api/batch/v1"
 	batchv1beta1 "k8s.io/api/batch/v1beta1"
 	corev1 "k8s.io/api/core/v1"
-	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/discovery"
 	fakediscovery "k8s.io/client-go/discovery/fake"
@@ -56,7 +56,7 @@ func CustomCachedDiscoveryClient(additionalResources ...*metav1.APIResourceList)
 			},
 		},
 		{
-			GroupVersion: apiextensions.SchemeGroupVersion.String(),
+			GroupVersion: apiextv1.SchemeGroupVersion.String(),
 			APIResources: []metav1.APIResource{
 				{Name: "customresourcedefinitions", Namespaced: false, Kind: "CustomResourceDefinition"},
 			},