chore: make linter happy

Signed-off-by: Kumar Mallikarjuna <[email protected]>
kudobuilder · Dec 17, 2024 · b42fa72 · b42fa72
1 parent 537b777
commit b42fa72
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 32 deletions.
diff --git a/pkg/kubernetes/config.go b/pkg/kubernetes/config.go
@@ -6,7 +6,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer/json"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/client-go/tools/clientcmd/api/v1"
+	appsv1 "k8s.io/client-go/tools/clientcmd/api/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
@@ -38,25 +38,25 @@ func BuildConfigWithContext(kubeconfig, context string) (*rest.Config, error) {
 
 // Kubeconfig converts a rest.Config into a YAML kubeconfig and writes it to w
 func Kubeconfig(cfg *rest.Config, w io.Writer) error {
-	var authProvider *v1.AuthProviderConfig
-	var execConfig *v1.ExecConfig
+	var authProvider *appsv1.AuthProviderConfig
+	var execConfig *appsv1.ExecConfig
 	if cfg.AuthProvider != nil {
-		authProvider = &v1.AuthProviderConfig{
+		authProvider = &appsv1.AuthProviderConfig{
 			Name:   cfg.AuthProvider.Name,
 			Config: cfg.AuthProvider.Config,
 		}
 	}
 
 	if cfg.ExecProvider != nil {
-		execConfig = &v1.ExecConfig{
+		execConfig = &appsv1.ExecConfig{
 			Command:    cfg.ExecProvider.Command,
 			Args:       cfg.ExecProvider.Args,
 			APIVersion: cfg.ExecProvider.APIVersion,
-			Env:        []v1.ExecEnvVar{},
+			Env:        []appsv1.ExecEnvVar{},
 		}
 
 		for _, envVar := range cfg.ExecProvider.Env {
-			execConfig.Env = append(execConfig.Env, v1.ExecEnvVar{
+			execConfig.Env = append(execConfig.Env, appsv1.ExecEnvVar{
 				Name:  envVar.Name,
 				Value: envVar.Value,
 			})
@@ -66,31 +66,31 @@ func Kubeconfig(cfg *rest.Config, w io.Writer) error {
 	if err != nil {
 		return err
 	}
-	return json.NewYAMLSerializer(json.DefaultMetaFactory, nil, nil).Encode(&v1.Config{
+	return json.NewYAMLSerializer(json.DefaultMetaFactory, nil, nil).Encode(&appsv1.Config{
 		CurrentContext: "cluster",
-		Clusters: []v1.NamedCluster{
+		Clusters: []appsv1.NamedCluster{
 			{
 				Name: "cluster",
-				Cluster: v1.Cluster{
+				Cluster: appsv1.Cluster{
 					Server:                   cfg.Host,
 					CertificateAuthorityData: cfg.TLSClientConfig.CAData,
 					InsecureSkipTLSVerify:    cfg.TLSClientConfig.Insecure,
 				},
 			},
 		},
-		Contexts: []v1.NamedContext{
+		Contexts: []appsv1.NamedContext{
 			{
 				Name: "cluster",
-				Context: v1.Context{
+				Context: appsv1.Context{
 					Cluster:  "cluster",
 					AuthInfo: "user",
 				},
 			},
 		},
-		AuthInfos: []v1.NamedAuthInfo{
+		AuthInfos: []appsv1.NamedAuthInfo{
 			{
 				Name: "user",
-				AuthInfo: v1.AuthInfo{
+				AuthInfo: appsv1.AuthInfo{
 					ClientCertificateData: cfg.TLSClientConfig.CertData,
 					ClientKeyData:         cfg.TLSClientConfig.KeyData,
 					Token:                 cfg.BearerToken,

diff --git a/pkg/kubernetes/fake/fake_client.go b/pkg/kubernetes/fake/fake_client.go
@@ -1,13 +1,13 @@
 package fake
 
 import (
-	v13 "k8s.io/api/apps/v1"
-	v14 "k8s.io/api/batch/v1"
+	appsv1 "k8s.io/api/apps/v1"
+	batchv1 "k8s.io/api/batch/v1"
 	"k8s.io/api/batch/v1beta1"
-	v12 "k8s.io/api/core/v1"
-	v15 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	v1beta12 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	corev1 "k8s.io/api/core/v1"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/discovery/fake"
 	"k8s.io/client-go/testing"
@@ -18,43 +18,43 @@ import (
 func DiscoveryClient() discovery.DiscoveryInterface {
 	return &fake.FakeDiscovery{
 		Fake: &testing.Fake{
-			Resources: []*v1.APIResourceList{
+			Resources: []*metav1.APIResourceList{
 				{
-					GroupVersion: v12.SchemeGroupVersion.String(),
-					APIResources: []v1.APIResource{
+					GroupVersion: corev1.SchemeGroupVersion.String(),
+					APIResources: []metav1.APIResource{
 						{Name: "pod", Namespaced: true, Kind: "Pod"},
 						{Name: "namespace", Namespaced: false, Kind: "Namespace"},
 						{Name: "service", Namespaced: true, Kind: "Service"},
 					},
 				},
 				{
-					GroupVersion: v13.SchemeGroupVersion.String(),
-					APIResources: []v1.APIResource{
+					GroupVersion: appsv1.SchemeGroupVersion.String(),
+					APIResources: []metav1.APIResource{
 						{Name: "statefulset", Namespaced: true, Kind: "StatefulSet"},
 						{Name: "deployment", Namespaced: true, Kind: "Deployment"},
 					},
 				},
 				{
-					GroupVersion: v14.SchemeGroupVersion.String(),
-					APIResources: []v1.APIResource{
+					GroupVersion: batchv1.SchemeGroupVersion.String(),
+					APIResources: []metav1.APIResource{
 						{Name: "job", Namespaced: true, Kind: "Job"},
 					},
 				},
 				{
 					GroupVersion: v1beta1.SchemeGroupVersion.String(),
-					APIResources: []v1.APIResource{
+					APIResources: []metav1.APIResource{
 						{Name: "job", Namespaced: true, Kind: "CronJob"},
 					},
 				},
 				{
-					GroupVersion: v15.SchemeGroupVersion.String(),
-					APIResources: []v1.APIResource{
+					GroupVersion: apiextv1.SchemeGroupVersion.String(),
+					APIResources: []metav1.APIResource{
 						{Name: "customresourcedefinitions", Namespaced: false, Kind: "CustomResourceDefinition"},
 					},
 				},
 				{
-					GroupVersion: v1beta12.SchemeGroupVersion.String(),
-					APIResources: []v1.APIResource{
+					GroupVersion: apiextv1beta1.SchemeGroupVersion.String(),
+					APIResources: []metav1.APIResource{
 						{Name: "customresourcedefinitions", Namespaced: false, Kind: "CustomResourceDefinition"},
 					},
 				},