From 5560dffdba0e650410e2ee0fcc7c32eb6a5458f2 Mon Sep 17 00:00:00 2001 From: "L.Dongming" Date: Thu, 12 Oct 2023 11:54:41 +0800 Subject: [PATCH] more --- internal/cli/cmd/clusterversion/set_default_test.go | 2 +- internal/cli/cmd/kubeblocks/compare_test.go | 1 + internal/cli/cmd/kubeblocks/kubeblocks_test.go | 1 + internal/cli/cmd/migration/cmd_builder_test.go | 1 - internal/cli/cmd/playground/destroy_test.go | 1 + internal/cli/util/flags/flags_test.go | 1 + internal/preflight/text_results_test.go | 1 + lorry/middleware/probe/router.go | 4 ++-- 8 files changed, 8 insertions(+), 4 deletions(-) diff --git a/internal/cli/cmd/clusterversion/set_default_test.go b/internal/cli/cmd/clusterversion/set_default_test.go index 27dd665a494..7e982a234f3 100644 --- a/internal/cli/cmd/clusterversion/set_default_test.go +++ b/internal/cli/cmd/clusterversion/set_default_test.go @@ -24,10 +24,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "k8s.io/cli-runtime/pkg/genericiooptions" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/cli-runtime/pkg/genericiooptions" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes/scheme" clientfake "k8s.io/client-go/rest/fake" diff --git a/internal/cli/cmd/kubeblocks/compare_test.go b/internal/cli/cmd/kubeblocks/compare_test.go index 6b21b1fb550..9520b0391ac 100644 --- a/internal/cli/cmd/kubeblocks/compare_test.go +++ b/internal/cli/cmd/kubeblocks/compare_test.go @@ -22,6 +22,7 @@ package kubeblocks import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericiooptions" clientfake "k8s.io/client-go/rest/fake" diff --git a/internal/cli/cmd/kubeblocks/kubeblocks_test.go b/internal/cli/cmd/kubeblocks/kubeblocks_test.go index a65b77b25f0..7a2a5fc2a42 100644 --- a/internal/cli/cmd/kubeblocks/kubeblocks_test.go +++ b/internal/cli/cmd/kubeblocks/kubeblocks_test.go @@ -22,6 +22,7 @@ package kubeblocks import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericiooptions" clientfake "k8s.io/client-go/rest/fake" diff --git a/internal/cli/cmd/migration/cmd_builder_test.go b/internal/cli/cmd/migration/cmd_builder_test.go index 9ff5707bd49..051b7bc2069 100644 --- a/internal/cli/cmd/migration/cmd_builder_test.go +++ b/internal/cli/cmd/migration/cmd_builder_test.go @@ -24,7 +24,6 @@ import ( . "github.com/onsi/gomega" "k8s.io/cli-runtime/pkg/genericiooptions" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) diff --git a/internal/cli/cmd/playground/destroy_test.go b/internal/cli/cmd/playground/destroy_test.go index 808b2ea9069..13692cd3ab9 100644 --- a/internal/cli/cmd/playground/destroy_test.go +++ b/internal/cli/cmd/playground/destroy_test.go @@ -22,6 +22,7 @@ package playground import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "k8s.io/cli-runtime/pkg/genericiooptions" ) diff --git a/internal/cli/util/flags/flags_test.go b/internal/cli/util/flags/flags_test.go index 13b8718d0c8..113f1c47564 100644 --- a/internal/cli/util/flags/flags_test.go +++ b/internal/cli/util/flags/flags_test.go @@ -22,6 +22,7 @@ package flags import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/cobra" clientfake "k8s.io/client-go/rest/fake" "k8s.io/kube-openapi/pkg/validation/spec" diff --git a/internal/preflight/text_results_test.go b/internal/preflight/text_results_test.go index 87a0bbe8a64..1fe8b3d09d4 100644 --- a/internal/preflight/text_results_test.go +++ b/internal/preflight/text_results_test.go @@ -22,6 +22,7 @@ package preflight import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "k8s.io/cli-runtime/pkg/genericiooptions" analyzerunner "github.com/replicatedhq/troubleshoot/pkg/analyze" diff --git a/lorry/middleware/probe/router.go b/lorry/middleware/probe/router.go index 31320e034ff..fd7f4f9b845 100644 --- a/lorry/middleware/probe/router.go +++ b/lorry/middleware/probe/router.go @@ -28,10 +28,10 @@ import ( "github.com/go-errors/errors" - viper "github.com/apecloud/kubeblocks/internal/viperx" + . "github.com/apecloud/kubeblocks/lorry/binding" "github.com/apecloud/kubeblocks/internal/constant" - . "github.com/apecloud/kubeblocks/lorry/binding" + viper "github.com/apecloud/kubeblocks/internal/viperx" "github.com/apecloud/kubeblocks/lorry/binding/custom" "github.com/apecloud/kubeblocks/lorry/binding/etcd" "github.com/apecloud/kubeblocks/lorry/binding/mongodb"