From 5304a1234cf9edbfc3fb44042a9837b920546b92 Mon Sep 17 00:00:00 2001 From: guangwu Date: Sun, 25 Jun 2023 16:13:34 +0800 Subject: [PATCH] chore: pkg imported more than once (#5779) Signed-off-by: guoguangwu --- pkg/controller/job/job_controller_test.go | 3 +-- .../client/openpitrix/helmwrapper/post_renderer_kustomize.go | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/controller/job/job_controller_test.go b/pkg/controller/job/job_controller_test.go index b7fe08ab6..e3f37617d 100644 --- a/pkg/controller/job/job_controller_test.go +++ b/pkg/controller/job/job_controller_test.go @@ -26,7 +26,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/diff" - "k8s.io/client-go/informers" kubeinformers "k8s.io/client-go/informers" k8sfake "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" @@ -134,7 +133,7 @@ func checkAction(expected, actual core.Action, t *testing.T) { } } -func (f *fixture) newController() (*JobController, informers.SharedInformerFactory) { +func (f *fixture) newController() (*JobController, kubeinformers.SharedInformerFactory) { f.kubeclient = k8sfake.NewSimpleClientset(f.kubeobjects...) k8sI := kubeinformers.NewSharedInformerFactory(f.kubeclient, noResyncPeriodFunc()) diff --git a/pkg/simple/client/openpitrix/helmwrapper/post_renderer_kustomize.go b/pkg/simple/client/openpitrix/helmwrapper/post_renderer_kustomize.go index af8bfe9bf..9bd1ea373 100644 --- a/pkg/simple/client/openpitrix/helmwrapper/post_renderer_kustomize.go +++ b/pkg/simple/client/openpitrix/helmwrapper/post_renderer_kustomize.go @@ -20,7 +20,6 @@ import ( "sigs.k8s.io/kustomize/api/krusty" "sigs.k8s.io/kustomize/api/resmap" - "sigs.k8s.io/kustomize/api/types" kustypes "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/kyaml/filesys" ) @@ -64,10 +63,10 @@ func writeFile(fs filesys.FileSystem, path string, content *bytes.Buffer) error func (k *postRendererKustomize) Run(renderedManifests *bytes.Buffer) (modifiedManifests *bytes.Buffer, err error) { fs := filesys.MakeFsInMemory() input := "./.local-helm-output.yaml" - cfg := types.Kustomization{ + cfg := kustypes.Kustomization{ Resources: []string{input}, CommonAnnotations: k.annotations, // add extra annotations to output - Labels: []types.Label{{Pairs: k.labels}}, // Labels to add to all objects but not selectors. + Labels: []kustypes.Label{{Pairs: k.labels}}, // Labels to add to all objects but not selectors. } cfg.APIVersion = kustypes.KustomizationVersion cfg.Kind = kustypes.KustomizationKind