From 4564012ae0275188923c8b7ee873459298315125 Mon Sep 17 00:00:00 2001 From: 24sama Date: Mon, 19 Dec 2022 14:00:54 +0800 Subject: [PATCH] feat: modify go mod path Signed-off-by: 24sama --- .golangci.yml | 6 +- Makefile | 8 +- .../k3s/controllers/k3sconfig_controller.go | 12 +- bootstrap/k3s/main.go | 6 +- .../k3s/pkg/cloudinit/controlplane_init.go | 2 +- bootstrap/k3s/pkg/types/util.go | 2 +- cmd/kk/apis/kubekey/v1alpha2/cluster_types.go | 10 +- cmd/kk/apis/kubekey/v1alpha2/default.go | 2 +- cmd/kk/cmd/add/add.go | 2 +- cmd/kk/cmd/add/add_nodes.go | 8 +- cmd/kk/cmd/alpha/alpha.go | 2 +- cmd/kk/cmd/alpha/create.go | 6 +- cmd/kk/cmd/alpha/cri/cri.go | 2 +- cmd/kk/cmd/alpha/cri/migrate_cri.go | 8 +- cmd/kk/cmd/alpha/upgrade.go | 8 +- cmd/kk/cmd/artifact/artifact.go | 4 +- cmd/kk/cmd/artifact/export.go | 8 +- cmd/kk/cmd/artifact/images/images.go | 2 +- cmd/kk/cmd/artifact/images/push.go | 16 +-- cmd/kk/cmd/artifact/import.go | 8 +- cmd/kk/cmd/cert/cert.go | 2 +- cmd/kk/cmd/cert/list_cert.go | 8 +- cmd/kk/cmd/cert/renew_cert.go | 8 +- cmd/kk/cmd/completion/completion.go | 2 +- cmd/kk/cmd/create/cluster.go | 12 +- cmd/kk/cmd/create/config.go | 10 +- cmd/kk/cmd/create/create.go | 2 +- cmd/kk/cmd/create/manifest.go | 8 +- cmd/kk/cmd/create/phase/binary.go | 10 +- cmd/kk/cmd/create/phase/configure.go | 8 +- cmd/kk/cmd/create/phase/etcd.go | 8 +- cmd/kk/cmd/create/phase/images.go | 8 +- cmd/kk/cmd/create/phase/init.go | 8 +- cmd/kk/cmd/create/phase/join.go | 8 +- cmd/kk/cmd/create/phase/kubesphere.go | 10 +- cmd/kk/cmd/create/phase/os.go | 8 +- cmd/kk/cmd/delete/delete.go | 2 +- cmd/kk/cmd/delete/delete_cluster.go | 8 +- cmd/kk/cmd/delete/delete_node.go | 8 +- cmd/kk/cmd/init/init.go | 2 +- cmd/kk/cmd/init/init_os.go | 8 +- cmd/kk/cmd/init/init_registry.go | 8 +- cmd/kk/cmd/plugin/list.go | 2 +- cmd/kk/cmd/plugin/plugin.go | 2 +- cmd/kk/cmd/root.go | 24 ++-- cmd/kk/cmd/upgrade/phase/binary.go | 11 +- cmd/kk/cmd/upgrade/phase/images.go | 9 +- cmd/kk/cmd/upgrade/phase/kubesphere.go | 11 +- cmd/kk/cmd/upgrade/phase/nodes.go | 8 +- cmd/kk/cmd/upgrade/upgrade.go | 13 +-- cmd/kk/cmd/version/version.go | 4 +- cmd/kk/main.go | 2 +- cmd/kk/pkg/addons/addons.go | 4 +- cmd/kk/pkg/addons/charts.go | 6 +- cmd/kk/pkg/addons/module.go | 4 +- cmd/kk/pkg/addons/tasks.go | 6 +- cmd/kk/pkg/artifact/manifest.go | 13 +-- cmd/kk/pkg/artifact/module.go | 4 +- cmd/kk/pkg/artifact/prepares.go | 5 +- cmd/kk/pkg/artifact/tasks.go | 8 +- cmd/kk/pkg/artifact/templates/manifest.go | 8 +- cmd/kk/pkg/binaries/k3s.go | 13 ++- cmd/kk/pkg/binaries/k8e.go | 13 ++- cmd/kk/pkg/binaries/kubernetes.go | 13 ++- cmd/kk/pkg/binaries/module.go | 7 +- cmd/kk/pkg/binaries/registry.go | 12 +- cmd/kk/pkg/binaries/tasks.go | 7 +- cmd/kk/pkg/bootstrap/confirm/module.go | 6 +- cmd/kk/pkg/bootstrap/confirm/tasks.go | 10 +- cmd/kk/pkg/bootstrap/customscripts/module.go | 8 +- cmd/kk/pkg/bootstrap/customscripts/tasks.go | 14 +-- cmd/kk/pkg/bootstrap/os/module.go | 12 +- cmd/kk/pkg/bootstrap/os/prepares.go | 6 +- .../pkg/bootstrap/os/repository/repository.go | 3 +- .../bootstrap/os/repository/repository_deb.go | 2 +- .../bootstrap/os/repository/repository_rpm.go | 2 +- cmd/kk/pkg/bootstrap/os/rollback.go | 12 +- cmd/kk/pkg/bootstrap/os/tasks.go | 10 +- .../pkg/bootstrap/os/templates/init_script.go | 8 +- cmd/kk/pkg/bootstrap/precheck/module.go | 8 +- cmd/kk/pkg/bootstrap/precheck/prepares.go | 5 +- cmd/kk/pkg/bootstrap/precheck/tasks.go | 12 +- cmd/kk/pkg/bootstrap/registry/certs.go | 14 ++- cmd/kk/pkg/bootstrap/registry/module.go | 16 +-- cmd/kk/pkg/bootstrap/registry/prepares.go | 4 +- cmd/kk/pkg/bootstrap/registry/tasks.go | 9 +- cmd/kk/pkg/certs/module.go | 14 +-- cmd/kk/pkg/certs/prepares.go | 6 +- cmd/kk/pkg/certs/tasks.go | 20 ++-- cmd/kk/pkg/common/artifact_action.go | 4 +- cmd/kk/pkg/common/artifact_module.go | 4 +- cmd/kk/pkg/common/artifact_prepare.go | 4 +- cmd/kk/pkg/common/artifact_runtime.go | 4 +- cmd/kk/pkg/common/kube_action.go | 4 +- cmd/kk/pkg/common/kube_module.go | 4 +- cmd/kk/pkg/common/kube_prepare.go | 4 +- cmd/kk/pkg/common/kube_rollback.go | 4 +- cmd/kk/pkg/common/kube_runtime.go | 4 +- cmd/kk/pkg/common/loader.go | 6 +- cmd/kk/pkg/common/local_runtime.go | 4 +- cmd/kk/pkg/config/from_cluster.go | 7 +- cmd/kk/pkg/config/generate.go | 10 +- cmd/kk/pkg/config/templates/cluster.go | 2 +- cmd/kk/pkg/container/containerd.go | 25 ++-- cmd/kk/pkg/container/docker.go | 14 +-- cmd/kk/pkg/container/module.go | 21 ++-- cmd/kk/pkg/container/prepares.go | 4 +- .../pkg/container/templates/docker_config.go | 3 +- cmd/kk/pkg/core/action/base.go | 4 +- cmd/kk/pkg/core/action/interface.go | 4 +- cmd/kk/pkg/core/action/template.go | 4 +- cmd/kk/pkg/core/connector/dialer.go | 3 +- cmd/kk/pkg/core/connector/host.go | 2 +- cmd/kk/pkg/core/connector/interface.go | 2 +- cmd/kk/pkg/core/connector/runner.go | 7 +- cmd/kk/pkg/core/connector/runtime.go | 6 +- cmd/kk/pkg/core/connector/ssh.go | 14 ++- cmd/kk/pkg/core/ending/action_results.go | 3 +- cmd/kk/pkg/core/ending/interface.go | 3 +- cmd/kk/pkg/core/ending/module_result.go | 5 +- cmd/kk/pkg/core/ending/task_result.go | 6 +- cmd/kk/pkg/core/logger/kubekey.log | 1 - cmd/kk/pkg/core/logger/kubekey.log.20220930 | 110 ------------------ cmd/kk/pkg/core/logger/logger.go | 2 +- cmd/kk/pkg/core/module/base.go | 9 +- cmd/kk/pkg/core/module/hook.go | 4 +- cmd/kk/pkg/core/module/interface.go | 6 +- cmd/kk/pkg/core/module/task_module.go | 9 +- cmd/kk/pkg/core/pipeline/pipeline.go | 10 +- cmd/kk/pkg/core/prepare/base.go | 4 +- cmd/kk/pkg/core/prepare/fast_prepare.go | 2 +- cmd/kk/pkg/core/prepare/file_check.go | 4 +- cmd/kk/pkg/core/prepare/interface.go | 4 +- cmd/kk/pkg/core/rollback/base.go | 6 +- cmd/kk/pkg/core/rollback/interface.go | 6 +- cmd/kk/pkg/core/task/interface.go | 6 +- cmd/kk/pkg/core/task/local_task.go | 18 +-- cmd/kk/pkg/core/task/remote_task.go | 16 +-- cmd/kk/pkg/core/task/remote_task_test.go | 3 +- cmd/kk/pkg/core/util/file.go | 5 +- cmd/kk/pkg/core/util/ip.go | 6 +- cmd/kk/pkg/etcd/certs.go | 20 ++-- cmd/kk/pkg/etcd/module.go | 12 +- cmd/kk/pkg/etcd/prepares.go | 5 +- cmd/kk/pkg/etcd/tasks.go | 17 ++- cmd/kk/pkg/files/file.go | 9 +- cmd/kk/pkg/filesystem/module.go | 6 +- cmd/kk/pkg/filesystem/task.go | 10 +- cmd/kk/pkg/images/copy.go | 3 +- cmd/kk/pkg/images/images.go | 12 +- cmd/kk/pkg/images/module.go | 4 +- cmd/kk/pkg/images/tasks.go | 12 +- cmd/kk/pkg/images/utils.go | 2 +- cmd/kk/pkg/images/utils_test.go | 3 +- cmd/kk/pkg/k3s/k3s_status.go | 8 +- cmd/kk/pkg/k3s/module.go | 11 +- cmd/kk/pkg/k3s/prepares.go | 5 +- cmd/kk/pkg/k3s/tasks.go | 24 ++-- cmd/kk/pkg/k3s/templates/k3sRegistryConfig.go | 6 +- cmd/kk/pkg/k8e/k8e_status.go | 5 +- cmd/kk/pkg/k8e/module.go | 10 +- cmd/kk/pkg/k8e/prepares.go | 5 +- cmd/kk/pkg/k8e/tasks.go | 19 +-- cmd/kk/pkg/kubernetes/kubernetes_status.go | 8 +- cmd/kk/pkg/kubernetes/module.go | 14 +-- cmd/kk/pkg/kubernetes/prepares.go | 5 +- cmd/kk/pkg/kubernetes/tasks.go | 32 ++--- .../templates/v1beta2/kubeadm_config.go | 12 +- cmd/kk/pkg/kubesphere/kubesphere_test.go | 3 +- cmd/kk/pkg/kubesphere/modules.go | 14 +-- cmd/kk/pkg/kubesphere/prepares.go | 5 +- cmd/kk/pkg/kubesphere/tasks.go | 22 ++-- cmd/kk/pkg/loadbalancer/module.go | 16 +-- cmd/kk/pkg/loadbalancer/prepares.go | 10 +- cmd/kk/pkg/loadbalancer/tasks.go | 13 ++- .../loadbalancer/templates/haproxyConfig.go | 10 +- cmd/kk/pkg/phase/artifact/artifact.go | 8 +- cmd/kk/pkg/phase/binary/create_binary.go | 10 +- cmd/kk/pkg/phase/binary/modules.go | 6 +- cmd/kk/pkg/phase/binary/task.go | 10 +- cmd/kk/pkg/phase/binary/upgrade_binary.go | 10 +- cmd/kk/pkg/phase/confirm/confirm.go | 4 +- cmd/kk/pkg/phase/confirm/task.go | 8 +- cmd/kk/pkg/phase/etcd/etcd.go | 10 +- cmd/kk/pkg/phase/etcd/modules.go | 8 +- cmd/kk/pkg/phase/images/create_images.go | 12 +- cmd/kk/pkg/phase/images/modules.go | 10 +- cmd/kk/pkg/phase/images/upgrade_images.go | 8 +- cmd/kk/pkg/phase/kubernetes/configure.go | 22 ++-- cmd/kk/pkg/phase/kubernetes/init.go | 14 +-- cmd/kk/pkg/phase/kubernetes/join.go | 10 +- cmd/kk/pkg/phase/kubernetes/modules.go | 10 +- .../pkg/phase/kubesphere/create_kubesphere.go | 12 +- .../phase/kubesphere/upgrade_kubesphere.go | 12 +- cmd/kk/pkg/phase/nodes/modules.go | 8 +- cmd/kk/pkg/phase/nodes/nodes.go | 10 +- cmd/kk/pkg/phase/os/config.go | 10 +- cmd/kk/pkg/phase/precheck/modules.go | 8 +- cmd/kk/pkg/phase/precheck/task.go | 7 +- cmd/kk/pkg/pipelines/add_nodes.go | 40 +++---- cmd/kk/pkg/pipelines/artifact_export.go | 16 +-- cmd/kk/pkg/pipelines/check_certs.go | 10 +- cmd/kk/pkg/pipelines/create_cluster.go | 50 ++++---- cmd/kk/pkg/pipelines/delete_cluster.go | 24 ++-- cmd/kk/pkg/pipelines/delete_node.go | 16 +-- cmd/kk/pkg/pipelines/init_dependencies.go | 16 +-- cmd/kk/pkg/pipelines/init_registry.go | 18 +-- cmd/kk/pkg/pipelines/migrate_container.go | 14 +-- cmd/kk/pkg/pipelines/renew_certs.go | 10 +- cmd/kk/pkg/pipelines/upgrade_cluster.go | 22 ++-- cmd/kk/pkg/plugins/dns/module.go | 14 +-- cmd/kk/pkg/plugins/dns/prepares.go | 4 +- cmd/kk/pkg/plugins/dns/tasks.go | 14 ++- cmd/kk/pkg/plugins/kata.go | 18 +-- cmd/kk/pkg/plugins/modules.go | 2 +- cmd/kk/pkg/plugins/network/modules.go | 17 +-- cmd/kk/pkg/plugins/network/prepares.go | 5 +- cmd/kk/pkg/plugins/network/tasks.go | 15 +-- cmd/kk/pkg/plugins/nfd.go | 18 +-- cmd/kk/pkg/plugins/storage/modules.go | 14 +-- cmd/kk/pkg/plugins/storage/prepares.go | 10 +- cmd/kk/pkg/plugins/storage/tasks.go | 4 +- cmd/kk/pkg/registry/docker_registry_config.go | 24 +--- cmd/kk/pkg/utils/certs/certs.go | 12 +- cmd/kk/pkg/utils/certs/utils.go | 7 +- cmd/kk/pkg/utils/client.go | 5 +- cmd/kk/pkg/utils/containerruntime/runtime.go | 3 +- cmd/kk/pkg/utils/util.go | 10 +- cmd/kk/pkg/version/kubernetes/version_enum.go | 6 +- cmd/kk/pkg/version/kubesphere/ks_installer.go | 4 +- controllers/alias.go | 6 +- controllers/kkcluster/kkcluster_controller.go | 6 +- .../kkcluster/kkcluster_controller_phases.go | 6 +- controllers/kkcluster/patch.go | 6 +- .../kkinstance/kkinstance_controller.go | 20 ++-- .../kkinstance_controller_noderef.go | 2 +- .../kkinstance/kkinstance_controller_phase.go | 8 +- .../kkinstance_controller_upgrade.go | 4 +- .../kkinstance/kkinstance_init_mutex.go | 2 +- controllers/kkinstance/scale.go | 2 +- controllers/kkmachine/helpers.go | 4 +- controllers/kkmachine/kkmachine_controller.go | 8 +- .../k3s/api/v1beta1/k3scontrolplane_types.go | 2 +- .../api/v1beta1/k3scontrolplane_webhook.go | 2 +- .../v1beta1/k3scontrolplanetemplate_types.go | 2 +- .../k3scontrolplanetemplate_webhook.go | 2 +- controlplane/k3s/controllers/helpers.go | 10 +- .../controllers/k3scontrolplane_controller.go | 8 +- controlplane/k3s/controllers/scale.go | 4 +- controlplane/k3s/controllers/status.go | 4 +- controlplane/k3s/controllers/upgrade.go | 4 +- controlplane/k3s/main.go | 6 +- .../k3s/pkg/cluster/cluster_labels.go | 2 +- controlplane/k3s/pkg/cluster/control_plane.go | 4 +- controlplane/k3s/pkg/cluster/filters.go | 4 +- .../cluster/workload_cluster_conditions.go | 2 +- controlplane/k3s/pkg/kubeconfig/kubeconfig.go | 2 +- go.mod | 2 +- hack/version.sh | 2 +- main.go | 4 +- pkg/clients/ssh/client.go | 4 +- pkg/clients/ssh/interface.go | 2 +- pkg/interface.go | 4 +- pkg/rootfs/interface.go | 2 +- pkg/rootfs/local.go | 2 +- pkg/scope/cluster.go | 4 +- pkg/scope/instance.go | 4 +- pkg/scope/kkinstance.go | 4 +- pkg/scope/lb.go | 4 +- pkg/scope/machine.go | 2 +- pkg/scope/registry.go | 2 +- pkg/service/binary/interface.go | 10 +- pkg/service/binary/k3s/binary.go | 8 +- pkg/service/binary/k3s/service.go | 8 +- pkg/service/binary/kubernetes/binary.go | 8 +- pkg/service/binary/kubernetes/service.go | 8 +- pkg/service/bootstrap/bootstrap.go | 6 +- pkg/service/bootstrap/service.go | 12 +- pkg/service/containermanager/containerd.go | 12 +- pkg/service/containermanager/docker.go | 14 +-- pkg/service/containermanager/service.go | 6 +- pkg/service/interface.go | 2 +- pkg/service/operation/directory/directory.go | 2 +- pkg/service/operation/directory/service.go | 4 +- pkg/service/operation/file/binary.go | 2 +- .../operation/file/checksum/http_checksum.go | 2 +- .../file/checksum/internal_checksum.go | 2 +- pkg/service/operation/file/containerd.go | 4 +- pkg/service/operation/file/crictl.go | 4 +- pkg/service/operation/file/docker.go | 8 +- pkg/service/operation/file/file.go | 4 +- pkg/service/operation/file/k3s.go | 4 +- pkg/service/operation/file/kubeadm.go | 4 +- pkg/service/operation/file/kubecni.go | 4 +- pkg/service/operation/file/kubectl.go | 4 +- pkg/service/operation/file/kubelet.go | 4 +- pkg/service/operation/file/repositoryISO.go | 10 +- pkg/service/operation/file/runc.go | 4 +- pkg/service/operation/file/template.go | 6 +- pkg/service/operation/interface.go | 4 +- .../operation/repository/repository_deb.go | 2 +- .../operation/repository/repository_rpm.go | 2 +- pkg/service/operation/repository/service.go | 4 +- pkg/service/operation/user/service.go | 2 +- pkg/service/provisioning/cloudinit/action.go | 4 +- pkg/service/provisioning/cloudinit/adapter.go | 2 +- pkg/service/provisioning/cloudinit/runcmd.go | 2 +- .../provisioning/cloudinit/runcmd_test.go | 2 +- pkg/service/provisioning/cloudinit/service.go | 4 +- pkg/service/provisioning/cloudinit/unknown.go | 2 +- .../provisioning/cloudinit/writefiles.go | 10 +- .../provisioning/cloudinit/writefiles_test.go | 2 +- pkg/service/provisioning/service.go | 6 +- pkg/service/repository/repository.go | 12 +- pkg/service/repository/service.go | 14 +-- pkg/service/util/downloader.go | 6 +- pkg/util/filesystem/fs.go | 2 +- test/e2e/framework/bootstrap/kind_provider.go | 2 +- test/e2e/framework/bootstrap/kind_util.go | 4 +- test/e2e/framework/cluster_helpers.go | 2 +- test/e2e/framework/cluster_proxy.go | 2 +- .../e2e/framework/cluster_topology_helpers.go | 4 +- test/e2e/framework/clusterctl/client.go | 4 +- .../clusterctl/clusterctl_helpers.go | 6 +- test/e2e/framework/controlplane_helpers.go | 6 +- test/e2e/framework/convenience.go | 4 +- test/e2e/framework/deployment_helpers.go | 4 +- test/e2e/framework/machine_helpers.go | 2 +- .../framework/machinedeployment_helpers.go | 2 +- test/e2e/framework/machinepool_helpers.go | 2 +- test/e2e/framework/namespace_helpers.go | 2 +- test/e2e/suites/k3s/common.go | 2 +- test/e2e/suites/k3s/e2e_k3s_suite_test.go | 6 +- test/e2e/suites/k3s/quick_start.go | 4 +- util/collections/helpers.go | 2 +- util/collections/kkinstance_collection.go | 2 +- util/collections/kkinstance_filters.go | 2 +- util/util.go | 4 +- 338 files changed, 1297 insertions(+), 1348 deletions(-) delete mode 120000 cmd/kk/pkg/core/logger/kubekey.log delete mode 100644 cmd/kk/pkg/core/logger/kubekey.log.20220930 diff --git a/.golangci.yml b/.golangci.yml index f13eaeda..51174998 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -122,11 +122,11 @@ linters-settings: - pkg: sigs.k8s.io/cluster-api/internal/webhooks/runtime alias: runtimewebhooks # CAPKK - - pkg: github.com/kubesphere/kubekey/api/v1beta1 + - pkg: github.com/kubesphere/kubekey/v3/api/v1beta1 alias: infrav1 - - pkg: github.com/kubesphere/kubekey/bootstrap/k3s/api/v1beta1 + - pkg: github.com/kubesphere/kubekey/v3/bootstrap/k3s/api/v1beta1 alias: infrabootstrapv1 - - pkg: github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1 + - pkg: github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1 alias: infracontrolplanev1 nolintlint: allow-unused: false diff --git a/Makefile b/Makefile index 9abd2f35..7d8d0767 100644 --- a/Makefile +++ b/Makefile @@ -241,7 +241,7 @@ verify-gen: generate ## Verify go generated files are up to date .PHONY: kk kk: - CGO_ENABLED=0 go build -trimpath -tags "$(BUILDTAGS)" -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/kk github.com/kubesphere/kubekey/cmd/kk; + CGO_ENABLED=0 go build -trimpath -tags "$(BUILDTAGS)" -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/kk github.com/kubesphere/kubekey/v3/cmd/kk; ALL_MANAGERS = capkk k3s-bootstrap k3s-control-plane @@ -250,15 +250,15 @@ managers: $(addprefix manager-,$(ALL_MANAGERS)) ## Run all manager-* targets .PHONY: manager-capkk manager-capkk: ## Build the capkk manager binary into the ./bin folder - go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/manager github.com/kubesphere/kubekey + go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/manager github.com/kubesphere/kubekey/v3 .PHONY: manager-k3s-bootstrap manager-k3s-bootstrap: ## Build the k3s bootstrap manager binary into the ./bin folder - go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/k3s-bootstrap-manager github.com/kubesphere/kubekey/bootstrap/k3s + go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/k3s-bootstrap-manager github.com/kubesphere/kubekey/v3/bootstrap/k3s .PHONY: manager-k3s-control-plane manager-k3s-control-plane: ## Build the k3s control plane manager binary into the ./bin folder - go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/k3s-control-plane-manager github.com/kubesphere/kubekey/controlplane/k3s + go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/k3s-control-plane-manager github.com/kubesphere/kubekey/v3/controlplane/k3s .PHONY: docker-pull-prerequisites docker-pull-prerequisites: diff --git a/bootstrap/k3s/controllers/k3sconfig_controller.go b/bootstrap/k3s/controllers/k3sconfig_controller.go index 70d2f568..5c953ca9 100644 --- a/bootstrap/k3s/controllers/k3sconfig_controller.go +++ b/bootstrap/k3s/controllers/k3sconfig_controller.go @@ -48,12 +48,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/source" - infrabootstrapv1 "github.com/kubesphere/kubekey/bootstrap/k3s/api/v1beta1" - "github.com/kubesphere/kubekey/bootstrap/k3s/pkg/cloudinit" - "github.com/kubesphere/kubekey/bootstrap/k3s/pkg/locking" - k3stypes "github.com/kubesphere/kubekey/bootstrap/k3s/pkg/types" - kklog "github.com/kubesphere/kubekey/util/log" - "github.com/kubesphere/kubekey/util/secret" + infrabootstrapv1 "github.com/kubesphere/kubekey/v3/bootstrap/k3s/api/v1beta1" + "github.com/kubesphere/kubekey/v3/bootstrap/k3s/pkg/cloudinit" + "github.com/kubesphere/kubekey/v3/bootstrap/k3s/pkg/locking" + k3stypes "github.com/kubesphere/kubekey/v3/bootstrap/k3s/pkg/types" + kklog "github.com/kubesphere/kubekey/v3/util/log" + "github.com/kubesphere/kubekey/v3/util/secret" ) // InitLocker is a lock that is used around kubeadm init. diff --git a/bootstrap/k3s/main.go b/bootstrap/k3s/main.go index 56759d74..a994a1fe 100644 --- a/bootstrap/k3s/main.go +++ b/bootstrap/k3s/main.go @@ -42,9 +42,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/healthz" - infrabootstrapv1 "github.com/kubesphere/kubekey/bootstrap/k3s/api/v1beta1" - "github.com/kubesphere/kubekey/bootstrap/k3s/controllers" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" + infrabootstrapv1 "github.com/kubesphere/kubekey/v3/bootstrap/k3s/api/v1beta1" + "github.com/kubesphere/kubekey/v3/bootstrap/k3s/controllers" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" //+kubebuilder:scaffold:imports ) diff --git a/bootstrap/k3s/pkg/cloudinit/controlplane_init.go b/bootstrap/k3s/pkg/cloudinit/controlplane_init.go index 1a784419..dc4d3b6c 100644 --- a/bootstrap/k3s/pkg/cloudinit/controlplane_init.go +++ b/bootstrap/k3s/pkg/cloudinit/controlplane_init.go @@ -17,7 +17,7 @@ package cloudinit import ( - "github.com/kubesphere/kubekey/util/secret" + "github.com/kubesphere/kubekey/v3/util/secret" ) const ( diff --git a/bootstrap/k3s/pkg/types/util.go b/bootstrap/k3s/pkg/types/util.go index e64620e4..f5791044 100644 --- a/bootstrap/k3s/pkg/types/util.go +++ b/bootstrap/k3s/pkg/types/util.go @@ -23,7 +23,7 @@ import ( "github.com/jinzhu/copier" kubeyaml "sigs.k8s.io/yaml" - infrabootstrapv1 "github.com/kubesphere/kubekey/bootstrap/k3s/api/v1beta1" + infrabootstrapv1 "github.com/kubesphere/kubekey/v3/bootstrap/k3s/api/v1beta1" ) // MarshalInitServerConfiguration marshals the ServerConfiguration object into a string. diff --git a/cmd/kk/apis/kubekey/v1alpha2/cluster_types.go b/cmd/kk/apis/kubekey/v1alpha2/cluster_types.go index 0a020d54..e9ff266c 100644 --- a/cmd/kk/apis/kubekey/v1alpha2/cluster_types.go +++ b/cmd/kk/apis/kubekey/v1alpha2/cluster_types.go @@ -22,15 +22,13 @@ import ( "strconv" "strings" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/pkg/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) // ClusterSpec defines the desired state of Cluster diff --git a/cmd/kk/apis/kubekey/v1alpha2/default.go b/cmd/kk/apis/kubekey/v1alpha2/default.go index 72b881d0..1b47acb4 100644 --- a/cmd/kk/apis/kubekey/v1alpha2/default.go +++ b/cmd/kk/apis/kubekey/v1alpha2/default.go @@ -21,7 +21,7 @@ import ( "os" "strings" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) const ( diff --git a/cmd/kk/cmd/add/add.go b/cmd/kk/cmd/add/add.go index f618b84a..f4d0f4d4 100644 --- a/cmd/kk/cmd/add/add.go +++ b/cmd/kk/cmd/add/add.go @@ -19,7 +19,7 @@ package add import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" ) type AddOptions struct { diff --git a/cmd/kk/cmd/add/add_nodes.go b/cmd/kk/cmd/add/add_nodes.go index 830d85df..1caee472 100644 --- a/cmd/kk/cmd/add/add_nodes.go +++ b/cmd/kk/cmd/add/add_nodes.go @@ -19,10 +19,10 @@ package add import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/pipelines" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/pipelines" ) type AddNodesOptions struct { diff --git a/cmd/kk/cmd/alpha/alpha.go b/cmd/kk/cmd/alpha/alpha.go index 8ed4e3dd..44fb0bea 100644 --- a/cmd/kk/cmd/alpha/alpha.go +++ b/cmd/kk/cmd/alpha/alpha.go @@ -19,7 +19,7 @@ package alpha import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/alpha/cri" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/alpha/cri" ) // NewAlphaCmd create a new Alpha command diff --git a/cmd/kk/cmd/alpha/create.go b/cmd/kk/cmd/alpha/create.go index bae12478..c3ee724d 100644 --- a/cmd/kk/cmd/alpha/create.go +++ b/cmd/kk/cmd/alpha/create.go @@ -19,8 +19,8 @@ package alpha import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/create/phase" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/create/phase" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" ) type CreateOptions struct { @@ -42,6 +42,6 @@ func NewCmdCreate() *cobra.Command { } o.CommonOptions.AddCommonFlag(cmd) - cmd.AddCommand(phase.NewPhaseCommand()) + cmd.AddCommand(phase.NewPhaseCommand()) return cmd } diff --git a/cmd/kk/cmd/alpha/cri/cri.go b/cmd/kk/cmd/alpha/cri/cri.go index 1d6b4e1a..a9b51c4d 100644 --- a/cmd/kk/cmd/alpha/cri/cri.go +++ b/cmd/kk/cmd/alpha/cri/cri.go @@ -19,7 +19,7 @@ package cri import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" ) type MigrateOptions struct { diff --git a/cmd/kk/cmd/alpha/cri/migrate_cri.go b/cmd/kk/cmd/alpha/cri/migrate_cri.go index 57deb173..0c09cccb 100644 --- a/cmd/kk/cmd/alpha/cri/migrate_cri.go +++ b/cmd/kk/cmd/alpha/cri/migrate_cri.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/pipelines" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/pipelines" ) type MigrateCriOptions struct { diff --git a/cmd/kk/cmd/alpha/upgrade.go b/cmd/kk/cmd/alpha/upgrade.go index 6410b578..09d739ca 100644 --- a/cmd/kk/cmd/alpha/upgrade.go +++ b/cmd/kk/cmd/alpha/upgrade.go @@ -17,13 +17,14 @@ limitations under the License. package alpha import ( - "github.com/kubesphere/kubekey/cmd/kk/cmd/upgrade/phase" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" "github.com/spf13/cobra" + + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/upgrade/phase" ) type UpgradeOptions struct { - CommonOptions *options.CommonOptions + CommonOptions *options.CommonOptions } func NewUpgradeOptions() *UpgradeOptions { @@ -43,4 +44,3 @@ func NewCmdUpgrade() *cobra.Command { cmd.AddCommand(phase.NewPhaseCommand()) return cmd } - diff --git a/cmd/kk/cmd/artifact/artifact.go b/cmd/kk/cmd/artifact/artifact.go index 8badb183..8f046c98 100755 --- a/cmd/kk/cmd/artifact/artifact.go +++ b/cmd/kk/cmd/artifact/artifact.go @@ -19,8 +19,8 @@ package artifact import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/artifact/images" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/artifact/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" ) type ArtifactOptions struct { diff --git a/cmd/kk/cmd/artifact/export.go b/cmd/kk/cmd/artifact/export.go index a4a8237d..b5c2b822 100644 --- a/cmd/kk/cmd/artifact/export.go +++ b/cmd/kk/cmd/artifact/export.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/pipelines" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/pipelines" ) type ArtifactExportOptions struct { diff --git a/cmd/kk/cmd/artifact/images/images.go b/cmd/kk/cmd/artifact/images/images.go index 541fc918..0d3ae5eb 100644 --- a/cmd/kk/cmd/artifact/images/images.go +++ b/cmd/kk/cmd/artifact/images/images.go @@ -19,7 +19,7 @@ package images import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" ) type ArtifactImagesOptions struct { diff --git a/cmd/kk/cmd/artifact/images/push.go b/cmd/kk/cmd/artifact/images/push.go index 2b7e2856..d337bdd1 100644 --- a/cmd/kk/cmd/artifact/images/push.go +++ b/cmd/kk/cmd/artifact/images/push.go @@ -23,14 +23,14 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/artifact" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/filesystem" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/artifact" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/filesystem" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" ) type ArtifactImagesPushOptions struct { diff --git a/cmd/kk/cmd/artifact/import.go b/cmd/kk/cmd/artifact/import.go index e54cb414..8707a99d 100755 --- a/cmd/kk/cmd/artifact/import.go +++ b/cmd/kk/cmd/artifact/import.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/artifact" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/artifact" ) type ArtifactImportOptions struct { diff --git a/cmd/kk/cmd/cert/cert.go b/cmd/kk/cmd/cert/cert.go index a148fe83..89c21785 100644 --- a/cmd/kk/cmd/cert/cert.go +++ b/cmd/kk/cmd/cert/cert.go @@ -19,7 +19,7 @@ package cert import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" ) type CertOptions struct { diff --git a/cmd/kk/cmd/cert/list_cert.go b/cmd/kk/cmd/cert/list_cert.go index 3d476995..79b58fd2 100644 --- a/cmd/kk/cmd/cert/list_cert.go +++ b/cmd/kk/cmd/cert/list_cert.go @@ -19,10 +19,10 @@ package cert import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/pipelines" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/pipelines" ) type CertListOptions struct { diff --git a/cmd/kk/cmd/cert/renew_cert.go b/cmd/kk/cmd/cert/renew_cert.go index b94597d3..f3dcbd82 100644 --- a/cmd/kk/cmd/cert/renew_cert.go +++ b/cmd/kk/cmd/cert/renew_cert.go @@ -19,10 +19,10 @@ package cert import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/pipelines" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/pipelines" ) type CertRenewOptions struct { diff --git a/cmd/kk/cmd/completion/completion.go b/cmd/kk/cmd/completion/completion.go index 4f372dff..ff832f41 100644 --- a/cmd/kk/cmd/completion/completion.go +++ b/cmd/kk/cmd/completion/completion.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" ) // CompletionOptions is the option of completion command diff --git a/cmd/kk/cmd/create/cluster.go b/cmd/kk/cmd/create/cluster.go index 63affbe2..c36fbd64 100644 --- a/cmd/kk/cmd/create/cluster.go +++ b/cmd/kk/cmd/create/cluster.go @@ -22,12 +22,12 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/pipelines" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubernetes" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubesphere" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/pipelines" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubesphere" ) type CreateClusterOptions struct { diff --git a/cmd/kk/cmd/create/config.go b/cmd/kk/cmd/create/config.go index cb5b0ac4..ab259b24 100644 --- a/cmd/kk/cmd/create/config.go +++ b/cmd/kk/cmd/create/config.go @@ -21,11 +21,11 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/config" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubesphere" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/config" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubesphere" ) type CreateConfigOptions struct { diff --git a/cmd/kk/cmd/create/create.go b/cmd/kk/cmd/create/create.go index 3f387cf8..dfb826e8 100644 --- a/cmd/kk/cmd/create/create.go +++ b/cmd/kk/cmd/create/create.go @@ -19,7 +19,7 @@ package create import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" ) type CreateOptions struct { diff --git a/cmd/kk/cmd/create/manifest.go b/cmd/kk/cmd/create/manifest.go index 01f3b3ce..4ede87a3 100644 --- a/cmd/kk/cmd/create/manifest.go +++ b/cmd/kk/cmd/create/manifest.go @@ -26,10 +26,10 @@ import ( "github.com/spf13/cobra" "k8s.io/client-go/util/homedir" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/artifact" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/artifact" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" ) type CreateManifestOptions struct { diff --git a/cmd/kk/cmd/create/phase/binary.go b/cmd/kk/cmd/create/phase/binary.go index cc12c886..f9d4b4ab 100755 --- a/cmd/kk/cmd/create/phase/binary.go +++ b/cmd/kk/cmd/create/phase/binary.go @@ -21,11 +21,11 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/binary" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/binary" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubernetes" ) type CreateBinaryOptions struct { diff --git a/cmd/kk/cmd/create/phase/configure.go b/cmd/kk/cmd/create/phase/configure.go index 12a22eb7..635f2ea4 100644 --- a/cmd/kk/cmd/create/phase/configure.go +++ b/cmd/kk/cmd/create/phase/configure.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/kubernetes" ) type CreateConfigureKubernetesOptions struct { diff --git a/cmd/kk/cmd/create/phase/etcd.go b/cmd/kk/cmd/create/phase/etcd.go index 98585d27..7248164b 100755 --- a/cmd/kk/cmd/create/phase/etcd.go +++ b/cmd/kk/cmd/create/phase/etcd.go @@ -19,10 +19,10 @@ package phase import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/etcd" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/etcd" ) type CreateEtcdOptions struct { diff --git a/cmd/kk/cmd/create/phase/images.go b/cmd/kk/cmd/create/phase/images.go index b04a41ba..b83f09fa 100755 --- a/cmd/kk/cmd/create/phase/images.go +++ b/cmd/kk/cmd/create/phase/images.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/images" ) type CreateImagesOptions struct { diff --git a/cmd/kk/cmd/create/phase/init.go b/cmd/kk/cmd/create/phase/init.go index da6ecf35..60f5c83b 100644 --- a/cmd/kk/cmd/create/phase/init.go +++ b/cmd/kk/cmd/create/phase/init.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/kubernetes" ) type CreateInitClusterOptions struct { diff --git a/cmd/kk/cmd/create/phase/join.go b/cmd/kk/cmd/create/phase/join.go index 14745857..31a442ac 100644 --- a/cmd/kk/cmd/create/phase/join.go +++ b/cmd/kk/cmd/create/phase/join.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/kubernetes" ) type CreateJoinNodesOptions struct { diff --git a/cmd/kk/cmd/create/phase/kubesphere.go b/cmd/kk/cmd/create/phase/kubesphere.go index e2fee644..39f09d32 100755 --- a/cmd/kk/cmd/create/phase/kubesphere.go +++ b/cmd/kk/cmd/create/phase/kubesphere.go @@ -22,11 +22,11 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - alpha "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/kubesphere" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubesphere" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + alpha "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/kubesphere" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubesphere" ) type CreateKubeSphereOptions struct { diff --git a/cmd/kk/cmd/create/phase/os.go b/cmd/kk/cmd/create/phase/os.go index aff4036d..fc7eb76d 100755 --- a/cmd/kk/cmd/create/phase/os.go +++ b/cmd/kk/cmd/create/phase/os.go @@ -19,10 +19,10 @@ package phase import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/os" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/os" ) type ConfigOSOptions struct { diff --git a/cmd/kk/cmd/delete/delete.go b/cmd/kk/cmd/delete/delete.go index 25a69c1f..68777db4 100644 --- a/cmd/kk/cmd/delete/delete.go +++ b/cmd/kk/cmd/delete/delete.go @@ -19,7 +19,7 @@ package delete import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" ) type DeleteOptions struct { diff --git a/cmd/kk/cmd/delete/delete_cluster.go b/cmd/kk/cmd/delete/delete_cluster.go index 8bc76607..4a5c2dc8 100644 --- a/cmd/kk/cmd/delete/delete_cluster.go +++ b/cmd/kk/cmd/delete/delete_cluster.go @@ -19,10 +19,10 @@ package delete import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/pipelines" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/pipelines" ) type DeleteClusterOptions struct { diff --git a/cmd/kk/cmd/delete/delete_node.go b/cmd/kk/cmd/delete/delete_node.go index 953682c0..73e0f1f7 100644 --- a/cmd/kk/cmd/delete/delete_node.go +++ b/cmd/kk/cmd/delete/delete_node.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/pipelines" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/pipelines" ) type DeleteNodeOptions struct { diff --git a/cmd/kk/cmd/init/init.go b/cmd/kk/cmd/init/init.go index 2b96e8ae..cea0d54e 100644 --- a/cmd/kk/cmd/init/init.go +++ b/cmd/kk/cmd/init/init.go @@ -19,7 +19,7 @@ package init import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" ) type InitOptions struct { diff --git a/cmd/kk/cmd/init/init_os.go b/cmd/kk/cmd/init/init_os.go index 38429337..1b23bc8c 100644 --- a/cmd/kk/cmd/init/init_os.go +++ b/cmd/kk/cmd/init/init_os.go @@ -19,10 +19,10 @@ package init import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/pipelines" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/pipelines" ) type InitOsOptions struct { diff --git a/cmd/kk/cmd/init/init_registry.go b/cmd/kk/cmd/init/init_registry.go index dccacb8a..bfae0df9 100644 --- a/cmd/kk/cmd/init/init_registry.go +++ b/cmd/kk/cmd/init/init_registry.go @@ -19,10 +19,10 @@ package init import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/pipelines" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/pipelines" ) type InitRegistryOptions struct { diff --git a/cmd/kk/cmd/plugin/list.go b/cmd/kk/cmd/plugin/list.go index 0fd8d7db..86a5fcb1 100644 --- a/cmd/kk/cmd/plugin/list.go +++ b/cmd/kk/cmd/plugin/list.go @@ -29,7 +29,7 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/util/i18n" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" ) type PluginListOptions struct { diff --git a/cmd/kk/cmd/plugin/plugin.go b/cmd/kk/cmd/plugin/plugin.go index 4a9dfdfe..cabf9dde 100644 --- a/cmd/kk/cmd/plugin/plugin.go +++ b/cmd/kk/cmd/plugin/plugin.go @@ -19,7 +19,7 @@ package plugin import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" ) var ( diff --git a/cmd/kk/cmd/root.go b/cmd/kk/cmd/root.go index 63888ec3..3ca697a9 100755 --- a/cmd/kk/cmd/root.go +++ b/cmd/kk/cmd/root.go @@ -26,18 +26,18 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/add" - "github.com/kubesphere/kubekey/cmd/kk/cmd/alpha" - "github.com/kubesphere/kubekey/cmd/kk/cmd/artifact" - "github.com/kubesphere/kubekey/cmd/kk/cmd/cert" - "github.com/kubesphere/kubekey/cmd/kk/cmd/completion" - "github.com/kubesphere/kubekey/cmd/kk/cmd/create" - "github.com/kubesphere/kubekey/cmd/kk/cmd/delete" - initOs "github.com/kubesphere/kubekey/cmd/kk/cmd/init" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/plugin" - "github.com/kubesphere/kubekey/cmd/kk/cmd/upgrade" - "github.com/kubesphere/kubekey/cmd/kk/cmd/version" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/add" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/alpha" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/artifact" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/cert" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/completion" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/create" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/delete" + initOs "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/init" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/plugin" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/upgrade" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/version" ) type KubeKeyOptions struct { diff --git a/cmd/kk/cmd/upgrade/phase/binary.go b/cmd/kk/cmd/upgrade/phase/binary.go index c09a5573..2e2bdc62 100755 --- a/cmd/kk/cmd/upgrade/phase/binary.go +++ b/cmd/kk/cmd/upgrade/phase/binary.go @@ -21,12 +21,11 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/binary" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubernetes" - - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/binary" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubernetes" ) type UpgradeBinaryOptions struct { diff --git a/cmd/kk/cmd/upgrade/phase/images.go b/cmd/kk/cmd/upgrade/phase/images.go index dbd96d45..86bd97a4 100755 --- a/cmd/kk/cmd/upgrade/phase/images.go +++ b/cmd/kk/cmd/upgrade/phase/images.go @@ -21,11 +21,10 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/images" - - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/images" ) type UpgradeImagesOptions struct { diff --git a/cmd/kk/cmd/upgrade/phase/kubesphere.go b/cmd/kk/cmd/upgrade/phase/kubesphere.go index ed3995be..003b2307 100755 --- a/cmd/kk/cmd/upgrade/phase/kubesphere.go +++ b/cmd/kk/cmd/upgrade/phase/kubesphere.go @@ -22,12 +22,11 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - alpha "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/kubesphere" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubesphere" - - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + alpha "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/kubesphere" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubesphere" ) type UpgradeKubeSphereOptions struct { diff --git a/cmd/kk/cmd/upgrade/phase/nodes.go b/cmd/kk/cmd/upgrade/phase/nodes.go index e869abf5..83b0eaa2 100755 --- a/cmd/kk/cmd/upgrade/phase/nodes.go +++ b/cmd/kk/cmd/upgrade/phase/nodes.go @@ -19,12 +19,12 @@ package phase import ( "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/nodes" "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/nodes" ) type UpgradeNodesOptions struct { diff --git a/cmd/kk/cmd/upgrade/upgrade.go b/cmd/kk/cmd/upgrade/upgrade.go index cb57bf2c..4e9f6038 100644 --- a/cmd/kk/cmd/upgrade/upgrade.go +++ b/cmd/kk/cmd/upgrade/upgrade.go @@ -22,13 +22,12 @@ import ( "github.com/spf13/cobra" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/pipelines" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubernetes" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubesphere" - - "github.com/kubesphere/kubekey/cmd/kk/cmd/options" - "github.com/kubesphere/kubekey/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/options" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/pipelines" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubesphere" ) type UpgradeOptions struct { diff --git a/cmd/kk/cmd/version/version.go b/cmd/kk/cmd/version/version.go index 9f56e130..89c244ab 100644 --- a/cmd/kk/cmd/version/version.go +++ b/cmd/kk/cmd/version/version.go @@ -26,8 +26,8 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubernetes" - "github.com/kubesphere/kubekey/version" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubernetes" + "github.com/kubesphere/kubekey/v3/version" ) type Version struct { diff --git a/cmd/kk/main.go b/cmd/kk/main.go index a1d3306e..98f575e4 100644 --- a/cmd/kk/main.go +++ b/cmd/kk/main.go @@ -20,7 +20,7 @@ import ( "os" "os/exec" - "github.com/kubesphere/kubekey/cmd/kk/cmd" + "github.com/kubesphere/kubekey/v3/cmd/kk/cmd" ) // Using a separate entry-point can reduce the size of the binary file diff --git a/cmd/kk/pkg/addons/addons.go b/cmd/kk/pkg/addons/addons.go index 4f5e3f44..6d145e56 100644 --- a/cmd/kk/pkg/addons/addons.go +++ b/cmd/kk/pkg/addons/addons.go @@ -26,8 +26,8 @@ import ( "helm.sh/helm/v3/pkg/cli" "helm.sh/helm/v3/pkg/getter" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" ) func InstallAddons(kubeConf *common.KubeConf, addon *kubekeyapiv1alpha2.Addon, kubeConfig string) error { diff --git a/cmd/kk/pkg/addons/charts.go b/cmd/kk/pkg/addons/charts.go index fa852a20..704929e1 100644 --- a/cmd/kk/pkg/addons/charts.go +++ b/cmd/kk/pkg/addons/charts.go @@ -35,9 +35,9 @@ import ( "helm.sh/helm/v3/pkg/storage/driver" "k8s.io/client-go/util/homedir" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" ) func debug(format string, v ...interface{}) { diff --git a/cmd/kk/pkg/addons/module.go b/cmd/kk/pkg/addons/module.go index 303f9f38..ab833c23 100644 --- a/cmd/kk/pkg/addons/module.go +++ b/cmd/kk/pkg/addons/module.go @@ -17,8 +17,8 @@ package addons import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" ) type AddonsModule struct { diff --git a/cmd/kk/pkg/addons/tasks.go b/cmd/kk/pkg/addons/tasks.go index 531f818c..cd79d589 100644 --- a/cmd/kk/pkg/addons/tasks.go +++ b/cmd/kk/pkg/addons/tasks.go @@ -20,9 +20,9 @@ import ( "fmt" "path/filepath" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" ) type Install struct { diff --git a/cmd/kk/pkg/artifact/manifest.go b/cmd/kk/pkg/artifact/manifest.go index 47ecda76..ac4ea86b 100644 --- a/cmd/kk/pkg/artifact/manifest.go +++ b/cmd/kk/pkg/artifact/manifest.go @@ -27,15 +27,14 @@ import ( mapset "github.com/deckarep/golang-set" "github.com/pkg/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" versionutil "k8s.io/apimachinery/pkg/util/version" - kubekeyv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/artifact/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/client/kubernetes" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + kubekeyv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/artifact/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/client/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) func CreateManifest(arg common.Argument, name string) error { diff --git a/cmd/kk/pkg/artifact/module.go b/cmd/kk/pkg/artifact/module.go index cc779137..d2de0e04 100644 --- a/cmd/kk/pkg/artifact/module.go +++ b/cmd/kk/pkg/artifact/module.go @@ -17,8 +17,8 @@ package artifact import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" ) type RepositoryModule struct { diff --git a/cmd/kk/pkg/artifact/prepares.go b/cmd/kk/pkg/artifact/prepares.go index a2852e80..3759f11a 100644 --- a/cmd/kk/pkg/artifact/prepares.go +++ b/cmd/kk/pkg/artifact/prepares.go @@ -18,8 +18,9 @@ package artifact import ( "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type EnableDownload struct { diff --git a/cmd/kk/pkg/artifact/tasks.go b/cmd/kk/pkg/artifact/tasks.go index f1bbf26d..f8219606 100644 --- a/cmd/kk/pkg/artifact/tasks.go +++ b/cmd/kk/pkg/artifact/tasks.go @@ -27,10 +27,10 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - coreutil "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + coreutil "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) type DownloadISOFile struct { diff --git a/cmd/kk/pkg/artifact/templates/manifest.go b/cmd/kk/pkg/artifact/templates/manifest.go index 98b04e5c..7b88d4fa 100644 --- a/cmd/kk/pkg/artifact/templates/manifest.go +++ b/cmd/kk/pkg/artifact/templates/manifest.go @@ -17,10 +17,12 @@ package templates import ( - kubekeyv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/lithammer/dedent" "text/template" + + "github.com/lithammer/dedent" + + kubekeyv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) // Manifest defines the template of manifest file. diff --git a/cmd/kk/pkg/binaries/k3s.go b/cmd/kk/pkg/binaries/k3s.go index dbeb99f1..e0826e4c 100644 --- a/cmd/kk/pkg/binaries/k3s.go +++ b/cmd/kk/pkg/binaries/k3s.go @@ -20,13 +20,14 @@ import ( "fmt" "os/exec" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/files" "github.com/pkg/errors" + + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/files" ) // K3sFilesDownloadHTTP defines the kubernetes' binaries that need to be downloaded in advance and downloads them. diff --git a/cmd/kk/pkg/binaries/k8e.go b/cmd/kk/pkg/binaries/k8e.go index 58e65a75..05b2eb61 100644 --- a/cmd/kk/pkg/binaries/k8e.go +++ b/cmd/kk/pkg/binaries/k8e.go @@ -20,13 +20,14 @@ import ( "fmt" "os/exec" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/files" "github.com/pkg/errors" + + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/files" ) // K8eFilesDownloadHTTP defines the kubernetes' binaries that need to be downloaded in advance and downloads them. diff --git a/cmd/kk/pkg/binaries/kubernetes.go b/cmd/kk/pkg/binaries/kubernetes.go index d82d32ef..1b5e5a96 100644 --- a/cmd/kk/pkg/binaries/kubernetes.go +++ b/cmd/kk/pkg/binaries/kubernetes.go @@ -20,13 +20,14 @@ import ( "fmt" "os/exec" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/files" "github.com/pkg/errors" + + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/files" ) // K8sFilesDownloadHTTP defines the kubernetes' binaries that need to be downloaded in advance and downloads them. diff --git a/cmd/kk/pkg/binaries/module.go b/cmd/kk/pkg/binaries/module.go index f2d1de62..3d702250 100644 --- a/cmd/kk/pkg/binaries/module.go +++ b/cmd/kk/pkg/binaries/module.go @@ -17,10 +17,11 @@ package binaries import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" ) type NodeBinariesModule struct { diff --git a/cmd/kk/pkg/binaries/registry.go b/cmd/kk/pkg/binaries/registry.go index c6a71cbb..ec31028a 100644 --- a/cmd/kk/pkg/binaries/registry.go +++ b/cmd/kk/pkg/binaries/registry.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/files" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/files" ) // RegistryPackageDownloadHTTP defines the kubernetes' binaries that need to be downloaded in advance and downloads them. diff --git a/cmd/kk/pkg/binaries/tasks.go b/cmd/kk/pkg/binaries/tasks.go index 804b16cd..7d829cb7 100644 --- a/cmd/kk/pkg/binaries/tasks.go +++ b/cmd/kk/pkg/binaries/tasks.go @@ -21,10 +21,11 @@ import ( "path/filepath" mapset "github.com/deckarep/golang-set" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" "github.com/pkg/errors" + + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type Download struct { diff --git a/cmd/kk/pkg/bootstrap/confirm/module.go b/cmd/kk/pkg/bootstrap/confirm/module.go index 4035cfc5..8f4783f0 100644 --- a/cmd/kk/pkg/bootstrap/confirm/module.go +++ b/cmd/kk/pkg/bootstrap/confirm/module.go @@ -17,9 +17,9 @@ package confirm import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" ) type InstallConfirmModule struct { diff --git a/cmd/kk/pkg/bootstrap/confirm/tasks.go b/cmd/kk/pkg/bootstrap/confirm/tasks.go index 466cddf7..ae3c9714 100644 --- a/cmd/kk/pkg/bootstrap/confirm/tasks.go +++ b/cmd/kk/pkg/bootstrap/confirm/tasks.go @@ -28,11 +28,11 @@ import ( "github.com/pkg/errors" versionutil "k8s.io/apimachinery/pkg/util/version" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) // PreCheckResults defines the items to be checked. diff --git a/cmd/kk/pkg/bootstrap/customscripts/module.go b/cmd/kk/pkg/bootstrap/customscripts/module.go index a2b8a72f..1c98a178 100644 --- a/cmd/kk/pkg/bootstrap/customscripts/module.go +++ b/cmd/kk/pkg/bootstrap/customscripts/module.go @@ -19,9 +19,9 @@ package customscripts import ( "fmt" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" ) type CustomScriptsModule struct { @@ -44,7 +44,7 @@ func (m *CustomScriptsModule) Init() { Hosts: m.Runtime.GetAllHosts(), Action: &CustomScriptTask{taskDir: taskDir, script: script}, Parallel: true, - Retry: 1, + Retry: 1, } m.Tasks = append(m.Tasks, task) diff --git a/cmd/kk/pkg/bootstrap/customscripts/tasks.go b/cmd/kk/pkg/bootstrap/customscripts/tasks.go index 9e9aa1aa..500dd695 100644 --- a/cmd/kk/pkg/bootstrap/customscripts/tasks.go +++ b/cmd/kk/pkg/bootstrap/customscripts/tasks.go @@ -26,11 +26,11 @@ import ( "github.com/pkg/errors" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) type CustomScriptTask struct { @@ -39,8 +39,6 @@ type CustomScriptTask struct { script kubekeyapiv1alpha2.CustomScripts } - - func (t *CustomScriptTask) Execute(runtime connector.Runtime) error { if len(t.script.Bash) <= 0 { @@ -111,7 +109,7 @@ func (t *CustomScriptTask) Execute(runtime connector.Runtime) error { if _, err := runtime.GetRunner().SudoCmd(cleanCmd, false); err != nil { return errors.Wrapf(err, "Exec cmd:%s err:%s", cleanCmd, err) } - }else { + } else { // keep the Materials for debug fmt.Printf("Exec Bash:%s done, take %s, output:\n%s", RunBash, time.Since(start), out) } diff --git a/cmd/kk/pkg/bootstrap/os/module.go b/cmd/kk/pkg/bootstrap/os/module.go index 4d07d794..3d6fe726 100644 --- a/cmd/kk/pkg/bootstrap/os/module.go +++ b/cmd/kk/pkg/bootstrap/os/module.go @@ -19,12 +19,12 @@ package os import ( "path/filepath" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/os/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/os/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) type ConfigureOSModule struct { diff --git a/cmd/kk/pkg/bootstrap/os/prepares.go b/cmd/kk/pkg/bootstrap/os/prepares.go index 853028fb..67900413 100644 --- a/cmd/kk/pkg/bootstrap/os/prepares.go +++ b/cmd/kk/pkg/bootstrap/os/prepares.go @@ -17,9 +17,9 @@ package os import ( - kubekeyv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + kubekeyv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type NodeConfigureNtpCheck struct { diff --git a/cmd/kk/pkg/bootstrap/os/repository/repository.go b/cmd/kk/pkg/bootstrap/os/repository/repository.go index 51ecdc34..89ae3de5 100644 --- a/cmd/kk/pkg/bootstrap/os/repository/repository.go +++ b/cmd/kk/pkg/bootstrap/os/repository/repository.go @@ -18,8 +18,9 @@ package repository import ( "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" "strings" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type Interface interface { diff --git a/cmd/kk/pkg/bootstrap/os/repository/repository_deb.go b/cmd/kk/pkg/bootstrap/os/repository/repository_deb.go index 7bbaf35b..f535fe78 100644 --- a/cmd/kk/pkg/bootstrap/os/repository/repository_deb.go +++ b/cmd/kk/pkg/bootstrap/os/repository/repository_deb.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type Debian struct { diff --git a/cmd/kk/pkg/bootstrap/os/repository/repository_rpm.go b/cmd/kk/pkg/bootstrap/os/repository/repository_rpm.go index 150a23bb..fc9909d9 100644 --- a/cmd/kk/pkg/bootstrap/os/repository/repository_rpm.go +++ b/cmd/kk/pkg/bootstrap/os/repository/repository_rpm.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type RedhatPackageManager struct { diff --git a/cmd/kk/pkg/bootstrap/os/rollback.go b/cmd/kk/pkg/bootstrap/os/rollback.go index 5e796773..d6eb6655 100644 --- a/cmd/kk/pkg/bootstrap/os/rollback.go +++ b/cmd/kk/pkg/bootstrap/os/rollback.go @@ -18,12 +18,14 @@ package os import ( "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/os/repository" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/ending" - "github.com/pkg/errors" "path/filepath" + + "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/os/repository" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/ending" ) type RollbackUmount struct { diff --git a/cmd/kk/pkg/bootstrap/os/tasks.go b/cmd/kk/pkg/bootstrap/os/tasks.go index 56538d61..93a44739 100644 --- a/cmd/kk/pkg/bootstrap/os/tasks.go +++ b/cmd/kk/pkg/bootstrap/os/tasks.go @@ -23,11 +23,11 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/os/repository" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/utils" - "github.com/kubesphere/kubekey/util/osrelease" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/os/repository" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/utils" + "github.com/kubesphere/kubekey/v3/util/osrelease" ) type NodeConfigureOS struct { diff --git a/cmd/kk/pkg/bootstrap/os/templates/init_script.go b/cmd/kk/pkg/bootstrap/os/templates/init_script.go index 47fc9076..ff234ba4 100644 --- a/cmd/kk/pkg/bootstrap/os/templates/init_script.go +++ b/cmd/kk/pkg/bootstrap/os/templates/init_script.go @@ -20,11 +20,11 @@ import ( "fmt" "text/template" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/registry" - - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" "github.com/lithammer/dedent" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/registry" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) var InitOsScriptTmpl = template.Must(template.New("initOS.sh").Parse( diff --git a/cmd/kk/pkg/bootstrap/precheck/module.go b/cmd/kk/pkg/bootstrap/precheck/module.go index 27a9ef83..df6583cd 100644 --- a/cmd/kk/pkg/bootstrap/precheck/module.go +++ b/cmd/kk/pkg/bootstrap/precheck/module.go @@ -19,10 +19,10 @@ package precheck import ( "time" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" ) type GreetingsModule struct { diff --git a/cmd/kk/pkg/bootstrap/precheck/prepares.go b/cmd/kk/pkg/bootstrap/precheck/prepares.go index cfe1129e..53c2e10a 100644 --- a/cmd/kk/pkg/bootstrap/precheck/prepares.go +++ b/cmd/kk/pkg/bootstrap/precheck/prepares.go @@ -17,9 +17,10 @@ package precheck import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type KubeSphereExist struct { diff --git a/cmd/kk/pkg/bootstrap/precheck/tasks.go b/cmd/kk/pkg/bootstrap/precheck/tasks.go index a2b28770..a194910e 100644 --- a/cmd/kk/pkg/bootstrap/precheck/tasks.go +++ b/cmd/kk/pkg/bootstrap/precheck/tasks.go @@ -24,12 +24,12 @@ import ( "github.com/pkg/errors" versionutil "k8s.io/apimachinery/pkg/util/version" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubernetes" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubesphere" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubesphere" ) type GreetingsTask struct { diff --git a/cmd/kk/pkg/bootstrap/registry/certs.go b/cmd/kk/pkg/bootstrap/registry/certs.go index 2df08304..91974c94 100644 --- a/cmd/kk/pkg/bootstrap/registry/certs.go +++ b/cmd/kk/pkg/bootstrap/registry/certs.go @@ -19,16 +19,18 @@ package registry import ( "crypto/x509" "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/utils/certs" + "net" + "path/filepath" + "strings" + "github.com/pkg/errors" "k8s.io/client-go/util/cert" certutil "k8s.io/client-go/util/cert" netutils "k8s.io/utils/net" - "net" - "path/filepath" - "strings" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/utils/certs" ) const ( diff --git a/cmd/kk/pkg/bootstrap/registry/module.go b/cmd/kk/pkg/bootstrap/registry/module.go index 736b8500..f44a9a38 100644 --- a/cmd/kk/pkg/bootstrap/registry/module.go +++ b/cmd/kk/pkg/bootstrap/registry/module.go @@ -20,14 +20,14 @@ import ( "fmt" "path/filepath" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/registry/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/container" - docker_template "github.com/kubesphere/kubekey/cmd/kk/pkg/container/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/registry/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/container" + docker_template "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/container/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) type RegistryCertsModule struct { diff --git a/cmd/kk/pkg/bootstrap/registry/prepares.go b/cmd/kk/pkg/bootstrap/registry/prepares.go index 5f716091..6db26676 100644 --- a/cmd/kk/pkg/bootstrap/registry/prepares.go +++ b/cmd/kk/pkg/bootstrap/registry/prepares.go @@ -17,8 +17,8 @@ package registry import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type FirstRegistryNode struct { diff --git a/cmd/kk/pkg/bootstrap/registry/tasks.go b/cmd/kk/pkg/bootstrap/registry/tasks.go index ae0e5701..e58e670d 100644 --- a/cmd/kk/pkg/bootstrap/registry/tasks.go +++ b/cmd/kk/pkg/bootstrap/registry/tasks.go @@ -21,11 +21,12 @@ import ( "path/filepath" "strings" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/files" - "github.com/kubesphere/kubekey/cmd/kk/pkg/utils" "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/files" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/utils" ) type SyncCertsFile struct { diff --git a/cmd/kk/pkg/certs/module.go b/cmd/kk/pkg/certs/module.go index 18cd130b..a779890d 100644 --- a/cmd/kk/pkg/certs/module.go +++ b/cmd/kk/pkg/certs/module.go @@ -21,13 +21,13 @@ import ( versionutil "k8s.io/apimachinery/pkg/util/version" - "github.com/kubesphere/kubekey/cmd/kk/pkg/certs/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/certs/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes" ) type CheckCertsModule struct { diff --git a/cmd/kk/pkg/certs/prepares.go b/cmd/kk/pkg/certs/prepares.go index a4f4d850..ff8f69d6 100644 --- a/cmd/kk/pkg/certs/prepares.go +++ b/cmd/kk/pkg/certs/prepares.go @@ -19,9 +19,9 @@ package certs import ( "path/filepath" - "github.com/kubesphere/kubekey/cmd/kk/pkg/certs/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/certs/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type AutoRenewCertsEnabled struct { diff --git a/cmd/kk/pkg/certs/tasks.go b/cmd/kk/pkg/certs/tasks.go index 41d7e852..83166146 100644 --- a/cmd/kk/pkg/certs/tasks.go +++ b/cmd/kk/pkg/certs/tasks.go @@ -19,21 +19,23 @@ package certs import ( "encoding/base64" "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/certs/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/utils" + "os" + "path/filepath" + "strings" + "text/tabwriter" + "time" + "github.com/pkg/errors" "k8s.io/apimachinery/pkg/runtime/schema" versionutil "k8s.io/apimachinery/pkg/util/version" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" clientcmdlatest "k8s.io/client-go/tools/clientcmd/api/latest" certutil "k8s.io/client-go/util/cert" - "os" - "path/filepath" - "strings" - "text/tabwriter" - "time" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/certs/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/utils" ) type Certificate struct { diff --git a/cmd/kk/pkg/common/artifact_action.go b/cmd/kk/pkg/common/artifact_action.go index 4f7937d9..c2f60c0c 100644 --- a/cmd/kk/pkg/common/artifact_action.go +++ b/cmd/kk/pkg/common/artifact_action.go @@ -17,8 +17,8 @@ package common import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type ArtifactAction struct { diff --git a/cmd/kk/pkg/common/artifact_module.go b/cmd/kk/pkg/common/artifact_module.go index ef323129..aa850f0c 100644 --- a/cmd/kk/pkg/common/artifact_module.go +++ b/cmd/kk/pkg/common/artifact_module.go @@ -17,8 +17,8 @@ package common import ( - kubekeyv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" + kubekeyv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" ) type ArtifactManifest struct { diff --git a/cmd/kk/pkg/common/artifact_prepare.go b/cmd/kk/pkg/common/artifact_prepare.go index 0b8bc69e..92423e29 100644 --- a/cmd/kk/pkg/common/artifact_prepare.go +++ b/cmd/kk/pkg/common/artifact_prepare.go @@ -17,8 +17,8 @@ package common import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" ) type ArtifactPrepare struct { diff --git a/cmd/kk/pkg/common/artifact_runtime.go b/cmd/kk/pkg/common/artifact_runtime.go index 395b5401..ae1de595 100644 --- a/cmd/kk/pkg/common/artifact_runtime.go +++ b/cmd/kk/pkg/common/artifact_runtime.go @@ -24,8 +24,8 @@ import ( "github.com/pkg/errors" k8syaml "k8s.io/apimachinery/pkg/util/yaml" - kubekeyv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + kubekeyv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type ArtifactArgument struct { diff --git a/cmd/kk/pkg/common/kube_action.go b/cmd/kk/pkg/common/kube_action.go index f0332407..346d4dc9 100644 --- a/cmd/kk/pkg/common/kube_action.go +++ b/cmd/kk/pkg/common/kube_action.go @@ -17,8 +17,8 @@ package common import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type KubeAction struct { diff --git a/cmd/kk/pkg/common/kube_module.go b/cmd/kk/pkg/common/kube_module.go index b8546b1a..38f4191a 100644 --- a/cmd/kk/pkg/common/kube_module.go +++ b/cmd/kk/pkg/common/kube_module.go @@ -17,8 +17,8 @@ package common import ( - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" ) type KubeConf struct { diff --git a/cmd/kk/pkg/common/kube_prepare.go b/cmd/kk/pkg/common/kube_prepare.go index f5f26f73..e15b531b 100644 --- a/cmd/kk/pkg/common/kube_prepare.go +++ b/cmd/kk/pkg/common/kube_prepare.go @@ -17,8 +17,8 @@ package common import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" ) type KubePrepare struct { diff --git a/cmd/kk/pkg/common/kube_rollback.go b/cmd/kk/pkg/common/kube_rollback.go index 8cff3e95..00dee4c5 100644 --- a/cmd/kk/pkg/common/kube_rollback.go +++ b/cmd/kk/pkg/common/kube_rollback.go @@ -17,8 +17,8 @@ package common import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/rollback" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/rollback" ) type KubeRollback struct { diff --git a/cmd/kk/pkg/common/kube_runtime.go b/cmd/kk/pkg/common/kube_runtime.go index 9306a46f..970e924e 100644 --- a/cmd/kk/pkg/common/kube_runtime.go +++ b/cmd/kk/pkg/common/kube_runtime.go @@ -17,8 +17,8 @@ package common import ( - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type KubeRuntime struct { diff --git a/cmd/kk/pkg/common/loader.go b/cmd/kk/pkg/common/loader.go index 5402697b..6e971cd6 100644 --- a/cmd/kk/pkg/common/loader.go +++ b/cmd/kk/pkg/common/loader.go @@ -33,9 +33,9 @@ import ( "gopkg.in/yaml.v2" k8syaml "k8s.io/apimachinery/pkg/util/yaml" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubesphere" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubesphere" ) var ( diff --git a/cmd/kk/pkg/common/local_runtime.go b/cmd/kk/pkg/common/local_runtime.go index 01c59835..7902e7f4 100644 --- a/cmd/kk/pkg/common/local_runtime.go +++ b/cmd/kk/pkg/common/local_runtime.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) type LocalRuntime struct { diff --git a/cmd/kk/pkg/config/from_cluster.go b/cmd/kk/pkg/config/from_cluster.go index d36493ef..faa63b38 100644 --- a/cmd/kk/pkg/config/from_cluster.go +++ b/cmd/kk/pkg/config/from_cluster.go @@ -21,7 +21,6 @@ import ( "context" "encoding/base64" "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/utils" "net" "os" "os/exec" @@ -29,12 +28,14 @@ import ( "strings" "text/template" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" "github.com/lithammer/dedent" "github.com/pkg/errors" "github.com/spf13/viper" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/utils" ) var ( diff --git a/cmd/kk/pkg/config/generate.go b/cmd/kk/pkg/config/generate.go index ed9d36f0..424a984b 100644 --- a/cmd/kk/pkg/config/generate.go +++ b/cmd/kk/pkg/config/generate.go @@ -28,11 +28,11 @@ import ( "github.com/pkg/errors" versionutil "k8s.io/apimachinery/pkg/util/version" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/config/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubesphere" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/config/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubesphere" ) // GenerateKubeKeyConfig is used to generate cluster configuration file diff --git a/cmd/kk/pkg/config/templates/cluster.go b/cmd/kk/pkg/config/templates/cluster.go index 9c50b315..373d4bd4 100644 --- a/cmd/kk/pkg/config/templates/cluster.go +++ b/cmd/kk/pkg/config/templates/cluster.go @@ -21,7 +21,7 @@ import ( "github.com/lithammer/dedent" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) // Cluster defines the template of cluster configuration file default. diff --git a/cmd/kk/pkg/container/containerd.go b/cmd/kk/pkg/container/containerd.go index 137aa16f..daac5fd1 100644 --- a/cmd/kk/pkg/container/containerd.go +++ b/cmd/kk/pkg/container/containerd.go @@ -21,19 +21,20 @@ import ( "path/filepath" "strings" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/container/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/files" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/kubesphere/kubekey/cmd/kk/pkg/registry" - "github.com/kubesphere/kubekey/cmd/kk/pkg/utils" "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/container/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/files" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/registry" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/utils" ) type SyncContainerd struct { diff --git a/cmd/kk/pkg/container/docker.go b/cmd/kk/pkg/container/docker.go index b2061be3..7fe23b40 100644 --- a/cmd/kk/pkg/container/docker.go +++ b/cmd/kk/pkg/container/docker.go @@ -21,14 +21,14 @@ import ( "path/filepath" "strings" - "github.com/kubesphere/kubekey/cmd/kk/pkg/container/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/registry" - - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/files" - "github.com/kubesphere/kubekey/cmd/kk/pkg/utils" "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/container/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/files" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/registry" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/utils" ) type SyncDockerBinaries struct { diff --git a/cmd/kk/pkg/container/module.go b/cmd/kk/pkg/container/module.go index 017385a4..cf8b4a25 100644 --- a/cmd/kk/pkg/container/module.go +++ b/cmd/kk/pkg/container/module.go @@ -20,17 +20,16 @@ import ( "path/filepath" "strings" - "github.com/kubesphere/kubekey/cmd/kk/pkg/registry" - - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/container/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/container/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/registry" ) type InstallContainerModule struct { diff --git a/cmd/kk/pkg/container/prepares.go b/cmd/kk/pkg/container/prepares.go index f3b775fa..34237857 100644 --- a/cmd/kk/pkg/container/prepares.go +++ b/cmd/kk/pkg/container/prepares.go @@ -19,8 +19,8 @@ package container import ( "strings" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type DockerExist struct { diff --git a/cmd/kk/pkg/container/templates/docker_config.go b/cmd/kk/pkg/container/templates/docker_config.go index e4b459f2..f19f3079 100644 --- a/cmd/kk/pkg/container/templates/docker_config.go +++ b/cmd/kk/pkg/container/templates/docker_config.go @@ -21,8 +21,9 @@ import ( "strings" "text/template" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" "github.com/lithammer/dedent" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" ) var DockerConfig = template.Must(template.New("daemon.json").Parse( diff --git a/cmd/kk/pkg/core/action/base.go b/cmd/kk/pkg/core/action/base.go index b7d0f987..0d09b549 100644 --- a/cmd/kk/pkg/core/action/base.go +++ b/cmd/kk/pkg/core/action/base.go @@ -17,8 +17,8 @@ package action import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type BaseAction struct { diff --git a/cmd/kk/pkg/core/action/interface.go b/cmd/kk/pkg/core/action/interface.go index 71b00f0d..cc1fd45f 100644 --- a/cmd/kk/pkg/core/action/interface.go +++ b/cmd/kk/pkg/core/action/interface.go @@ -17,8 +17,8 @@ package action import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type Action interface { diff --git a/cmd/kk/pkg/core/action/template.go b/cmd/kk/pkg/core/action/template.go index c6e30ca4..cde5d1d2 100644 --- a/cmd/kk/pkg/core/action/template.go +++ b/cmd/kk/pkg/core/action/template.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) type Template struct { diff --git a/cmd/kk/pkg/core/connector/dialer.go b/cmd/kk/pkg/core/connector/dialer.go index f8931776..5fc77e35 100644 --- a/cmd/kk/pkg/core/connector/dialer.go +++ b/cmd/kk/pkg/core/connector/dialer.go @@ -17,9 +17,10 @@ package connector import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" "sync" "time" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" ) type Dialer struct { diff --git a/cmd/kk/pkg/core/connector/host.go b/cmd/kk/pkg/core/connector/host.go index 464bb528..762c5a89 100644 --- a/cmd/kk/pkg/core/connector/host.go +++ b/cmd/kk/pkg/core/connector/host.go @@ -17,7 +17,7 @@ package connector import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" ) type BaseHost struct { diff --git a/cmd/kk/pkg/core/connector/interface.go b/cmd/kk/pkg/core/connector/interface.go index 9cb07fc8..60d12418 100644 --- a/cmd/kk/pkg/core/connector/interface.go +++ b/cmd/kk/pkg/core/connector/interface.go @@ -17,7 +17,7 @@ package connector import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" "io" "os" ) diff --git a/cmd/kk/pkg/core/connector/runner.go b/cmd/kk/pkg/core/connector/runner.go index ce01a373..eea7ccc2 100644 --- a/cmd/kk/pkg/core/connector/runner.go +++ b/cmd/kk/pkg/core/connector/runner.go @@ -19,11 +19,12 @@ package connector import ( "errors" "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" "os" "path/filepath" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) type Runner struct { diff --git a/cmd/kk/pkg/core/connector/runtime.go b/cmd/kk/pkg/core/connector/runtime.go index 1d626a9c..48d32f0e 100644 --- a/cmd/kk/pkg/core/connector/runtime.go +++ b/cmd/kk/pkg/core/connector/runtime.go @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) type BaseRuntime struct { diff --git a/cmd/kk/pkg/core/connector/ssh.go b/cmd/kk/pkg/core/connector/ssh.go index fddcbf33..7941db72 100644 --- a/cmd/kk/pkg/core/connector/ssh.go +++ b/cmd/kk/pkg/core/connector/ssh.go @@ -21,12 +21,6 @@ import ( "context" "encoding/base64" "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/pkg/errors" - "github.com/pkg/sftp" - "golang.org/x/crypto/ssh" - "golang.org/x/crypto/ssh/agent" "io" "io/ioutil" "net" @@ -37,6 +31,14 @@ import ( "strings" "sync" "time" + + "github.com/pkg/errors" + "github.com/pkg/sftp" + "golang.org/x/crypto/ssh" + "golang.org/x/crypto/ssh/agent" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) type Cfg struct { diff --git a/cmd/kk/pkg/core/ending/action_results.go b/cmd/kk/pkg/core/ending/action_results.go index 1d09ce54..7f26d92a 100644 --- a/cmd/kk/pkg/core/ending/action_results.go +++ b/cmd/kk/pkg/core/ending/action_results.go @@ -17,8 +17,9 @@ package ending import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" "time" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type ActionResult struct { diff --git a/cmd/kk/pkg/core/ending/interface.go b/cmd/kk/pkg/core/ending/interface.go index a4c3e37e..ee55753b 100644 --- a/cmd/kk/pkg/core/ending/interface.go +++ b/cmd/kk/pkg/core/ending/interface.go @@ -17,8 +17,9 @@ package ending import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" "time" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type Interface interface { diff --git a/cmd/kk/pkg/core/ending/module_result.go b/cmd/kk/pkg/core/ending/module_result.go index 756637cd..7cc958c6 100644 --- a/cmd/kk/pkg/core/ending/module_result.go +++ b/cmd/kk/pkg/core/ending/module_result.go @@ -17,9 +17,10 @@ package ending import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" "time" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type ModuleResult struct { diff --git a/cmd/kk/pkg/core/ending/task_result.go b/cmd/kk/pkg/core/ending/task_result.go index f16531b0..12444e90 100644 --- a/cmd/kk/pkg/core/ending/task_result.go +++ b/cmd/kk/pkg/core/ending/task_result.go @@ -18,10 +18,12 @@ package ending import ( "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/pkg/errors" "sync" "time" + + "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type TaskResult struct { diff --git a/cmd/kk/pkg/core/logger/kubekey.log b/cmd/kk/pkg/core/logger/kubekey.log deleted file mode 120000 index c366de1e..00000000 --- a/cmd/kk/pkg/core/logger/kubekey.log +++ /dev/null @@ -1 +0,0 @@ -kubekey.log.20220930 \ No newline at end of file diff --git a/cmd/kk/pkg/core/logger/kubekey.log.20220930 b/cmd/kk/pkg/core/logger/kubekey.log.20220930 deleted file mode 100644 index 89481198..00000000 --- a/cmd/kk/pkg/core/logger/kubekey.log.20220930 +++ /dev/null @@ -1,110 +0,0 @@ -11:29:49 CST empty fields -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST empty fields -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST empty fields -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST empty fields -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST empty fields -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:29:49 CST Congratulations!ssssss -11:38:52 CST empty fields -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST empty fields -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST empty fields -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST empty fields -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST empty fields -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss -11:38:52 CST Congratulations!ssssss diff --git a/cmd/kk/pkg/core/logger/logger.go b/cmd/kk/pkg/core/logger/logger.go index d240db74..ad3b2295 100644 --- a/cmd/kk/pkg/core/logger/logger.go +++ b/cmd/kk/pkg/core/logger/logger.go @@ -25,7 +25,7 @@ import ( "github.com/rifflock/lfshook" "github.com/sirupsen/logrus" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/common" ) var Log *KubeKeyLog diff --git a/cmd/kk/pkg/core/module/base.go b/cmd/kk/pkg/core/module/base.go index cd9dca51..7bfc84a8 100644 --- a/cmd/kk/pkg/core/module/base.go +++ b/cmd/kk/pkg/core/module/base.go @@ -17,11 +17,12 @@ package module import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/ending" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/hook" "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/ending" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/hook" ) type BaseModule struct { diff --git a/cmd/kk/pkg/core/module/hook.go b/cmd/kk/pkg/core/module/hook.go index e8386b93..58a45040 100644 --- a/cmd/kk/pkg/core/module/hook.go +++ b/cmd/kk/pkg/core/module/hook.go @@ -17,8 +17,8 @@ package module import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/ending" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/hook" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/ending" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/hook" ) type PostHookInterface interface { diff --git a/cmd/kk/pkg/core/module/interface.go b/cmd/kk/pkg/core/module/interface.go index 301b57ed..36a07334 100644 --- a/cmd/kk/pkg/core/module/interface.go +++ b/cmd/kk/pkg/core/module/interface.go @@ -17,9 +17,9 @@ package module import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/ending" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/ending" ) type Module interface { diff --git a/cmd/kk/pkg/core/module/task_module.go b/cmd/kk/pkg/core/module/task_module.go index 273f7a1a..569302e0 100644 --- a/cmd/kk/pkg/core/module/task_module.go +++ b/cmd/kk/pkg/core/module/task_module.go @@ -17,11 +17,12 @@ package module import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/ending" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/ending" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" ) type BaseTaskModule struct { diff --git a/cmd/kk/pkg/core/pipeline/pipeline.go b/cmd/kk/pkg/core/pipeline/pipeline.go index 8851fceb..f7e9baeb 100644 --- a/cmd/kk/pkg/core/pipeline/pipeline.go +++ b/cmd/kk/pkg/core/pipeline/pipeline.go @@ -23,11 +23,11 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/ending" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/ending" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" ) var logo = ` diff --git a/cmd/kk/pkg/core/prepare/base.go b/cmd/kk/pkg/core/prepare/base.go index 14adae76..46b644b0 100644 --- a/cmd/kk/pkg/core/prepare/base.go +++ b/cmd/kk/pkg/core/prepare/base.go @@ -17,8 +17,8 @@ package prepare import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type BasePrepare struct { diff --git a/cmd/kk/pkg/core/prepare/fast_prepare.go b/cmd/kk/pkg/core/prepare/fast_prepare.go index 488402f9..7f1566b8 100644 --- a/cmd/kk/pkg/core/prepare/fast_prepare.go +++ b/cmd/kk/pkg/core/prepare/fast_prepare.go @@ -17,7 +17,7 @@ package prepare import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type FastPrepare struct { diff --git a/cmd/kk/pkg/core/prepare/file_check.go b/cmd/kk/pkg/core/prepare/file_check.go index 73ce72ff..b0cc21ed 100644 --- a/cmd/kk/pkg/core/prepare/file_check.go +++ b/cmd/kk/pkg/core/prepare/file_check.go @@ -16,7 +16,9 @@ package prepare -import "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" +import ( + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" +) type FileExist struct { BasePrepare diff --git a/cmd/kk/pkg/core/prepare/interface.go b/cmd/kk/pkg/core/prepare/interface.go index c1d17497..46eb02dd 100644 --- a/cmd/kk/pkg/core/prepare/interface.go +++ b/cmd/kk/pkg/core/prepare/interface.go @@ -17,8 +17,8 @@ package prepare import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type Prepare interface { diff --git a/cmd/kk/pkg/core/rollback/base.go b/cmd/kk/pkg/core/rollback/base.go index 8c2e790b..838cd8ba 100644 --- a/cmd/kk/pkg/core/rollback/base.go +++ b/cmd/kk/pkg/core/rollback/base.go @@ -17,9 +17,9 @@ package rollback import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/ending" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/ending" ) type BaseRollback struct { diff --git a/cmd/kk/pkg/core/rollback/interface.go b/cmd/kk/pkg/core/rollback/interface.go index c2a36eda..f0a28b23 100644 --- a/cmd/kk/pkg/core/rollback/interface.go +++ b/cmd/kk/pkg/core/rollback/interface.go @@ -17,9 +17,9 @@ package rollback import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/ending" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/ending" ) type Rollback interface { diff --git a/cmd/kk/pkg/core/task/interface.go b/cmd/kk/pkg/core/task/interface.go index 27619be8..d1d154e7 100644 --- a/cmd/kk/pkg/core/task/interface.go +++ b/cmd/kk/pkg/core/task/interface.go @@ -17,9 +17,9 @@ package task import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/ending" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/ending" ) type Interface interface { diff --git a/cmd/kk/pkg/core/task/local_task.go b/cmd/kk/pkg/core/task/local_task.go index 1586f4e8..e1c24311 100644 --- a/cmd/kk/pkg/core/task/local_task.go +++ b/cmd/kk/pkg/core/task/local_task.go @@ -23,15 +23,15 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/ending" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/rollback" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/ending" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/rollback" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) type LocalTask struct { diff --git a/cmd/kk/pkg/core/task/remote_task.go b/cmd/kk/pkg/core/task/remote_task.go index ce338083..f390bbba 100644 --- a/cmd/kk/pkg/core/task/remote_task.go +++ b/cmd/kk/pkg/core/task/remote_task.go @@ -24,14 +24,14 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/ending" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/rollback" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/ending" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/rollback" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) type RemoteTask struct { diff --git a/cmd/kk/pkg/core/task/remote_task_test.go b/cmd/kk/pkg/core/task/remote_task_test.go index b8c76f32..ad80f9d2 100644 --- a/cmd/kk/pkg/core/task/remote_task_test.go +++ b/cmd/kk/pkg/core/task/remote_task_test.go @@ -17,8 +17,9 @@ package task import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" "testing" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) func TestTask_calculateConcurrency(t1 *testing.T) { diff --git a/cmd/kk/pkg/core/util/file.go b/cmd/kk/pkg/core/util/file.go index fc78d716..f6f22940 100644 --- a/cmd/kk/pkg/core/util/file.go +++ b/cmd/kk/pkg/core/util/file.go @@ -21,14 +21,15 @@ import ( "compress/gzip" "crypto/md5" "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" "io" "io/fs" "io/ioutil" "os" "path/filepath" "strings" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" ) func IsExist(path string) bool { diff --git a/cmd/kk/pkg/core/util/ip.go b/cmd/kk/pkg/core/util/ip.go index 8d803c37..162650a8 100644 --- a/cmd/kk/pkg/core/util/ip.go +++ b/cmd/kk/pkg/core/util/ip.go @@ -18,11 +18,13 @@ package util import ( "encoding/binary" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/pkg/errors" "net" "strconv" "strings" + + "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" ) func ParseIp(ip string) []string { diff --git a/cmd/kk/pkg/etcd/certs.go b/cmd/kk/pkg/etcd/certs.go index 325145ae..4c0d8fe5 100644 --- a/cmd/kk/pkg/etcd/certs.go +++ b/cmd/kk/pkg/etcd/certs.go @@ -19,20 +19,22 @@ package etcd import ( "crypto/x509" "fmt" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/utils/certs" - "github.com/pkg/errors" "io/ioutil" - "k8s.io/client-go/util/cert" - certutil "k8s.io/client-go/util/cert" - netutils "k8s.io/utils/net" "net" "os" "path/filepath" "strings" + + "github.com/pkg/errors" + "k8s.io/client-go/util/cert" + certutil "k8s.io/client-go/util/cert" + netutils "k8s.io/utils/net" + + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/utils/certs" ) // KubekeyCertEtcdCA is the definition of the root CA used by the hosted etcd server. diff --git a/cmd/kk/pkg/etcd/module.go b/cmd/kk/pkg/etcd/module.go index ad329274..0de29475 100644 --- a/cmd/kk/pkg/etcd/module.go +++ b/cmd/kk/pkg/etcd/module.go @@ -19,12 +19,12 @@ package etcd import ( "path/filepath" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/etcd/templates" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/etcd/templates" ) type PreCheckModule struct { diff --git a/cmd/kk/pkg/etcd/prepares.go b/cmd/kk/pkg/etcd/prepares.go index a438d2ff..aa183dbd 100644 --- a/cmd/kk/pkg/etcd/prepares.go +++ b/cmd/kk/pkg/etcd/prepares.go @@ -19,9 +19,10 @@ package etcd import ( "strings" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type FirstETCDNode struct { diff --git a/cmd/kk/pkg/etcd/tasks.go b/cmd/kk/pkg/etcd/tasks.go index f24c6fdf..14cca92d 100644 --- a/cmd/kk/pkg/etcd/tasks.go +++ b/cmd/kk/pkg/etcd/tasks.go @@ -21,17 +21,16 @@ import ( "path/filepath" "strings" - "github.com/kubesphere/kubekey/cmd/kk/pkg/files" - "github.com/pkg/errors" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/etcd/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/utils" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/etcd/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/files" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/utils" ) type EtcdNode struct { diff --git a/cmd/kk/pkg/files/file.go b/cmd/kk/pkg/files/file.go index e8eaf4d3..8485a0ec 100644 --- a/cmd/kk/pkg/files/file.go +++ b/cmd/kk/pkg/files/file.go @@ -19,8 +19,6 @@ package files import ( "crypto/sha256" "fmt" - "github.com/kubesphere/kubekey/version" - "github.com/pkg/errors" "io" "io/ioutil" "os" @@ -28,8 +26,11 @@ import ( "path/filepath" "strings" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" + "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/version" ) const ( diff --git a/cmd/kk/pkg/filesystem/module.go b/cmd/kk/pkg/filesystem/module.go index bbe2e1e6..fa0dacbe 100644 --- a/cmd/kk/pkg/filesystem/module.go +++ b/cmd/kk/pkg/filesystem/module.go @@ -17,9 +17,9 @@ package filesystem import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" ) type ChownModule struct { diff --git a/cmd/kk/pkg/filesystem/task.go b/cmd/kk/pkg/filesystem/task.go index 4a3ae540..b824e782 100644 --- a/cmd/kk/pkg/filesystem/task.go +++ b/cmd/kk/pkg/filesystem/task.go @@ -18,11 +18,13 @@ package filesystem import ( "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/pkg/errors" "os/exec" + + "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" ) type ChownFileAndDir struct { diff --git a/cmd/kk/pkg/images/copy.go b/cmd/kk/pkg/images/copy.go index 118a9766..4d4cb2e5 100644 --- a/cmd/kk/pkg/images/copy.go +++ b/cmd/kk/pkg/images/copy.go @@ -18,10 +18,11 @@ package images import ( "context" + "os" + "github.com/containers/image/v5/copy" "github.com/containers/image/v5/signature" "github.com/containers/image/v5/transports/alltransports" - "os" ) type CopyImageOptions struct { diff --git a/cmd/kk/pkg/images/images.go b/cmd/kk/pkg/images/images.go index 5e73805a..9730cb91 100644 --- a/cmd/kk/pkg/images/images.go +++ b/cmd/kk/pkg/images/images.go @@ -18,12 +18,14 @@ package images import ( "fmt" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/pkg/errors" "os" + + "github.com/pkg/errors" + + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" ) const ( diff --git a/cmd/kk/pkg/images/module.go b/cmd/kk/pkg/images/module.go index 105e0481..cc4843e0 100644 --- a/cmd/kk/pkg/images/module.go +++ b/cmd/kk/pkg/images/module.go @@ -17,8 +17,8 @@ package images import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" ) type PullModule struct { diff --git a/cmd/kk/pkg/images/tasks.go b/cmd/kk/pkg/images/tasks.go index 29bddfbf..7cdb9cba 100644 --- a/cmd/kk/pkg/images/tasks.go +++ b/cmd/kk/pkg/images/tasks.go @@ -29,12 +29,12 @@ import ( "github.com/pkg/errors" versionutil "k8s.io/apimachinery/pkg/util/version" - kubekeyv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - coreutil "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/registry" + kubekeyv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + coreutil "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/registry" ) type PullImage struct { diff --git a/cmd/kk/pkg/images/utils.go b/cmd/kk/pkg/images/utils.go index f3427daf..72b76733 100644 --- a/cmd/kk/pkg/images/utils.go +++ b/cmd/kk/pkg/images/utils.go @@ -26,7 +26,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" ) var defaultUserAgent = "kubekey" diff --git a/cmd/kk/pkg/images/utils_test.go b/cmd/kk/pkg/images/utils_test.go index 13acebde..d393e8ff 100644 --- a/cmd/kk/pkg/images/utils_test.go +++ b/cmd/kk/pkg/images/utils_test.go @@ -17,9 +17,10 @@ package images import ( - v1 "github.com/opencontainers/image-spec/specs-go/v1" "reflect" "testing" + + v1 "github.com/opencontainers/image-spec/specs-go/v1" ) func TestParseArchVariant(t *testing.T) { diff --git a/cmd/kk/pkg/k3s/k3s_status.go b/cmd/kk/pkg/k3s/k3s_status.go index 95cbcbde..72a51141 100644 --- a/cmd/kk/pkg/k3s/k3s_status.go +++ b/cmd/kk/pkg/k3s/k3s_status.go @@ -18,13 +18,15 @@ package k3s import ( "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/pkg/errors" "io/ioutil" "path/filepath" "regexp" "strings" + + "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type K3sStatus struct { diff --git a/cmd/kk/pkg/k3s/module.go b/cmd/kk/pkg/k3s/module.go index f93b3d42..0e198a34 100644 --- a/cmd/kk/pkg/k3s/module.go +++ b/cmd/kk/pkg/k3s/module.go @@ -17,12 +17,13 @@ package k3s import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/k3s/templates" "path/filepath" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/k3s/templates" ) type StatusModule struct { diff --git a/cmd/kk/pkg/k3s/prepares.go b/cmd/kk/pkg/k3s/prepares.go index 7ddbabe6..0ff3bd9d 100644 --- a/cmd/kk/pkg/k3s/prepares.go +++ b/cmd/kk/pkg/k3s/prepares.go @@ -17,9 +17,10 @@ package k3s import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type NodeInCluster struct { diff --git a/cmd/kk/pkg/k3s/tasks.go b/cmd/kk/pkg/k3s/tasks.go index 18d8ea1e..88aeefb9 100644 --- a/cmd/kk/pkg/k3s/tasks.go +++ b/cmd/kk/pkg/k3s/tasks.go @@ -23,24 +23,24 @@ import ( "path/filepath" "strings" - "github.com/kubesphere/kubekey/cmd/kk/pkg/registry" - - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - kubekeyregistry "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/registry" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/files" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/kubesphere/kubekey/cmd/kk/pkg/k3s/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/utils" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" versionutil "k8s.io/apimachinery/pkg/util/version" kube "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" + + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + kubekeyregistry "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/registry" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/files" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/k3s/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/registry" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/utils" ) type GetClusterStatus struct { diff --git a/cmd/kk/pkg/k3s/templates/k3sRegistryConfig.go b/cmd/kk/pkg/k3s/templates/k3sRegistryConfig.go index ce13b967..cd5266d8 100644 --- a/cmd/kk/pkg/k3s/templates/k3sRegistryConfig.go +++ b/cmd/kk/pkg/k3s/templates/k3sRegistryConfig.go @@ -17,9 +17,11 @@ package templates import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/utils" - "github.com/lithammer/dedent" "text/template" + + "github.com/lithammer/dedent" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/utils" ) var ( diff --git a/cmd/kk/pkg/k8e/k8e_status.go b/cmd/kk/pkg/k8e/k8e_status.go index f2ebded5..5962035a 100644 --- a/cmd/kk/pkg/k8e/k8e_status.go +++ b/cmd/kk/pkg/k8e/k8e_status.go @@ -23,9 +23,10 @@ import ( "regexp" "strings" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type K8eStatus struct { diff --git a/cmd/kk/pkg/k8e/module.go b/cmd/kk/pkg/k8e/module.go index dde1b82f..3539413c 100644 --- a/cmd/kk/pkg/k8e/module.go +++ b/cmd/kk/pkg/k8e/module.go @@ -19,11 +19,11 @@ package k8e import ( "path/filepath" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/k8e/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/k8e/templates" ) type StatusModule struct { diff --git a/cmd/kk/pkg/k8e/prepares.go b/cmd/kk/pkg/k8e/prepares.go index d1554b3e..7a1d100a 100644 --- a/cmd/kk/pkg/k8e/prepares.go +++ b/cmd/kk/pkg/k8e/prepares.go @@ -17,9 +17,10 @@ package k8e import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type NodeInCluster struct { diff --git a/cmd/kk/pkg/k8e/tasks.go b/cmd/kk/pkg/k8e/tasks.go index ff29737e..476cceb5 100644 --- a/cmd/kk/pkg/k8e/tasks.go +++ b/cmd/kk/pkg/k8e/tasks.go @@ -23,21 +23,22 @@ import ( "path/filepath" "strings" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/files" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/kubesphere/kubekey/cmd/kk/pkg/k8e/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/utils" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" versionutil "k8s.io/apimachinery/pkg/util/version" kube "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" + + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/files" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/k8e/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/utils" ) type GetClusterStatus struct { diff --git a/cmd/kk/pkg/kubernetes/kubernetes_status.go b/cmd/kk/pkg/kubernetes/kubernetes_status.go index 00b56f74..39b7d10f 100644 --- a/cmd/kk/pkg/kubernetes/kubernetes_status.go +++ b/cmd/kk/pkg/kubernetes/kubernetes_status.go @@ -18,13 +18,15 @@ package kubernetes import ( "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/pkg/errors" "io/ioutil" "path/filepath" "regexp" "strings" + + "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type KubernetesStatus struct { diff --git a/cmd/kk/pkg/kubernetes/module.go b/cmd/kk/pkg/kubernetes/module.go index 9cfd0c25..fd8aad1f 100644 --- a/cmd/kk/pkg/kubernetes/module.go +++ b/cmd/kk/pkg/kubernetes/module.go @@ -23,13 +23,13 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/binaries" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/binaries" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes/templates" ) type StatusModule struct { diff --git a/cmd/kk/pkg/kubernetes/prepares.go b/cmd/kk/pkg/kubernetes/prepares.go index a15f6d2e..c0f2e530 100644 --- a/cmd/kk/pkg/kubernetes/prepares.go +++ b/cmd/kk/pkg/kubernetes/prepares.go @@ -17,9 +17,10 @@ package kubernetes import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type NoClusterInfo struct { diff --git a/cmd/kk/pkg/kubernetes/tasks.go b/cmd/kk/pkg/kubernetes/tasks.go index b75fa69d..6afe5721 100644 --- a/cmd/kk/pkg/kubernetes/tasks.go +++ b/cmd/kk/pkg/kubernetes/tasks.go @@ -34,22 +34,22 @@ import ( kube "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - kubekeyv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/etcd" - "github.com/kubesphere/kubekey/cmd/kk/pkg/files" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes/templates/v1beta2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/plugins/dns" - dnsTemplates "github.com/kubesphere/kubekey/cmd/kk/pkg/plugins/dns/templates" - "github.com/kubesphere/kubekey/cmd/kk/pkg/utils" + kubekeyv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/etcd" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/files" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes/templates/v1beta2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins/dns" + dnsTemplates "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins/dns/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/utils" ) type GetClusterStatus struct { diff --git a/cmd/kk/pkg/kubernetes/templates/v1beta2/kubeadm_config.go b/cmd/kk/pkg/kubernetes/templates/v1beta2/kubeadm_config.go index 07ec6ff3..dde795a3 100644 --- a/cmd/kk/pkg/kubernetes/templates/v1beta2/kubeadm_config.go +++ b/cmd/kk/pkg/kubernetes/templates/v1beta2/kubeadm_config.go @@ -21,17 +21,15 @@ import ( "strings" "text/template" - "github.com/kubesphere/kubekey/cmd/kk/pkg/utils" - - versionutil "k8s.io/apimachinery/pkg/util/version" - "github.com/lithammer/dedent" "github.com/pkg/errors" "gopkg.in/yaml.v2" + versionutil "k8s.io/apimachinery/pkg/util/version" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/utils" ) var ( diff --git a/cmd/kk/pkg/kubesphere/kubesphere_test.go b/cmd/kk/pkg/kubesphere/kubesphere_test.go index fae8c296..46a63918 100644 --- a/cmd/kk/pkg/kubesphere/kubesphere_test.go +++ b/cmd/kk/pkg/kubesphere/kubesphere_test.go @@ -17,9 +17,10 @@ package kubesphere import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubesphere" "reflect" "testing" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubesphere" ) func Test_mirrorRepo(t *testing.T) { diff --git a/cmd/kk/pkg/kubesphere/modules.go b/cmd/kk/pkg/kubesphere/modules.go index 638c2888..f7628f3c 100644 --- a/cmd/kk/pkg/kubesphere/modules.go +++ b/cmd/kk/pkg/kubesphere/modules.go @@ -21,13 +21,13 @@ import ( "os" "path/filepath" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubesphere" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubesphere/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubesphere" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubesphere/templates" ) type DeployModule struct { diff --git a/cmd/kk/pkg/kubesphere/prepares.go b/cmd/kk/pkg/kubesphere/prepares.go index ce94abde..44dc28b1 100644 --- a/cmd/kk/pkg/kubesphere/prepares.go +++ b/cmd/kk/pkg/kubesphere/prepares.go @@ -17,10 +17,11 @@ package kubesphere import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" "github.com/pkg/errors" versionutil "k8s.io/apimachinery/pkg/util/version" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type VersionBelowV3 struct { diff --git a/cmd/kk/pkg/kubesphere/tasks.go b/cmd/kk/pkg/kubesphere/tasks.go index d187236e..a9163b7a 100644 --- a/cmd/kk/pkg/kubesphere/tasks.go +++ b/cmd/kk/pkg/kubesphere/tasks.go @@ -20,20 +20,22 @@ import ( "context" "encoding/base64" "fmt" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - ksv2 "github.com/kubesphere/kubekey/cmd/kk/pkg/kubesphere/v2" - ksv3 "github.com/kubesphere/kubekey/cmd/kk/pkg/kubesphere/v3" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubesphere" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubesphere/templates" - "github.com/pkg/errors" - yamlV2 "gopkg.in/yaml.v2" "os" "path/filepath" "strings" "time" + + "github.com/pkg/errors" + yamlV2 "gopkg.in/yaml.v2" + + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + ksv2 "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubesphere/v2" + ksv3 "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubesphere/v3" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubesphere" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubesphere/templates" ) type AddInstallerConfig struct { diff --git a/cmd/kk/pkg/loadbalancer/module.go b/cmd/kk/pkg/loadbalancer/module.go index f58ec97e..7492581f 100644 --- a/cmd/kk/pkg/loadbalancer/module.go +++ b/cmd/kk/pkg/loadbalancer/module.go @@ -19,14 +19,14 @@ package loadbalancer import ( "path/filepath" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/loadbalancer/templates" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/loadbalancer/templates" ) type HaproxyModule struct { diff --git a/cmd/kk/pkg/loadbalancer/prepares.go b/cmd/kk/pkg/loadbalancer/prepares.go index 7d8f2d0e..7dacbf4d 100644 --- a/cmd/kk/pkg/loadbalancer/prepares.go +++ b/cmd/kk/pkg/loadbalancer/prepares.go @@ -17,11 +17,13 @@ package loadbalancer import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/pkg/errors" "strings" + + "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" ) type updateK3sPrepare struct { diff --git a/cmd/kk/pkg/loadbalancer/tasks.go b/cmd/kk/pkg/loadbalancer/tasks.go index c07ae23d..5864a4aa 100644 --- a/cmd/kk/pkg/loadbalancer/tasks.go +++ b/cmd/kk/pkg/loadbalancer/tasks.go @@ -22,13 +22,14 @@ import ( "strconv" "strings" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/kubesphere/kubekey/cmd/kk/pkg/loadbalancer/templates" "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/loadbalancer/templates" ) type GetChecksum struct { diff --git a/cmd/kk/pkg/loadbalancer/templates/haproxyConfig.go b/cmd/kk/pkg/loadbalancer/templates/haproxyConfig.go index 448bf96d..921245c6 100644 --- a/cmd/kk/pkg/loadbalancer/templates/haproxyConfig.go +++ b/cmd/kk/pkg/loadbalancer/templates/haproxyConfig.go @@ -17,12 +17,14 @@ package templates import ( - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/lithammer/dedent" "strconv" "text/template" + + "github.com/lithammer/dedent" + + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) var HaproxyConfig = template.Must(template.New("haproxy.cfg").Parse( diff --git a/cmd/kk/pkg/phase/artifact/artifact.go b/cmd/kk/pkg/phase/artifact/artifact.go index f6e376b0..5d540ca8 100755 --- a/cmd/kk/pkg/phase/artifact/artifact.go +++ b/cmd/kk/pkg/phase/artifact/artifact.go @@ -19,10 +19,10 @@ package artifact import ( "errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/artifact" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/artifact" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" ) func NewArtifactImportPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/phase/binary/create_binary.go b/cmd/kk/pkg/phase/binary/create_binary.go index c5bf6ad1..b29987e1 100755 --- a/cmd/kk/pkg/phase/binary/create_binary.go +++ b/cmd/kk/pkg/phase/binary/create_binary.go @@ -20,11 +20,11 @@ import ( "errors" "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/binaries" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/binaries" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" ) func NewCreateBinaryPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/phase/binary/modules.go b/cmd/kk/pkg/phase/binary/modules.go index 58f84419..40208c8f 100755 --- a/cmd/kk/pkg/phase/binary/modules.go +++ b/cmd/kk/pkg/phase/binary/modules.go @@ -17,9 +17,9 @@ package binary import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes" ) type SyncBinaryModule struct { diff --git a/cmd/kk/pkg/phase/binary/task.go b/cmd/kk/pkg/phase/binary/task.go index 5582d80f..4300c659 100755 --- a/cmd/kk/pkg/phase/binary/task.go +++ b/cmd/kk/pkg/phase/binary/task.go @@ -5,11 +5,11 @@ import ( "github.com/pkg/errors" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/cache" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/files" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/cache" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/files" ) type GetBinaryPath struct { diff --git a/cmd/kk/pkg/phase/binary/upgrade_binary.go b/cmd/kk/pkg/phase/binary/upgrade_binary.go index b86ceea5..e1639ed6 100755 --- a/cmd/kk/pkg/phase/binary/upgrade_binary.go +++ b/cmd/kk/pkg/phase/binary/upgrade_binary.go @@ -20,11 +20,11 @@ import ( "errors" "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/binaries" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/binaries" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/precheck" ) func NewUpgradeBinaryPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/phase/confirm/confirm.go b/cmd/kk/pkg/phase/confirm/confirm.go index 12960507..fe847d3e 100644 --- a/cmd/kk/pkg/phase/confirm/confirm.go +++ b/cmd/kk/pkg/phase/confirm/confirm.go @@ -1,8 +1,8 @@ package confirm import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" ) type UpgradeK8sConfirmModule struct { diff --git a/cmd/kk/pkg/phase/confirm/task.go b/cmd/kk/pkg/phase/confirm/task.go index 794cc075..365e31ae 100644 --- a/cmd/kk/pkg/phase/confirm/task.go +++ b/cmd/kk/pkg/phase/confirm/task.go @@ -11,10 +11,10 @@ import ( "github.com/modood/table" versionutil "k8s.io/apimachinery/pkg/util/version" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/confirm" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/confirm" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" ) type UpgradeK8sConfirm struct { diff --git a/cmd/kk/pkg/phase/etcd/etcd.go b/cmd/kk/pkg/phase/etcd/etcd.go index 54fa8d27..ce40781f 100755 --- a/cmd/kk/pkg/phase/etcd/etcd.go +++ b/cmd/kk/pkg/phase/etcd/etcd.go @@ -19,11 +19,11 @@ package etcd import ( "errors" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/etcd" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/etcd" ) func NewCreateEtcdPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/phase/etcd/modules.go b/cmd/kk/pkg/phase/etcd/modules.go index f4df4a06..7e5ca11f 100755 --- a/cmd/kk/pkg/phase/etcd/modules.go +++ b/cmd/kk/pkg/phase/etcd/modules.go @@ -1,10 +1,10 @@ package etcd import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/etcd" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/binary" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/etcd" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/binary" ) type PreCheckModule struct { diff --git a/cmd/kk/pkg/phase/images/create_images.go b/cmd/kk/pkg/phase/images/create_images.go index 35e110d8..6bbb0f91 100755 --- a/cmd/kk/pkg/phase/images/create_images.go +++ b/cmd/kk/pkg/phase/images/create_images.go @@ -19,12 +19,12 @@ package images import ( "errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/container" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/container" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes" ) func NewCreateImagesPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/phase/images/modules.go b/cmd/kk/pkg/phase/images/modules.go index 9aee0278..4fe93748 100644 --- a/cmd/kk/pkg/phase/images/modules.go +++ b/cmd/kk/pkg/phase/images/modules.go @@ -17,11 +17,11 @@ package images import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/binary" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/binary" ) type UpgradeImagesModule struct { diff --git a/cmd/kk/pkg/phase/images/upgrade_images.go b/cmd/kk/pkg/phase/images/upgrade_images.go index 0448d624..65016684 100755 --- a/cmd/kk/pkg/phase/images/upgrade_images.go +++ b/cmd/kk/pkg/phase/images/upgrade_images.go @@ -19,10 +19,10 @@ package images import ( "errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/precheck" ) func NewUpgradeImagesPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/phase/kubernetes/configure.go b/cmd/kk/pkg/phase/kubernetes/configure.go index 9f454985..82e82bf9 100755 --- a/cmd/kk/pkg/phase/kubernetes/configure.go +++ b/cmd/kk/pkg/phase/kubernetes/configure.go @@ -19,17 +19,17 @@ package kubernetes import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/addons" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/certs" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/filesystem" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes" - "github.com/kubesphere/kubekey/cmd/kk/pkg/plugins" - "github.com/kubesphere/kubekey/cmd/kk/pkg/plugins/network" - "github.com/kubesphere/kubekey/cmd/kk/pkg/plugins/storage" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/addons" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/certs" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/filesystem" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins/network" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins/storage" ) func NewCreateConfigureKubernetesPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/phase/kubernetes/init.go b/cmd/kk/pkg/phase/kubernetes/init.go index fed4f2a2..9d11bf23 100644 --- a/cmd/kk/pkg/phase/kubernetes/init.go +++ b/cmd/kk/pkg/phase/kubernetes/init.go @@ -19,13 +19,13 @@ package kubernetes import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/confirm" - "github.com/kubesphere/kubekey/cmd/kk/pkg/plugins/dns" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/confirm" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins/dns" ) func NewCreateInitClusterPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/phase/kubernetes/join.go b/cmd/kk/pkg/phase/kubernetes/join.go index 6755dc68..75c1bfb6 100644 --- a/cmd/kk/pkg/phase/kubernetes/join.go +++ b/cmd/kk/pkg/phase/kubernetes/join.go @@ -19,11 +19,11 @@ package kubernetes import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes" ) func NewCreateJoinNodesPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/phase/kubernetes/modules.go b/cmd/kk/pkg/phase/kubernetes/modules.go index 7404e8dd..2f771756 100644 --- a/cmd/kk/pkg/phase/kubernetes/modules.go +++ b/cmd/kk/pkg/phase/kubernetes/modules.go @@ -3,11 +3,11 @@ package kubernetes import ( "path/filepath" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes/templates" ) type InstallKubeletModule struct { diff --git a/cmd/kk/pkg/phase/kubesphere/create_kubesphere.go b/cmd/kk/pkg/phase/kubesphere/create_kubesphere.go index ff8824d7..76dd6286 100755 --- a/cmd/kk/pkg/phase/kubesphere/create_kubesphere.go +++ b/cmd/kk/pkg/phase/kubesphere/create_kubesphere.go @@ -19,12 +19,12 @@ package alpha import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubesphere" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/confirm" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubesphere" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/confirm" ) func NewCreateKubeSpherePipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/phase/kubesphere/upgrade_kubesphere.go b/cmd/kk/pkg/phase/kubesphere/upgrade_kubesphere.go index 9cab570d..8eebf190 100755 --- a/cmd/kk/pkg/phase/kubesphere/upgrade_kubesphere.go +++ b/cmd/kk/pkg/phase/kubesphere/upgrade_kubesphere.go @@ -19,12 +19,12 @@ package alpha import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubesphere" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/confirm" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubesphere" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/confirm" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/precheck" ) func NewUpgradeKubeSpherePipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/phase/nodes/modules.go b/cmd/kk/pkg/phase/nodes/modules.go index f32c5069..5b31e927 100644 --- a/cmd/kk/pkg/phase/nodes/modules.go +++ b/cmd/kk/pkg/phase/nodes/modules.go @@ -17,10 +17,10 @@ package nodes import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes" ) type UpgradeNodesModule struct { diff --git a/cmd/kk/pkg/phase/nodes/nodes.go b/cmd/kk/pkg/phase/nodes/nodes.go index 67efcf6f..ddd7f27f 100755 --- a/cmd/kk/pkg/phase/nodes/nodes.go +++ b/cmd/kk/pkg/phase/nodes/nodes.go @@ -19,11 +19,11 @@ package nodes import ( "errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/confirm" - "github.com/kubesphere/kubekey/cmd/kk/pkg/phase/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/confirm" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/phase/precheck" ) func NewUpgradeNodesPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/phase/os/config.go b/cmd/kk/pkg/phase/os/config.go index f296c21c..09a2b79c 100755 --- a/cmd/kk/pkg/phase/os/config.go +++ b/cmd/kk/pkg/phase/os/config.go @@ -19,11 +19,11 @@ package os import ( "errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/os" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/os" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" ) func NewConfigOSPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/phase/precheck/modules.go b/cmd/kk/pkg/phase/precheck/modules.go index 95b3afe9..1e75a5f5 100755 --- a/cmd/kk/pkg/phase/precheck/modules.go +++ b/cmd/kk/pkg/phase/precheck/modules.go @@ -17,10 +17,10 @@ package precheck import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" ) type UpgradePreCheckModule struct { diff --git a/cmd/kk/pkg/phase/precheck/task.go b/cmd/kk/pkg/phase/precheck/task.go index a79423bd..603956cb 100644 --- a/cmd/kk/pkg/phase/precheck/task.go +++ b/cmd/kk/pkg/phase/precheck/task.go @@ -21,12 +21,11 @@ import ( "strings" "github.com/pkg/errors" - versionutil "k8s.io/apimachinery/pkg/util/version" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubesphere" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubesphere" ) type CheckUpgradeK8sVersion struct { diff --git a/cmd/kk/pkg/pipelines/add_nodes.go b/cmd/kk/pkg/pipelines/add_nodes.go index 21c9cb88..0cce856f 100644 --- a/cmd/kk/pkg/pipelines/add_nodes.go +++ b/cmd/kk/pkg/pipelines/add_nodes.go @@ -19,26 +19,26 @@ package pipelines import ( "fmt" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/artifact" - "github.com/kubesphere/kubekey/cmd/kk/pkg/binaries" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/confirm" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/customscripts" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/os" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/registry" - "github.com/kubesphere/kubekey/cmd/kk/pkg/certs" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/container" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/etcd" - "github.com/kubesphere/kubekey/cmd/kk/pkg/filesystem" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/kubesphere/kubekey/cmd/kk/pkg/k3s" - "github.com/kubesphere/kubekey/cmd/kk/pkg/k8e" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes" - "github.com/kubesphere/kubekey/cmd/kk/pkg/loadbalancer" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/artifact" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/binaries" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/confirm" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/customscripts" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/os" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/registry" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/certs" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/container" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/etcd" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/filesystem" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/k3s" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/k8e" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/loadbalancer" ) func NewAddNodesPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/pipelines/artifact_export.go b/cmd/kk/pkg/pipelines/artifact_export.go index b65ab1d4..8c5598de 100644 --- a/cmd/kk/pkg/pipelines/artifact_export.go +++ b/cmd/kk/pkg/pipelines/artifact_export.go @@ -21,14 +21,14 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/artifact" - "github.com/kubesphere/kubekey/cmd/kk/pkg/binaries" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/confirm" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/filesystem" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/artifact" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/binaries" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/confirm" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/filesystem" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" ) func NewArtifactExportPipeline(runtime *common.ArtifactRuntime) error { diff --git a/cmd/kk/pkg/pipelines/check_certs.go b/cmd/kk/pkg/pipelines/check_certs.go index 0ece3ddf..261a26e4 100644 --- a/cmd/kk/pkg/pipelines/check_certs.go +++ b/cmd/kk/pkg/pipelines/check_certs.go @@ -17,11 +17,11 @@ package pipelines import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/certs" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/certs" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" ) func CheckCertsPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/pipelines/create_cluster.go b/cmd/kk/pkg/pipelines/create_cluster.go index 0f63afb8..a847b7b1 100644 --- a/cmd/kk/pkg/pipelines/create_cluster.go +++ b/cmd/kk/pkg/pipelines/create_cluster.go @@ -19,31 +19,31 @@ package pipelines import ( "fmt" - kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/addons" - "github.com/kubesphere/kubekey/cmd/kk/pkg/artifact" - "github.com/kubesphere/kubekey/cmd/kk/pkg/binaries" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/confirm" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/customscripts" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/os" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/certs" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/container" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/etcd" - "github.com/kubesphere/kubekey/cmd/kk/pkg/filesystem" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/kubesphere/kubekey/cmd/kk/pkg/k3s" - "github.com/kubesphere/kubekey/cmd/kk/pkg/k8e" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubesphere" - "github.com/kubesphere/kubekey/cmd/kk/pkg/loadbalancer" - "github.com/kubesphere/kubekey/cmd/kk/pkg/plugins" - "github.com/kubesphere/kubekey/cmd/kk/pkg/plugins/dns" - "github.com/kubesphere/kubekey/cmd/kk/pkg/plugins/network" - "github.com/kubesphere/kubekey/cmd/kk/pkg/plugins/storage" + kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/addons" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/artifact" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/binaries" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/confirm" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/customscripts" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/os" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/certs" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/container" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/etcd" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/filesystem" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/k3s" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/k8e" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubesphere" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/loadbalancer" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins/dns" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins/network" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins/storage" ) func NewCreateClusterPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/pipelines/delete_cluster.go b/cmd/kk/pkg/pipelines/delete_cluster.go index 8fef230e..a5c415ac 100644 --- a/cmd/kk/pkg/pipelines/delete_cluster.go +++ b/cmd/kk/pkg/pipelines/delete_cluster.go @@ -17,18 +17,18 @@ package pipelines import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/confirm" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/os" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/certs" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/container" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/k3s" - "github.com/kubesphere/kubekey/cmd/kk/pkg/k8e" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes" - "github.com/kubesphere/kubekey/cmd/kk/pkg/loadbalancer" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/confirm" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/os" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/certs" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/container" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/k3s" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/k8e" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/loadbalancer" ) func NewDeleteClusterPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/pipelines/delete_node.go b/cmd/kk/pkg/pipelines/delete_node.go index 02be9b8f..bd057d55 100644 --- a/cmd/kk/pkg/pipelines/delete_node.go +++ b/cmd/kk/pkg/pipelines/delete_node.go @@ -17,14 +17,14 @@ package pipelines import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/confirm" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/os" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes" - "github.com/kubesphere/kubekey/cmd/kk/pkg/loadbalancer" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/confirm" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/os" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/loadbalancer" ) func DeleteNodePipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/pipelines/init_dependencies.go b/cmd/kk/pkg/pipelines/init_dependencies.go index bdc9a2aa..0f8c6871 100644 --- a/cmd/kk/pkg/pipelines/init_dependencies.go +++ b/cmd/kk/pkg/pipelines/init_dependencies.go @@ -17,14 +17,14 @@ package pipelines import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/artifact" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/customscripts" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/os" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/filesystem" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/artifact" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/customscripts" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/os" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/filesystem" ) func NewInitDependenciesPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/pipelines/init_registry.go b/cmd/kk/pkg/pipelines/init_registry.go index 87bd10c0..cba3b744 100644 --- a/cmd/kk/pkg/pipelines/init_registry.go +++ b/cmd/kk/pkg/pipelines/init_registry.go @@ -19,15 +19,15 @@ package pipelines import ( "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/artifact" - "github.com/kubesphere/kubekey/cmd/kk/pkg/binaries" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/os" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/registry" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/filesystem" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/artifact" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/binaries" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/os" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/registry" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/filesystem" ) func NewInitRegistryPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/pipelines/migrate_container.go b/cmd/kk/pkg/pipelines/migrate_container.go index d7181608..0378e5ad 100644 --- a/cmd/kk/pkg/pipelines/migrate_container.go +++ b/cmd/kk/pkg/pipelines/migrate_container.go @@ -19,13 +19,13 @@ package pipelines import ( "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/binaries" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/confirm" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/container" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/binaries" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/confirm" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/container" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" ) func MigrateCriPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/pipelines/renew_certs.go b/cmd/kk/pkg/pipelines/renew_certs.go index 5f76dd95..f2753eba 100644 --- a/cmd/kk/pkg/pipelines/renew_certs.go +++ b/cmd/kk/pkg/pipelines/renew_certs.go @@ -17,11 +17,11 @@ package pipelines import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/certs" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/certs" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" ) func RenewCertsPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/pipelines/upgrade_cluster.go b/cmd/kk/pkg/pipelines/upgrade_cluster.go index 3e041f07..8aafd4f0 100644 --- a/cmd/kk/pkg/pipelines/upgrade_cluster.go +++ b/cmd/kk/pkg/pipelines/upgrade_cluster.go @@ -21,17 +21,17 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/artifact" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/confirm" - "github.com/kubesphere/kubekey/cmd/kk/pkg/bootstrap/precheck" - "github.com/kubesphere/kubekey/cmd/kk/pkg/certs" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/module" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/pipeline" - "github.com/kubesphere/kubekey/cmd/kk/pkg/filesystem" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubernetes" - "github.com/kubesphere/kubekey/cmd/kk/pkg/kubesphere" - "github.com/kubesphere/kubekey/cmd/kk/pkg/loadbalancer" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/artifact" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/confirm" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/precheck" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/certs" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/module" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/pipeline" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/filesystem" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubernetes" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/kubesphere" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/loadbalancer" ) func NewUpgradeClusterPipeline(runtime *common.KubeRuntime) error { diff --git a/cmd/kk/pkg/plugins/dns/module.go b/cmd/kk/pkg/plugins/dns/module.go index ee4a196c..2da5a88f 100644 --- a/cmd/kk/pkg/plugins/dns/module.go +++ b/cmd/kk/pkg/plugins/dns/module.go @@ -19,13 +19,13 @@ package dns import ( "path/filepath" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/kubesphere/kubekey/cmd/kk/pkg/plugins/dns/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins/dns/templates" ) type ClusterDNSModule struct { diff --git a/cmd/kk/pkg/plugins/dns/prepares.go b/cmd/kk/pkg/plugins/dns/prepares.go index b397c0f4..1b46cf55 100644 --- a/cmd/kk/pkg/plugins/dns/prepares.go +++ b/cmd/kk/pkg/plugins/dns/prepares.go @@ -19,8 +19,8 @@ package dns import ( "strings" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type CoreDNSExist struct { diff --git a/cmd/kk/pkg/plugins/dns/tasks.go b/cmd/kk/pkg/plugins/dns/tasks.go index dd928906..08b815a8 100644 --- a/cmd/kk/pkg/plugins/dns/tasks.go +++ b/cmd/kk/pkg/plugins/dns/tasks.go @@ -17,14 +17,16 @@ package dns import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/plugins/dns/templates" - "github.com/pkg/errors" "path/filepath" "strings" + + "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins/dns/templates" ) type OverrideCoreDNS struct { diff --git a/cmd/kk/pkg/plugins/kata.go b/cmd/kk/pkg/plugins/kata.go index 2b337c63..a3372d94 100644 --- a/cmd/kk/pkg/plugins/kata.go +++ b/cmd/kk/pkg/plugins/kata.go @@ -14,16 +14,18 @@ package plugins import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/lithammer/dedent" - "github.com/pkg/errors" "path/filepath" "text/template" + + "github.com/lithammer/dedent" + "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" ) // Kata Containers is an open source community working to build a secure container runtime with lightweight virtual diff --git a/cmd/kk/pkg/plugins/modules.go b/cmd/kk/pkg/plugins/modules.go index fbbcfc03..ae43b7be 100644 --- a/cmd/kk/pkg/plugins/modules.go +++ b/cmd/kk/pkg/plugins/modules.go @@ -14,7 +14,7 @@ package plugins import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" ) type DeployPluginsModule struct { diff --git a/cmd/kk/pkg/plugins/network/modules.go b/cmd/kk/pkg/plugins/network/modules.go index 555cddbe..68f5daeb 100644 --- a/cmd/kk/pkg/plugins/network/modules.go +++ b/cmd/kk/pkg/plugins/network/modules.go @@ -19,15 +19,16 @@ package network import ( "path/filepath" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/kubesphere/kubekey/cmd/kk/pkg/plugins/network/templates" versionutil "k8s.io/apimachinery/pkg/util/version" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins/network/templates" ) type DeployNetworkPluginModule struct { diff --git a/cmd/kk/pkg/plugins/network/prepares.go b/cmd/kk/pkg/plugins/network/prepares.go index cae05272..eff35115 100644 --- a/cmd/kk/pkg/plugins/network/prepares.go +++ b/cmd/kk/pkg/plugins/network/prepares.go @@ -17,9 +17,10 @@ package network import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" versionutil "k8s.io/apimachinery/pkg/util/version" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type OldK8sVersion struct { diff --git a/cmd/kk/pkg/plugins/network/tasks.go b/cmd/kk/pkg/plugins/network/tasks.go index 34aba326..69aedbfe 100644 --- a/cmd/kk/pkg/plugins/network/tasks.go +++ b/cmd/kk/pkg/plugins/network/tasks.go @@ -23,14 +23,15 @@ import ( "os" "path/filepath" - "github.com/kubesphere/kubekey/cmd/kk/apis/kubekey/v1alpha2" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/kubesphere/kubekey/cmd/kk/pkg/plugins/network/templates" "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/apis/kubekey/v1alpha2" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins/network/templates" ) //go:embed cilium-1.11.6.tgz diff --git a/cmd/kk/pkg/plugins/nfd.go b/cmd/kk/pkg/plugins/nfd.go index 4252dd17..0f53603e 100644 --- a/cmd/kk/pkg/plugins/nfd.go +++ b/cmd/kk/pkg/plugins/nfd.go @@ -14,16 +14,18 @@ package plugins import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/lithammer/dedent" - "github.com/pkg/errors" "path/filepath" "text/template" + + "github.com/lithammer/dedent" + "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" ) // NodeFeatureDiscovery detects hardware features available on each node in a Kubernetes cluster, and advertises those diff --git a/cmd/kk/pkg/plugins/storage/modules.go b/cmd/kk/pkg/plugins/storage/modules.go index 19077a5e..c46b4d09 100644 --- a/cmd/kk/pkg/plugins/storage/modules.go +++ b/cmd/kk/pkg/plugins/storage/modules.go @@ -19,13 +19,13 @@ package storage import ( "path/filepath" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/action" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/prepare" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/task" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/images" - "github.com/kubesphere/kubekey/cmd/kk/pkg/plugins/storage/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/prepare" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/task" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins/storage/templates" ) type DeployLocalVolumeModule struct { diff --git a/cmd/kk/pkg/plugins/storage/prepares.go b/cmd/kk/pkg/plugins/storage/prepares.go index f4ca5b00..7294dfad 100644 --- a/cmd/kk/pkg/plugins/storage/prepares.go +++ b/cmd/kk/pkg/plugins/storage/prepares.go @@ -17,11 +17,13 @@ package storage import ( - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/pkg/errors" "regexp" + + "github.com/pkg/errors" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" ) type CheckDefaultStorageClass struct { diff --git a/cmd/kk/pkg/plugins/storage/tasks.go b/cmd/kk/pkg/plugins/storage/tasks.go index e5e0d2b0..79da86ae 100644 --- a/cmd/kk/pkg/plugins/storage/tasks.go +++ b/cmd/kk/pkg/plugins/storage/tasks.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) type DeployLocalVolume struct { diff --git a/cmd/kk/pkg/registry/docker_registry_config.go b/cmd/kk/pkg/registry/docker_registry_config.go index f61e10d5..95c8e496 100644 --- a/cmd/kk/pkg/registry/docker_registry_config.go +++ b/cmd/kk/pkg/registry/docker_registry_config.go @@ -14,33 +14,19 @@ limitations under the License. */ -/* - Copyright 2022 The KubeSphere Authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - package registry import ( "encoding/json" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/logger" - "github.com/pkg/errors" "io/ioutil" - "k8s.io/apimachinery/pkg/runtime" "os" "path/filepath" "strings" + + "github.com/pkg/errors" + "k8s.io/apimachinery/pkg/runtime" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger" ) type DockerRegistryEntry struct { diff --git a/cmd/kk/pkg/utils/certs/certs.go b/cmd/kk/pkg/utils/certs/certs.go index 073cbcb9..e66ea57b 100644 --- a/cmd/kk/pkg/utils/certs/certs.go +++ b/cmd/kk/pkg/utils/certs/certs.go @@ -19,15 +19,17 @@ import ( "crypto/x509" "crypto/x509/pkix" "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/pkg/errors" - "github.com/sirupsen/logrus" - "k8s.io/apimachinery/pkg/util/sets" - certutil "k8s.io/client-go/util/cert" "math" "math/big" "net" "time" + + "github.com/pkg/errors" + "github.com/sirupsen/logrus" + "k8s.io/apimachinery/pkg/util/sets" + certutil "k8s.io/client-go/util/cert" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" ) const ( diff --git a/cmd/kk/pkg/utils/certs/utils.go b/cmd/kk/pkg/utils/certs/utils.go index 0edab8c7..ead7b68b 100644 --- a/cmd/kk/pkg/utils/certs/utils.go +++ b/cmd/kk/pkg/utils/certs/utils.go @@ -22,13 +22,14 @@ import ( "crypto/x509" "encoding/pem" "fmt" - "github.com/pkg/errors" - certutil "k8s.io/client-go/util/cert" - "k8s.io/client-go/util/keyutil" "os" "path/filepath" "sync" "time" + + "github.com/pkg/errors" + certutil "k8s.io/client-go/util/cert" + "k8s.io/client-go/util/keyutil" ) // CertOrKeyExist returns a boolean whether the cert or the key exists diff --git a/cmd/kk/pkg/utils/client.go b/cmd/kk/pkg/utils/client.go index d1fefaef..98f22cfa 100644 --- a/cmd/kk/pkg/utils/client.go +++ b/cmd/kk/pkg/utils/client.go @@ -17,11 +17,12 @@ package utils import ( + "os" + "path/filepath" + "github.com/pkg/errors" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - "os" - "path/filepath" ) func NewClient(config string) (*kubernetes.Clientset, error) { diff --git a/cmd/kk/pkg/utils/containerruntime/runtime.go b/cmd/kk/pkg/utils/containerruntime/runtime.go index 06b948ce..46a0dafd 100644 --- a/cmd/kk/pkg/utils/containerruntime/runtime.go +++ b/cmd/kk/pkg/utils/containerruntime/runtime.go @@ -17,9 +17,10 @@ package containerruntime import ( - "github.com/pkg/errors" "os" "strings" + + "github.com/pkg/errors" ) const ( diff --git a/cmd/kk/pkg/utils/util.go b/cmd/kk/pkg/utils/util.go index e67f68bc..c03c3c8c 100644 --- a/cmd/kk/pkg/utils/util.go +++ b/cmd/kk/pkg/utils/util.go @@ -18,12 +18,14 @@ package utils import ( "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/common" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/connector" - "github.com/pkg/errors" - "gopkg.in/yaml.v2" "regexp" "strings" + + "github.com/pkg/errors" + "gopkg.in/yaml.v2" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/common" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector" ) func ResetTmpDir(runtime connector.Runtime) error { diff --git a/cmd/kk/pkg/version/kubernetes/version_enum.go b/cmd/kk/pkg/version/kubernetes/version_enum.go index adcaa2aa..a20034c6 100644 --- a/cmd/kk/pkg/version/kubernetes/version_enum.go +++ b/cmd/kk/pkg/version/kubernetes/version_enum.go @@ -18,9 +18,11 @@ package kubernetes import ( "fmt" - "github.com/kubesphere/kubekey/cmd/kk/pkg/files" - versionutil "k8s.io/apimachinery/pkg/util/version" "sort" + + versionutil "k8s.io/apimachinery/pkg/util/version" + + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/files" ) type Version int diff --git a/cmd/kk/pkg/version/kubesphere/ks_installer.go b/cmd/kk/pkg/version/kubesphere/ks_installer.go index c49dd0ca..e93113bc 100644 --- a/cmd/kk/pkg/version/kubesphere/ks_installer.go +++ b/cmd/kk/pkg/version/kubesphere/ks_installer.go @@ -23,8 +23,8 @@ import ( versionutil "k8s.io/apimachinery/pkg/util/version" - "github.com/kubesphere/kubekey/cmd/kk/pkg/core/util" - "github.com/kubesphere/kubekey/cmd/kk/pkg/version/kubesphere/templates" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util" + "github.com/kubesphere/kubekey/v3/cmd/kk/pkg/version/kubesphere/templates" ) type KsInstaller struct { diff --git a/controllers/alias.go b/controllers/alias.go index bbf20841..4657c3e5 100644 --- a/controllers/alias.go +++ b/controllers/alias.go @@ -27,9 +27,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" - kkclustercontroller "github.com/kubesphere/kubekey/controllers/kkcluster" - kkinstancecontroller "github.com/kubesphere/kubekey/controllers/kkinstance" - kkmachinecontroller "github.com/kubesphere/kubekey/controllers/kkmachine" + kkclustercontroller "github.com/kubesphere/kubekey/v3/controllers/kkcluster" + kkinstancecontroller "github.com/kubesphere/kubekey/v3/controllers/kkinstance" + kkmachinecontroller "github.com/kubesphere/kubekey/v3/controllers/kkmachine" ) // KKClusterReconciler reconciles a KKCluster object diff --git a/controllers/kkcluster/kkcluster_controller.go b/controllers/kkcluster/kkcluster_controller.go index 825a6840..8334c815 100644 --- a/controllers/kkcluster/kkcluster_controller.go +++ b/controllers/kkcluster/kkcluster_controller.go @@ -45,9 +45,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/scope" - "github.com/kubesphere/kubekey/util/collections" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/scope" + "github.com/kubesphere/kubekey/v3/util/collections" ) const ( diff --git a/controllers/kkcluster/kkcluster_controller_phases.go b/controllers/kkcluster/kkcluster_controller_phases.go index 525e963c..b1ffdb4b 100644 --- a/controllers/kkcluster/kkcluster_controller_phases.go +++ b/controllers/kkcluster/kkcluster_controller_phases.go @@ -30,9 +30,9 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/reconcile" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/scope" - "github.com/kubesphere/kubekey/util/collections" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/scope" + "github.com/kubesphere/kubekey/v3/util/collections" ) func (r *Reconciler) reconcilePausedCluster(ctx context.Context, clusterScope *scope.ClusterScope, paused bool) (ctrl.Result, error) { diff --git a/controllers/kkcluster/patch.go b/controllers/kkcluster/patch.go index 173e79a4..47381881 100644 --- a/controllers/kkcluster/patch.go +++ b/controllers/kkcluster/patch.go @@ -32,9 +32,9 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/scope" - "github.com/kubesphere/kubekey/util/collections" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/scope" + "github.com/kubesphere/kubekey/v3/util/collections" ) func (r *Reconciler) reconcilePatchAnnotations(ctx context.Context, clusterScope *scope.ClusterScope) (res ctrl.Result, err error) { diff --git a/controllers/kkinstance/kkinstance_controller.go b/controllers/kkinstance/kkinstance_controller.go index eb2f4920..7bfa4a73 100644 --- a/controllers/kkinstance/kkinstance_controller.go +++ b/controllers/kkinstance/kkinstance_controller.go @@ -45,16 +45,16 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/scope" - "github.com/kubesphere/kubekey/pkg/service" - "github.com/kubesphere/kubekey/pkg/service/binary" - "github.com/kubesphere/kubekey/pkg/service/bootstrap" - "github.com/kubesphere/kubekey/pkg/service/containermanager" - "github.com/kubesphere/kubekey/pkg/service/provisioning" - "github.com/kubesphere/kubekey/pkg/service/repository" - "github.com/kubesphere/kubekey/util" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/scope" + "github.com/kubesphere/kubekey/v3/pkg/service" + "github.com/kubesphere/kubekey/v3/pkg/service/binary" + "github.com/kubesphere/kubekey/v3/pkg/service/bootstrap" + "github.com/kubesphere/kubekey/v3/pkg/service/containermanager" + "github.com/kubesphere/kubekey/v3/pkg/service/provisioning" + "github.com/kubesphere/kubekey/v3/pkg/service/repository" + "github.com/kubesphere/kubekey/v3/util" ) const ( diff --git a/controllers/kkinstance/kkinstance_controller_noderef.go b/controllers/kkinstance/kkinstance_controller_noderef.go index 8bdf7848..c0cd1263 100644 --- a/controllers/kkinstance/kkinstance_controller_noderef.go +++ b/controllers/kkinstance/kkinstance_controller_noderef.go @@ -31,7 +31,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kubesphere/kubekey/pkg/scope" + "github.com/kubesphere/kubekey/v3/pkg/scope" ) var ( diff --git a/controllers/kkinstance/kkinstance_controller_phase.go b/controllers/kkinstance/kkinstance_controller_phase.go index 7c73ded9..98ab489d 100644 --- a/controllers/kkinstance/kkinstance_controller_phase.go +++ b/controllers/kkinstance/kkinstance_controller_phase.go @@ -26,10 +26,10 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/cluster-api/util/conditions" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/scope" - "github.com/kubesphere/kubekey/pkg/service" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/scope" + "github.com/kubesphere/kubekey/v3/pkg/service" ) func (r *Reconciler) phaseFactory(kkInstanceScope scope.KKInstanceScope) []func(context.Context, ssh.Interface, diff --git a/controllers/kkinstance/kkinstance_controller_upgrade.go b/controllers/kkinstance/kkinstance_controller_upgrade.go index ff6dd74b..fe1325de 100644 --- a/controllers/kkinstance/kkinstance_controller_upgrade.go +++ b/controllers/kkinstance/kkinstance_controller_upgrade.go @@ -36,8 +36,8 @@ import ( "sigs.k8s.io/cluster-api/util/conditions" ctrl "sigs.k8s.io/controller-runtime" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/scope" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/scope" ) func (r *Reconciler) reconcileInPlaceBinaryService(_ context.Context, instanceScope *scope.InstanceScope, kkInstanceScope scope.KKInstanceScope) (ctrl.Result, error) { diff --git a/controllers/kkinstance/kkinstance_init_mutex.go b/controllers/kkinstance/kkinstance_init_mutex.go index c3ab5aa9..5439197f 100644 --- a/controllers/kkinstance/kkinstance_init_mutex.go +++ b/controllers/kkinstance/kkinstance_init_mutex.go @@ -30,7 +30,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" ) const semaphoreInformationKey = "lock-information" diff --git a/controllers/kkinstance/scale.go b/controllers/kkinstance/scale.go index cfe4d8c3..971ca8ca 100644 --- a/controllers/kkinstance/scale.go +++ b/controllers/kkinstance/scale.go @@ -28,7 +28,7 @@ import ( capicollections "sigs.k8s.io/cluster-api/util/collections" ctrl "sigs.k8s.io/controller-runtime" - "github.com/kubesphere/kubekey/pkg/scope" + "github.com/kubesphere/kubekey/v3/pkg/scope" ) func (r *Reconciler) inPlaceUpgradeControlPlane(ctx context.Context, instanceScope *scope.InstanceScope) (_ ctrl.Result, retErr error) { diff --git a/controllers/kkmachine/helpers.go b/controllers/kkmachine/helpers.go index a8f6b687..9d6cb29a 100644 --- a/controllers/kkmachine/helpers.go +++ b/controllers/kkmachine/helpers.go @@ -31,8 +31,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/scope" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/scope" ) func (r *Reconciler) createInstance(ctx context.Context, machineScope *scope.MachineScope, diff --git a/controllers/kkmachine/kkmachine_controller.go b/controllers/kkmachine/kkmachine_controller.go index e2bbbd92..8ed3f89c 100644 --- a/controllers/kkmachine/kkmachine_controller.go +++ b/controllers/kkmachine/kkmachine_controller.go @@ -43,10 +43,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/source" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg" - "github.com/kubesphere/kubekey/pkg/scope" - "github.com/kubesphere/kubekey/util" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg" + "github.com/kubesphere/kubekey/v3/pkg/scope" + "github.com/kubesphere/kubekey/v3/util" ) var ( diff --git a/controlplane/k3s/api/v1beta1/k3scontrolplane_types.go b/controlplane/k3s/api/v1beta1/k3scontrolplane_types.go index a78fcb10..264fc73e 100644 --- a/controlplane/k3s/api/v1beta1/k3scontrolplane_types.go +++ b/controlplane/k3s/api/v1beta1/k3scontrolplane_types.go @@ -23,7 +23,7 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/cluster-api/errors" - infrabootstrapv1 "github.com/kubesphere/kubekey/bootstrap/k3s/api/v1beta1" + infrabootstrapv1 "github.com/kubesphere/kubekey/v3/bootstrap/k3s/api/v1beta1" ) // RolloutStrategyType defines the rollout strategies for a K3sControlPlane. diff --git a/controlplane/k3s/api/v1beta1/k3scontrolplane_webhook.go b/controlplane/k3s/api/v1beta1/k3scontrolplane_webhook.go index acab1cc2..f3e0ad1a 100644 --- a/controlplane/k3s/api/v1beta1/k3scontrolplane_webhook.go +++ b/controlplane/k3s/api/v1beta1/k3scontrolplane_webhook.go @@ -33,7 +33,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" - infrabootstrapv1 "github.com/kubesphere/kubekey/bootstrap/k3s/api/v1beta1" + infrabootstrapv1 "github.com/kubesphere/kubekey/v3/bootstrap/k3s/api/v1beta1" ) func (in *K3sControlPlane) SetupWebhookWithManager(mgr ctrl.Manager) error { diff --git a/controlplane/k3s/api/v1beta1/k3scontrolplanetemplate_types.go b/controlplane/k3s/api/v1beta1/k3scontrolplanetemplate_types.go index 000d76ad..795b8495 100644 --- a/controlplane/k3s/api/v1beta1/k3scontrolplanetemplate_types.go +++ b/controlplane/k3s/api/v1beta1/k3scontrolplanetemplate_types.go @@ -19,7 +19,7 @@ package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - infrabootstrapv1 "github.com/kubesphere/kubekey/bootstrap/k3s/api/v1beta1" + infrabootstrapv1 "github.com/kubesphere/kubekey/v3/bootstrap/k3s/api/v1beta1" ) // K3sControlPlaneTemplateSpec defines the desired state of K3sControlPlaneTemplate diff --git a/controlplane/k3s/api/v1beta1/k3scontrolplanetemplate_webhook.go b/controlplane/k3s/api/v1beta1/k3scontrolplanetemplate_webhook.go index f125304f..c52813b3 100644 --- a/controlplane/k3s/api/v1beta1/k3scontrolplanetemplate_webhook.go +++ b/controlplane/k3s/api/v1beta1/k3scontrolplanetemplate_webhook.go @@ -27,7 +27,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" - infrabootstrapv1 "github.com/kubesphere/kubekey/bootstrap/k3s/api/v1beta1" + infrabootstrapv1 "github.com/kubesphere/kubekey/v3/bootstrap/k3s/api/v1beta1" ) const k3sControlPlaneTemplateImmutableMsg = "K3sControlPlaneTemplate spec.template.spec field is immutable. Please create new resource instead." diff --git a/controlplane/k3s/controllers/helpers.go b/controlplane/k3s/controllers/helpers.go index 1b1ef522..3a5b924f 100644 --- a/controlplane/k3s/controllers/helpers.go +++ b/controlplane/k3s/controllers/helpers.go @@ -38,11 +38,11 @@ import ( "sigs.k8s.io/cluster-api/util/patch" ctrl "sigs.k8s.io/controller-runtime" - infrabootstrapv1 "github.com/kubesphere/kubekey/bootstrap/k3s/api/v1beta1" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" - k3sCluster "github.com/kubesphere/kubekey/controlplane/k3s/pkg/cluster" - "github.com/kubesphere/kubekey/controlplane/k3s/pkg/kubeconfig" - "github.com/kubesphere/kubekey/util/secret" + infrabootstrapv1 "github.com/kubesphere/kubekey/v3/bootstrap/k3s/api/v1beta1" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" + k3sCluster "github.com/kubesphere/kubekey/v3/controlplane/k3s/pkg/cluster" + "github.com/kubesphere/kubekey/v3/controlplane/k3s/pkg/kubeconfig" + "github.com/kubesphere/kubekey/v3/util/secret" ) func (r *K3sControlPlaneReconciler) reconcileKubeconfig(ctx context.Context, cluster *clusterv1.Cluster, kcp *infracontrolplanev1.K3sControlPlane) (ctrl.Result, error) { diff --git a/controlplane/k3s/controllers/k3scontrolplane_controller.go b/controlplane/k3s/controllers/k3scontrolplane_controller.go index 85dd5409..27500865 100644 --- a/controlplane/k3s/controllers/k3scontrolplane_controller.go +++ b/controlplane/k3s/controllers/k3scontrolplane_controller.go @@ -47,10 +47,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/source" - infrabootstrapv1 "github.com/kubesphere/kubekey/bootstrap/k3s/api/v1beta1" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" - k3sCluster "github.com/kubesphere/kubekey/controlplane/k3s/pkg/cluster" - "github.com/kubesphere/kubekey/util/secret" + infrabootstrapv1 "github.com/kubesphere/kubekey/v3/bootstrap/k3s/api/v1beta1" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" + k3sCluster "github.com/kubesphere/kubekey/v3/controlplane/k3s/pkg/cluster" + "github.com/kubesphere/kubekey/v3/util/secret" ) // K3sControlPlaneReconciler reconciles a K3sControlPlane object diff --git a/controlplane/k3s/controllers/scale.go b/controlplane/k3s/controllers/scale.go index 54ca3c59..02dbb2e4 100644 --- a/controlplane/k3s/controllers/scale.go +++ b/controlplane/k3s/controllers/scale.go @@ -29,8 +29,8 @@ import ( "sigs.k8s.io/cluster-api/util/conditions" ctrl "sigs.k8s.io/controller-runtime" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" - k3sCluster "github.com/kubesphere/kubekey/controlplane/k3s/pkg/cluster" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" + k3sCluster "github.com/kubesphere/kubekey/v3/controlplane/k3s/pkg/cluster" ) func (r *K3sControlPlaneReconciler) initializeControlPlane(ctx context.Context, cluster *clusterv1.Cluster, kcp *infracontrolplanev1.K3sControlPlane, controlPlane *k3sCluster.ControlPlane) (ctrl.Result, error) { diff --git a/controlplane/k3s/controllers/status.go b/controlplane/k3s/controllers/status.go index e644a20d..b15b94f4 100644 --- a/controlplane/k3s/controllers/status.go +++ b/controlplane/k3s/controllers/status.go @@ -26,8 +26,8 @@ import ( "sigs.k8s.io/cluster-api/util/conditions" ctrl "sigs.k8s.io/controller-runtime" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" - k3sCluster "github.com/kubesphere/kubekey/controlplane/k3s/pkg/cluster" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" + k3sCluster "github.com/kubesphere/kubekey/v3/controlplane/k3s/pkg/cluster" ) // updateStatus is called after every reconcilitation loop in a defer statement to always make sure we have the diff --git a/controlplane/k3s/controllers/upgrade.go b/controlplane/k3s/controllers/upgrade.go index a0ee9507..d520119d 100644 --- a/controlplane/k3s/controllers/upgrade.go +++ b/controlplane/k3s/controllers/upgrade.go @@ -24,8 +24,8 @@ import ( "sigs.k8s.io/cluster-api/util/collections" ctrl "sigs.k8s.io/controller-runtime" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" - k3sCluster "github.com/kubesphere/kubekey/controlplane/k3s/pkg/cluster" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" + k3sCluster "github.com/kubesphere/kubekey/v3/controlplane/k3s/pkg/cluster" ) func (r *K3sControlPlaneReconciler) upgradeControlPlane( diff --git a/controlplane/k3s/main.go b/controlplane/k3s/main.go index 546ae2d0..6afe3698 100644 --- a/controlplane/k3s/main.go +++ b/controlplane/k3s/main.go @@ -41,9 +41,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/healthz" - infrabootstrapv1 "github.com/kubesphere/kubekey/bootstrap/k3s/api/v1beta1" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" - "github.com/kubesphere/kubekey/controlplane/k3s/controllers" + infrabootstrapv1 "github.com/kubesphere/kubekey/v3/bootstrap/k3s/api/v1beta1" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" + "github.com/kubesphere/kubekey/v3/controlplane/k3s/controllers" //+kubebuilder:scaffold:imports ) diff --git a/controlplane/k3s/pkg/cluster/cluster_labels.go b/controlplane/k3s/pkg/cluster/cluster_labels.go index b92b9a09..2a2bfc39 100644 --- a/controlplane/k3s/pkg/cluster/cluster_labels.go +++ b/controlplane/k3s/pkg/cluster/cluster_labels.go @@ -19,7 +19,7 @@ package cluster import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" ) // ControlPlaneMachineLabelsForCluster returns a set of labels to add to a control plane machine for this specific cluster. diff --git a/controlplane/k3s/pkg/cluster/control_plane.go b/controlplane/k3s/pkg/cluster/control_plane.go index f7a592cf..33161b23 100644 --- a/controlplane/k3s/pkg/cluster/control_plane.go +++ b/controlplane/k3s/pkg/cluster/control_plane.go @@ -36,8 +36,8 @@ import ( "sigs.k8s.io/cluster-api/util/patch" "sigs.k8s.io/controller-runtime/pkg/client" - infrabootstrapv1 "github.com/kubesphere/kubekey/bootstrap/k3s/api/v1beta1" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" + infrabootstrapv1 "github.com/kubesphere/kubekey/v3/bootstrap/k3s/api/v1beta1" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" ) // Log is the global logger for the internal package. diff --git a/controlplane/k3s/pkg/cluster/filters.go b/controlplane/k3s/pkg/cluster/filters.go index ca55457f..bd139893 100644 --- a/controlplane/k3s/pkg/cluster/filters.go +++ b/controlplane/k3s/pkg/cluster/filters.go @@ -25,8 +25,8 @@ import ( "sigs.k8s.io/cluster-api/util/collections" "sigs.k8s.io/controller-runtime/pkg/client" - infrabootstrapv1 "github.com/kubesphere/kubekey/bootstrap/k3s/api/v1beta1" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" + infrabootstrapv1 "github.com/kubesphere/kubekey/v3/bootstrap/k3s/api/v1beta1" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" ) // MatchesMachineSpec returns a filter to find all machines that matches with KCP config and do not require any rollout. diff --git a/controlplane/k3s/pkg/cluster/workload_cluster_conditions.go b/controlplane/k3s/pkg/cluster/workload_cluster_conditions.go index 4d56d7c3..30c3146e 100644 --- a/controlplane/k3s/pkg/cluster/workload_cluster_conditions.go +++ b/controlplane/k3s/pkg/cluster/workload_cluster_conditions.go @@ -32,7 +32,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" ) // UpdateEtcdConditions is responsible for updating machine conditions reflecting the status of all the etcd members. diff --git a/controlplane/k3s/pkg/kubeconfig/kubeconfig.go b/controlplane/k3s/pkg/kubeconfig/kubeconfig.go index 9a8287bb..023a9470 100644 --- a/controlplane/k3s/pkg/kubeconfig/kubeconfig.go +++ b/controlplane/k3s/pkg/kubeconfig/kubeconfig.go @@ -34,7 +34,7 @@ import ( "sigs.k8s.io/cluster-api/util/certs" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kubesphere/kubekey/util/secret" + "github.com/kubesphere/kubekey/v3/util/secret" ) var ( diff --git a/go.mod b/go.mod index 99e22a5e..6e50b3b4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/kubesphere/kubekey +module github.com/kubesphere/kubekey/v3 go 1.19 diff --git a/hack/version.sh b/hack/version.sh index 159d75ec..58037048 100755 --- a/hack/version.sh +++ b/hack/version.sh @@ -89,7 +89,7 @@ version::ldflags() { local key=${1} local val=${2} ldflags+=( - "-X 'github.com/kubesphere/kubekey/version.${key}=${val}'" + "-X 'github.com/kubesphere/kubekey/v3/version.${key}=${val}'" ) } diff --git a/main.go b/main.go index f742c409..5dbe8978 100644 --- a/main.go +++ b/main.go @@ -39,8 +39,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/controller" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/controllers" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/controllers" //+kubebuilder:scaffold:imports ) diff --git a/pkg/clients/ssh/client.go b/pkg/clients/ssh/client.go index bf8a0610..323033c6 100644 --- a/pkg/clients/ssh/client.go +++ b/pkg/clients/ssh/client.go @@ -35,8 +35,8 @@ import ( "golang.org/x/crypto/ssh" "k8s.io/klog/v2/klogr" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/util/filesystem" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/util/filesystem" ) // Default values. diff --git a/pkg/clients/ssh/interface.go b/pkg/clients/ssh/interface.go index 7e21732c..0a2f4189 100644 --- a/pkg/clients/ssh/interface.go +++ b/pkg/clients/ssh/interface.go @@ -17,7 +17,7 @@ package ssh import ( - "github.com/kubesphere/kubekey/pkg/util/filesystem" + "github.com/kubesphere/kubekey/v3/pkg/util/filesystem" ) // Interface is the interface for ssh client. diff --git a/pkg/interface.go b/pkg/interface.go index af76f50c..66bf4949 100644 --- a/pkg/interface.go +++ b/pkg/interface.go @@ -23,8 +23,8 @@ import ( "github.com/go-logr/logr" capicollections "sigs.k8s.io/cluster-api/util/collections" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/rootfs" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/rootfs" ) // ScopeUsage is used to indicate which controller is using a scope. diff --git a/pkg/rootfs/interface.go b/pkg/rootfs/interface.go index 52832439..2d41fd1d 100644 --- a/pkg/rootfs/interface.go +++ b/pkg/rootfs/interface.go @@ -17,7 +17,7 @@ package rootfs import ( - "github.com/kubesphere/kubekey/pkg/util/filesystem" + "github.com/kubesphere/kubekey/v3/pkg/util/filesystem" ) // Interface is the interface for rootfs. diff --git a/pkg/rootfs/local.go b/pkg/rootfs/local.go index a955a5ca..8bc69e4d 100644 --- a/pkg/rootfs/local.go +++ b/pkg/rootfs/local.go @@ -19,7 +19,7 @@ package rootfs import ( "path/filepath" - "github.com/kubesphere/kubekey/pkg/util/filesystem" + "github.com/kubesphere/kubekey/v3/pkg/util/filesystem" ) // Local is a rootfs for local. diff --git a/pkg/scope/cluster.go b/pkg/scope/cluster.go index 4235195e..39e39cb8 100644 --- a/pkg/scope/cluster.go +++ b/pkg/scope/cluster.go @@ -31,8 +31,8 @@ import ( "sigs.k8s.io/cluster-api/util/patch" "sigs.k8s.io/controller-runtime/pkg/client" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/rootfs" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/rootfs" ) // ClusterScopeParams defines the input parameters used to create a new Scope. diff --git a/pkg/scope/instance.go b/pkg/scope/instance.go index f56cab39..776dd22a 100644 --- a/pkg/scope/instance.go +++ b/pkg/scope/instance.go @@ -30,8 +30,8 @@ import ( "sigs.k8s.io/cluster-api/util/patch" "sigs.k8s.io/controller-runtime/pkg/client" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg" ) // InstanceScopeParams defines the input parameters used to create a new InstanceScope. diff --git a/pkg/scope/kkinstance.go b/pkg/scope/kkinstance.go index 87b7c674..2fb9687b 100644 --- a/pkg/scope/kkinstance.go +++ b/pkg/scope/kkinstance.go @@ -17,8 +17,8 @@ package scope import ( - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg" ) // KKInstanceScope is a scope for global KKInstance. diff --git a/pkg/scope/lb.go b/pkg/scope/lb.go index 52ef6e1f..46b25160 100644 --- a/pkg/scope/lb.go +++ b/pkg/scope/lb.go @@ -19,8 +19,8 @@ package scope import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg" ) // LBScope is a scope for LB. diff --git a/pkg/scope/machine.go b/pkg/scope/machine.go index 0cb75ef9..f2d1aae9 100644 --- a/pkg/scope/machine.go +++ b/pkg/scope/machine.go @@ -32,7 +32,7 @@ import ( "sigs.k8s.io/cluster-api/util/patch" "sigs.k8s.io/controller-runtime/pkg/client" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" ) // MachineScopeParams defines the input parameters used to create a new MachineScope. diff --git a/pkg/scope/registry.go b/pkg/scope/registry.go index 2ee41f1d..fffcb183 100644 --- a/pkg/scope/registry.go +++ b/pkg/scope/registry.go @@ -17,7 +17,7 @@ package scope import ( - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" ) // RegistryScope is the scope for global registry. diff --git a/pkg/service/binary/interface.go b/pkg/service/binary/interface.go index 38787024..f7d0f072 100644 --- a/pkg/service/binary/interface.go +++ b/pkg/service/binary/interface.go @@ -20,11 +20,11 @@ package binary import ( "time" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/scope" - "github.com/kubesphere/kubekey/pkg/service/binary/k3s" - "github.com/kubesphere/kubekey/pkg/service/binary/kubernetes" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/scope" + "github.com/kubesphere/kubekey/v3/pkg/service/binary/k3s" + "github.com/kubesphere/kubekey/v3/pkg/service/binary/kubernetes" ) // Binary defines the interface for the binaries operations. diff --git a/pkg/service/binary/k3s/binary.go b/pkg/service/binary/k3s/binary.go index 8e818b73..ad9ee3e6 100644 --- a/pkg/service/binary/k3s/binary.go +++ b/pkg/service/binary/k3s/binary.go @@ -22,10 +22,10 @@ import ( "text/template" "time" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/service/operation" - "github.com/kubesphere/kubekey/pkg/service/operation/file" - "github.com/kubesphere/kubekey/pkg/service/util" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/service/operation" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file" + "github.com/kubesphere/kubekey/v3/pkg/service/util" ) //go:embed templates diff --git a/pkg/service/binary/k3s/service.go b/pkg/service/binary/k3s/service.go index 08d594ab..c7514900 100644 --- a/pkg/service/binary/k3s/service.go +++ b/pkg/service/binary/k3s/service.go @@ -19,10 +19,10 @@ package k3s import ( "text/template" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/scope" - "github.com/kubesphere/kubekey/pkg/service/operation" - "github.com/kubesphere/kubekey/pkg/service/operation/file" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/scope" + "github.com/kubesphere/kubekey/v3/pkg/service/operation" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file" ) // Service holds a collection of interfaces. diff --git a/pkg/service/binary/kubernetes/binary.go b/pkg/service/binary/kubernetes/binary.go index 806047ad..ec17eb1f 100644 --- a/pkg/service/binary/kubernetes/binary.go +++ b/pkg/service/binary/kubernetes/binary.go @@ -22,10 +22,10 @@ import ( "text/template" "time" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/service/operation" - "github.com/kubesphere/kubekey/pkg/service/operation/file" - "github.com/kubesphere/kubekey/pkg/service/util" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/service/operation" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file" + "github.com/kubesphere/kubekey/v3/pkg/service/util" ) //go:embed templates diff --git a/pkg/service/binary/kubernetes/service.go b/pkg/service/binary/kubernetes/service.go index 7a28d2b3..4c649a31 100644 --- a/pkg/service/binary/kubernetes/service.go +++ b/pkg/service/binary/kubernetes/service.go @@ -19,10 +19,10 @@ package kubernetes import ( "text/template" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/scope" - "github.com/kubesphere/kubekey/pkg/service/operation" - "github.com/kubesphere/kubekey/pkg/service/operation/file" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/scope" + "github.com/kubesphere/kubekey/v3/pkg/service/operation" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file" ) // Service holds a collection of interfaces. diff --git a/pkg/service/bootstrap/bootstrap.go b/pkg/service/bootstrap/bootstrap.go index 770ce78a..491e2358 100644 --- a/pkg/service/bootstrap/bootstrap.go +++ b/pkg/service/bootstrap/bootstrap.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/pkg/service/operation/directory" - "github.com/kubesphere/kubekey/pkg/service/operation/file" - "github.com/kubesphere/kubekey/pkg/util/filesystem" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/directory" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file" + "github.com/kubesphere/kubekey/v3/pkg/util/filesystem" ) //go:embed templates diff --git a/pkg/service/bootstrap/service.go b/pkg/service/bootstrap/service.go index 37ab0780..694b5dc1 100644 --- a/pkg/service/bootstrap/service.go +++ b/pkg/service/bootstrap/service.go @@ -20,12 +20,12 @@ import ( "os" "text/template" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/scope" - "github.com/kubesphere/kubekey/pkg/service/operation" - "github.com/kubesphere/kubekey/pkg/service/operation/directory" - "github.com/kubesphere/kubekey/pkg/service/operation/file" - "github.com/kubesphere/kubekey/pkg/service/operation/user" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/scope" + "github.com/kubesphere/kubekey/v3/pkg/service/operation" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/directory" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/user" ) // Service holds a collection of interfaces. diff --git a/pkg/service/containermanager/containerd.go b/pkg/service/containermanager/containerd.go index 611d62a7..ab2563b8 100644 --- a/pkg/service/containermanager/containerd.go +++ b/pkg/service/containermanager/containerd.go @@ -26,12 +26,12 @@ import ( "github.com/pkg/errors" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/scope" - "github.com/kubesphere/kubekey/pkg/service/operation" - "github.com/kubesphere/kubekey/pkg/service/operation/file" - "github.com/kubesphere/kubekey/pkg/service/util" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/scope" + "github.com/kubesphere/kubekey/v3/pkg/service/operation" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file" + "github.com/kubesphere/kubekey/v3/pkg/service/util" ) // ContainerdService is a ContainerManager service implementation for containerd. diff --git a/pkg/service/containermanager/docker.go b/pkg/service/containermanager/docker.go index 3ff81c27..04ba1f77 100644 --- a/pkg/service/containermanager/docker.go +++ b/pkg/service/containermanager/docker.go @@ -23,13 +23,13 @@ import ( "text/template" "time" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/scope" - "github.com/kubesphere/kubekey/pkg/service/operation" - "github.com/kubesphere/kubekey/pkg/service/operation/directory" - "github.com/kubesphere/kubekey/pkg/service/operation/file" - "github.com/kubesphere/kubekey/pkg/service/util" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/scope" + "github.com/kubesphere/kubekey/v3/pkg/service/operation" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/directory" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file" + "github.com/kubesphere/kubekey/v3/pkg/service/util" ) // DockerService is a ContainerManager service implementation for docker. diff --git a/pkg/service/containermanager/service.go b/pkg/service/containermanager/service.go index e61dde1c..d1ef3ba2 100644 --- a/pkg/service/containermanager/service.go +++ b/pkg/service/containermanager/service.go @@ -20,9 +20,9 @@ import ( "embed" "time" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/scope" - "github.com/kubesphere/kubekey/pkg/service/operation/file" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/scope" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file" ) //go:embed templates diff --git a/pkg/service/interface.go b/pkg/service/interface.go index bd03f724..29411d9c 100644 --- a/pkg/service/interface.go +++ b/pkg/service/interface.go @@ -20,7 +20,7 @@ package service import ( "time" - "github.com/kubesphere/kubekey/pkg/service/provisioning/commands" + "github.com/kubesphere/kubekey/v3/pkg/service/provisioning/commands" ) // Bootstrap is the interface for bootstrap provision. diff --git a/pkg/service/operation/directory/directory.go b/pkg/service/operation/directory/directory.go index 6301cc81..6e08d9ce 100644 --- a/pkg/service/operation/directory/directory.go +++ b/pkg/service/operation/directory/directory.go @@ -21,7 +21,7 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/pkg/util/filesystem" + "github.com/kubesphere/kubekey/v3/pkg/util/filesystem" ) // Make wraps the Linux command "mkdir -p -m ". diff --git a/pkg/service/operation/directory/service.go b/pkg/service/operation/directory/service.go index fc09a3f6..0e7e76c1 100644 --- a/pkg/service/operation/directory/service.go +++ b/pkg/service/operation/directory/service.go @@ -19,8 +19,8 @@ package directory import ( "os" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/util/filesystem" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/util/filesystem" ) // Service holds a collection of interfaces. diff --git a/pkg/service/operation/file/binary.go b/pkg/service/operation/file/binary.go index 1ef92acd..1ae423c4 100644 --- a/pkg/service/operation/file/binary.go +++ b/pkg/service/operation/file/binary.go @@ -30,7 +30,7 @@ import ( "github.com/hashicorp/go-getter" "github.com/pkg/errors" - "github.com/kubesphere/kubekey/pkg/service/operation/file/checksum" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file/checksum" ) // Default diff --git a/pkg/service/operation/file/checksum/http_checksum.go b/pkg/service/operation/file/checksum/http_checksum.go index c4a17714..71d4f9d3 100644 --- a/pkg/service/operation/file/checksum/http_checksum.go +++ b/pkg/service/operation/file/checksum/http_checksum.go @@ -29,7 +29,7 @@ import ( "github.com/hashicorp/go-getter" "github.com/pkg/errors" - "github.com/kubesphere/kubekey/pkg/rootfs" + "github.com/kubesphere/kubekey/v3/pkg/rootfs" ) // HTTPChecksum is a checksum that is downloaded from a URL. diff --git a/pkg/service/operation/file/checksum/internal_checksum.go b/pkg/service/operation/file/checksum/internal_checksum.go index 65c4df83..358deaeb 100644 --- a/pkg/service/operation/file/checksum/internal_checksum.go +++ b/pkg/service/operation/file/checksum/internal_checksum.go @@ -19,7 +19,7 @@ package checksum import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/version" + "github.com/kubesphere/kubekey/v3/version" ) var ( diff --git a/pkg/service/operation/file/containerd.go b/pkg/service/operation/file/containerd.go index 809a0b8f..78264fe1 100644 --- a/pkg/service/operation/file/containerd.go +++ b/pkg/service/operation/file/containerd.go @@ -20,8 +20,8 @@ import ( "fmt" "path/filepath" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/rootfs" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/rootfs" ) // Containerd info diff --git a/pkg/service/operation/file/crictl.go b/pkg/service/operation/file/crictl.go index e0bb0107..a0084a84 100644 --- a/pkg/service/operation/file/crictl.go +++ b/pkg/service/operation/file/crictl.go @@ -21,8 +21,8 @@ import ( "path/filepath" "strings" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/rootfs" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/rootfs" ) // Crictl info diff --git a/pkg/service/operation/file/docker.go b/pkg/service/operation/file/docker.go index 7048b9b0..1dd42243 100644 --- a/pkg/service/operation/file/docker.go +++ b/pkg/service/operation/file/docker.go @@ -21,10 +21,10 @@ import ( "path/filepath" "strings" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/rootfs" - "github.com/kubesphere/kubekey/pkg/service/operation/directory" - "github.com/kubesphere/kubekey/pkg/util" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/rootfs" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/directory" + "github.com/kubesphere/kubekey/v3/pkg/util" ) // Docker info diff --git a/pkg/service/operation/file/file.go b/pkg/service/operation/file/file.go index 44507e7c..39abbd0f 100644 --- a/pkg/service/operation/file/file.go +++ b/pkg/service/operation/file/file.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/rootfs" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/rootfs" ) // Type represents the type of file. diff --git a/pkg/service/operation/file/k3s.go b/pkg/service/operation/file/k3s.go index 9e81f464..0b305f45 100644 --- a/pkg/service/operation/file/k3s.go +++ b/pkg/service/operation/file/k3s.go @@ -21,8 +21,8 @@ import ( "path/filepath" "strings" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/rootfs" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/rootfs" ) // K3s info diff --git a/pkg/service/operation/file/kubeadm.go b/pkg/service/operation/file/kubeadm.go index 1882b05f..06dfb01c 100644 --- a/pkg/service/operation/file/kubeadm.go +++ b/pkg/service/operation/file/kubeadm.go @@ -21,8 +21,8 @@ import ( "path/filepath" "strings" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/rootfs" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/rootfs" ) // Kubeadm info diff --git a/pkg/service/operation/file/kubecni.go b/pkg/service/operation/file/kubecni.go index 99b520f1..3a392012 100644 --- a/pkg/service/operation/file/kubecni.go +++ b/pkg/service/operation/file/kubecni.go @@ -21,8 +21,8 @@ import ( "path/filepath" "strings" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/rootfs" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/rootfs" ) // Kubecni info diff --git a/pkg/service/operation/file/kubectl.go b/pkg/service/operation/file/kubectl.go index bd09beb9..6590ef0c 100644 --- a/pkg/service/operation/file/kubectl.go +++ b/pkg/service/operation/file/kubectl.go @@ -21,8 +21,8 @@ import ( "path/filepath" "strings" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/rootfs" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/rootfs" ) // Kubectl info diff --git a/pkg/service/operation/file/kubelet.go b/pkg/service/operation/file/kubelet.go index 177b82f7..3847dc11 100644 --- a/pkg/service/operation/file/kubelet.go +++ b/pkg/service/operation/file/kubelet.go @@ -21,8 +21,8 @@ import ( "path/filepath" "strings" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/rootfs" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/rootfs" ) // kubelet info diff --git a/pkg/service/operation/file/repositoryISO.go b/pkg/service/operation/file/repositoryISO.go index 54c7b9f0..61062851 100644 --- a/pkg/service/operation/file/repositoryISO.go +++ b/pkg/service/operation/file/repositoryISO.go @@ -21,11 +21,11 @@ import ( "path/filepath" "strings" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/rootfs" - "github.com/kubesphere/kubekey/pkg/service/operation/file/checksum" - "github.com/kubesphere/kubekey/util/osrelease" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/rootfs" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file/checksum" + "github.com/kubesphere/kubekey/v3/util/osrelease" ) // ISO info diff --git a/pkg/service/operation/file/runc.go b/pkg/service/operation/file/runc.go index 5f85ec31..4e766774 100644 --- a/pkg/service/operation/file/runc.go +++ b/pkg/service/operation/file/runc.go @@ -20,8 +20,8 @@ import ( "fmt" "path/filepath" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/rootfs" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/rootfs" ) // runc info diff --git a/pkg/service/operation/file/template.go b/pkg/service/operation/file/template.go index e49116fc..500a5ce0 100644 --- a/pkg/service/operation/file/template.go +++ b/pkg/service/operation/file/template.go @@ -21,9 +21,9 @@ import ( "path/filepath" "text/template" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/rootfs" - "github.com/kubesphere/kubekey/pkg/util/filesystem" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/rootfs" + "github.com/kubesphere/kubekey/v3/pkg/util/filesystem" ) // Data is the data that will be passed to the template. diff --git a/pkg/service/operation/interface.go b/pkg/service/operation/interface.go index 03c51a59..0edd3e47 100644 --- a/pkg/service/operation/interface.go +++ b/pkg/service/operation/interface.go @@ -21,8 +21,8 @@ import ( "net/url" "time" - "github.com/kubesphere/kubekey/pkg/service/operation/file" - "github.com/kubesphere/kubekey/pkg/service/operation/file/checksum" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file/checksum" ) // File interface defines the operations for normal file which needed to be copied to remote. diff --git a/pkg/service/operation/repository/repository_deb.go b/pkg/service/operation/repository/repository_deb.go index bd504909..a7255e15 100644 --- a/pkg/service/operation/repository/repository_deb.go +++ b/pkg/service/operation/repository/repository_deb.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/kubesphere/kubekey/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" ) // Debian is a repository manager implementation for Debian. diff --git a/pkg/service/operation/repository/repository_rpm.go b/pkg/service/operation/repository/repository_rpm.go index 6464e0a9..3af8a8d2 100644 --- a/pkg/service/operation/repository/repository_rpm.go +++ b/pkg/service/operation/repository/repository_rpm.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/kubesphere/kubekey/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" ) // RedhatPackageManager is a repository manager implementation for Redhat, Centos. diff --git a/pkg/service/operation/repository/service.go b/pkg/service/operation/repository/service.go index b31fd7a7..14d4a410 100644 --- a/pkg/service/operation/repository/service.go +++ b/pkg/service/operation/repository/service.go @@ -17,8 +17,8 @@ package repository import ( - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/util/osrelease" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/util/osrelease" ) // Service holds a collection of interfaces. diff --git a/pkg/service/operation/user/service.go b/pkg/service/operation/user/service.go index 8617d4e8..c545aaa0 100644 --- a/pkg/service/operation/user/service.go +++ b/pkg/service/operation/user/service.go @@ -17,7 +17,7 @@ package user import ( - "github.com/kubesphere/kubekey/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" ) // Service holds a collection of interfaces. diff --git a/pkg/service/provisioning/cloudinit/action.go b/pkg/service/provisioning/cloudinit/action.go index 965920f9..00bdee6d 100644 --- a/pkg/service/provisioning/cloudinit/action.go +++ b/pkg/service/provisioning/cloudinit/action.go @@ -17,8 +17,8 @@ package cloudinit import ( - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/service/provisioning/commands" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/service/provisioning/commands" ) const ( diff --git a/pkg/service/provisioning/cloudinit/adapter.go b/pkg/service/provisioning/cloudinit/adapter.go index 77166c13..2d1f9dcc 100644 --- a/pkg/service/provisioning/cloudinit/adapter.go +++ b/pkg/service/provisioning/cloudinit/adapter.go @@ -24,7 +24,7 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" ) // getActions parses the cloud config yaml into a slice of actions to run. diff --git a/pkg/service/provisioning/cloudinit/runcmd.go b/pkg/service/provisioning/cloudinit/runcmd.go index 531095f9..249d2f60 100644 --- a/pkg/service/provisioning/cloudinit/runcmd.go +++ b/pkg/service/provisioning/cloudinit/runcmd.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "github.com/kubesphere/kubekey/pkg/service/provisioning/commands" + "github.com/kubesphere/kubekey/v3/pkg/service/provisioning/commands" ) // runCmd defines parameters of a shell command that is equivalent to an action found in the cloud init rundcmd module. diff --git a/pkg/service/provisioning/cloudinit/runcmd_test.go b/pkg/service/provisioning/cloudinit/runcmd_test.go index a8588b54..c2d77400 100644 --- a/pkg/service/provisioning/cloudinit/runcmd_test.go +++ b/pkg/service/provisioning/cloudinit/runcmd_test.go @@ -21,7 +21,7 @@ import ( . "github.com/onsi/gomega" - "github.com/kubesphere/kubekey/pkg/service/provisioning/commands" + "github.com/kubesphere/kubekey/v3/pkg/service/provisioning/commands" ) func TestRunCmdUnmarshal(t *testing.T) { diff --git a/pkg/service/provisioning/cloudinit/service.go b/pkg/service/provisioning/cloudinit/service.go index c1758e2c..627c6fd8 100644 --- a/pkg/service/provisioning/cloudinit/service.go +++ b/pkg/service/provisioning/cloudinit/service.go @@ -20,8 +20,8 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/service/provisioning/commands" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/service/provisioning/commands" ) // Service holds a collection of interfaces. diff --git a/pkg/service/provisioning/cloudinit/unknown.go b/pkg/service/provisioning/cloudinit/unknown.go index df4233da..8a3b5179 100644 --- a/pkg/service/provisioning/cloudinit/unknown.go +++ b/pkg/service/provisioning/cloudinit/unknown.go @@ -21,7 +21,7 @@ import ( "github.com/pkg/errors" - "github.com/kubesphere/kubekey/pkg/service/provisioning/commands" + "github.com/kubesphere/kubekey/v3/pkg/service/provisioning/commands" ) type unknown struct { diff --git a/pkg/service/provisioning/cloudinit/writefiles.go b/pkg/service/provisioning/cloudinit/writefiles.go index 67c8f263..6cd1bd8c 100644 --- a/pkg/service/provisioning/cloudinit/writefiles.go +++ b/pkg/service/provisioning/cloudinit/writefiles.go @@ -29,11 +29,11 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/service/operation" - "github.com/kubesphere/kubekey/pkg/service/operation/directory" - "github.com/kubesphere/kubekey/pkg/service/provisioning/commands" - "github.com/kubesphere/kubekey/pkg/util/filesystem" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/service/operation" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/directory" + "github.com/kubesphere/kubekey/v3/pkg/service/provisioning/commands" + "github.com/kubesphere/kubekey/v3/pkg/util/filesystem" ) const ( diff --git a/pkg/service/provisioning/cloudinit/writefiles_test.go b/pkg/service/provisioning/cloudinit/writefiles_test.go index 9dadca24..b378922e 100644 --- a/pkg/service/provisioning/cloudinit/writefiles_test.go +++ b/pkg/service/provisioning/cloudinit/writefiles_test.go @@ -23,7 +23,7 @@ import ( . "github.com/onsi/gomega" - "github.com/kubesphere/kubekey/pkg/service/provisioning/commands" + "github.com/kubesphere/kubekey/v3/pkg/service/provisioning/commands" ) func TestWriteFiles(t *testing.T) { diff --git a/pkg/service/provisioning/service.go b/pkg/service/provisioning/service.go index 4a444504..2824ae9b 100644 --- a/pkg/service/provisioning/service.go +++ b/pkg/service/provisioning/service.go @@ -20,9 +20,9 @@ package provisioning import ( bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/service/provisioning/cloudinit" - "github.com/kubesphere/kubekey/pkg/service/provisioning/commands" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/service/provisioning/cloudinit" + "github.com/kubesphere/kubekey/v3/pkg/service/provisioning/commands" ) // Service holds a collection of interfaces. diff --git a/pkg/service/repository/repository.go b/pkg/service/repository/repository.go index 8b357ec3..863dd479 100644 --- a/pkg/service/repository/repository.go +++ b/pkg/service/repository/repository.go @@ -25,12 +25,12 @@ import ( "github.com/pkg/errors" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/service/operation/file" - "github.com/kubesphere/kubekey/pkg/service/operation/repository" - "github.com/kubesphere/kubekey/pkg/service/util" - "github.com/kubesphere/kubekey/pkg/util/filesystem" - "github.com/kubesphere/kubekey/util/osrelease" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/repository" + "github.com/kubesphere/kubekey/v3/pkg/service/util" + "github.com/kubesphere/kubekey/v3/pkg/util/filesystem" + "github.com/kubesphere/kubekey/v3/util/osrelease" ) // Check checks the OS release info. diff --git a/pkg/service/repository/service.go b/pkg/service/repository/service.go index 71ce1ac7..8cd5f42d 100644 --- a/pkg/service/repository/service.go +++ b/pkg/service/repository/service.go @@ -19,13 +19,13 @@ package repository import ( "os" - "github.com/kubesphere/kubekey/pkg/clients/ssh" - "github.com/kubesphere/kubekey/pkg/scope" - "github.com/kubesphere/kubekey/pkg/service/operation" - "github.com/kubesphere/kubekey/pkg/service/operation/directory" - "github.com/kubesphere/kubekey/pkg/service/operation/file" - "github.com/kubesphere/kubekey/pkg/service/operation/repository" - "github.com/kubesphere/kubekey/util/osrelease" + "github.com/kubesphere/kubekey/v3/pkg/clients/ssh" + "github.com/kubesphere/kubekey/v3/pkg/scope" + "github.com/kubesphere/kubekey/v3/pkg/service/operation" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/directory" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/repository" + "github.com/kubesphere/kubekey/v3/util/osrelease" ) // Service holds a collection of interfaces. diff --git a/pkg/service/util/downloader.go b/pkg/service/util/downloader.go index 9448f83d..145d38fa 100644 --- a/pkg/service/util/downloader.go +++ b/pkg/service/util/downloader.go @@ -19,9 +19,9 @@ package util import ( "time" - "github.com/kubesphere/kubekey/pkg/scope" - "github.com/kubesphere/kubekey/pkg/service/operation" - "github.com/kubesphere/kubekey/pkg/service/operation/file/checksum" + "github.com/kubesphere/kubekey/v3/pkg/scope" + "github.com/kubesphere/kubekey/v3/pkg/service/operation" + "github.com/kubesphere/kubekey/v3/pkg/service/operation/file/checksum" ) // DownloadAndCopy downloads and copies files to the remote instance. diff --git a/pkg/util/filesystem/fs.go b/pkg/util/filesystem/fs.go index b24893c0..eac8adba 100644 --- a/pkg/util/filesystem/fs.go +++ b/pkg/util/filesystem/fs.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/kubesphere/kubekey/pkg/util/hash" + "github.com/kubesphere/kubekey/v3/pkg/util/hash" ) // FileSystem is a filesystem implementation diff --git a/test/e2e/framework/bootstrap/kind_provider.go b/test/e2e/framework/bootstrap/kind_provider.go index fa93ab30..5f4551aa 100644 --- a/test/e2e/framework/bootstrap/kind_provider.go +++ b/test/e2e/framework/bootstrap/kind_provider.go @@ -29,7 +29,7 @@ import ( "sigs.k8s.io/kind/pkg/cmd" "sigs.k8s.io/kind/pkg/exec" - "github.com/kubesphere/kubekey/test/e2e/framework/internal/log" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/internal/log" ) const ( diff --git a/test/e2e/framework/bootstrap/kind_util.go b/test/e2e/framework/bootstrap/kind_util.go index b4a3163c..1e5efabf 100644 --- a/test/e2e/framework/bootstrap/kind_util.go +++ b/test/e2e/framework/bootstrap/kind_util.go @@ -29,8 +29,8 @@ import ( kindnodes "sigs.k8s.io/kind/pkg/cluster/nodes" kindnodesutils "sigs.k8s.io/kind/pkg/cluster/nodeutils" - "github.com/kubesphere/kubekey/test/e2e/framework/clusterctl" - "github.com/kubesphere/kubekey/test/e2e/framework/internal/log" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/clusterctl" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/internal/log" ) // CreateKindBootstrapClusterAndLoadImagesInput is the input for CreateKindBootstrapClusterAndLoadImages. diff --git a/test/e2e/framework/cluster_helpers.go b/test/e2e/framework/cluster_helpers.go index 7bd4c38e..54c9a3bb 100644 --- a/test/e2e/framework/cluster_helpers.go +++ b/test/e2e/framework/cluster_helpers.go @@ -29,7 +29,7 @@ import ( "sigs.k8s.io/cluster-api/util/patch" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kubesphere/kubekey/test/e2e/framework/internal/log" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/internal/log" ) // CreateClusterInput is the input for CreateCluster. diff --git a/test/e2e/framework/cluster_proxy.go b/test/e2e/framework/cluster_proxy.go index e30a94da..9759c6da 100644 --- a/test/e2e/framework/cluster_proxy.go +++ b/test/e2e/framework/cluster_proxy.go @@ -41,7 +41,7 @@ import ( "sigs.k8s.io/cluster-api/test/infrastructure/container" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kubesphere/kubekey/test/e2e/framework/internal/log" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/internal/log" ) const ( diff --git a/test/e2e/framework/cluster_topology_helpers.go b/test/e2e/framework/cluster_topology_helpers.go index e61b9391..95691258 100644 --- a/test/e2e/framework/cluster_topology_helpers.go +++ b/test/e2e/framework/cluster_topology_helpers.go @@ -28,8 +28,8 @@ import ( "sigs.k8s.io/cluster-api/util/patch" "sigs.k8s.io/controller-runtime/pkg/client" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" - "github.com/kubesphere/kubekey/test/e2e/framework/internal/log" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/internal/log" ) // GetClusterClassByNameInput is the input for GetClusterClassByName. diff --git a/test/e2e/framework/clusterctl/client.go b/test/e2e/framework/clusterctl/client.go index e5250053..ab8b8bae 100644 --- a/test/e2e/framework/clusterctl/client.go +++ b/test/e2e/framework/clusterctl/client.go @@ -30,8 +30,8 @@ import ( clusterctlclient "sigs.k8s.io/cluster-api/cmd/clusterctl/client" clusterctllog "sigs.k8s.io/cluster-api/cmd/clusterctl/log" - "github.com/kubesphere/kubekey/test/e2e/framework/clusterctl/logger" - "github.com/kubesphere/kubekey/test/e2e/framework/internal/log" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/clusterctl/logger" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/internal/log" ) // Provide E2E friendly wrappers for the clusterctl client library. diff --git a/test/e2e/framework/clusterctl/clusterctl_helpers.go b/test/e2e/framework/clusterctl/clusterctl_helpers.go index fa755219..36d01586 100644 --- a/test/e2e/framework/clusterctl/clusterctl_helpers.go +++ b/test/e2e/framework/clusterctl/clusterctl_helpers.go @@ -27,9 +27,9 @@ import ( "sigs.k8s.io/cluster-api/cmd/clusterctl/client/config" expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" - "github.com/kubesphere/kubekey/test/e2e/framework" - "github.com/kubesphere/kubekey/test/e2e/framework/internal/log" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" + "github.com/kubesphere/kubekey/v3/test/e2e/framework" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/internal/log" ) // InitManagementClusterAndWatchControllerLogsInput is the input type for InitManagementClusterAndWatchControllerLogs. diff --git a/test/e2e/framework/controlplane_helpers.go b/test/e2e/framework/controlplane_helpers.go index 99483054..03b3e0b6 100644 --- a/test/e2e/framework/controlplane_helpers.go +++ b/test/e2e/framework/controlplane_helpers.go @@ -33,9 +33,9 @@ import ( "sigs.k8s.io/cluster-api/util/patch" "sigs.k8s.io/controller-runtime/pkg/client" - infrabootstrapv1 "github.com/kubesphere/kubekey/bootstrap/k3s/api/v1beta1" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" - "github.com/kubesphere/kubekey/test/e2e/framework/internal/log" + infrabootstrapv1 "github.com/kubesphere/kubekey/v3/bootstrap/k3s/api/v1beta1" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/internal/log" ) // CreateK3sControlPlaneInput is the input for CreateK3sControlPlane. diff --git a/test/e2e/framework/convenience.go b/test/e2e/framework/convenience.go index 0c8b3980..d0f29924 100644 --- a/test/e2e/framework/convenience.go +++ b/test/e2e/framework/convenience.go @@ -32,8 +32,8 @@ import ( expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1" runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1" - infrabootstrapv1 "github.com/kubesphere/kubekey/bootstrap/k3s/api/v1beta1" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" + infrabootstrapv1 "github.com/kubesphere/kubekey/v3/bootstrap/k3s/api/v1beta1" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" ) // TryAddDefaultSchemes tries to add the following schemes: diff --git a/test/e2e/framework/deployment_helpers.go b/test/e2e/framework/deployment_helpers.go index 9df0a211..839dab5b 100644 --- a/test/e2e/framework/deployment_helpers.go +++ b/test/e2e/framework/deployment_helpers.go @@ -44,8 +44,8 @@ import ( . "sigs.k8s.io/cluster-api/test/framework/ginkgoextensions" "sigs.k8s.io/controller-runtime/pkg/client" - infracontrolplanev1 "github.com/kubesphere/kubekey/controlplane/k3s/api/v1beta1" - "github.com/kubesphere/kubekey/test/e2e/framework/internal/log" + infracontrolplanev1 "github.com/kubesphere/kubekey/v3/controlplane/k3s/api/v1beta1" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/internal/log" ) const ( diff --git a/test/e2e/framework/machine_helpers.go b/test/e2e/framework/machine_helpers.go index 02728e57..604a064c 100644 --- a/test/e2e/framework/machine_helpers.go +++ b/test/e2e/framework/machine_helpers.go @@ -30,7 +30,7 @@ import ( "sigs.k8s.io/cluster-api/util/patch" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kubesphere/kubekey/test/e2e/framework/internal/log" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/internal/log" ) // GetMachinesByMachineDeploymentsInput is the input for GetMachinesByMachineDeployments. diff --git a/test/e2e/framework/machinedeployment_helpers.go b/test/e2e/framework/machinedeployment_helpers.go index 4d0f4fa2..9d842a4a 100644 --- a/test/e2e/framework/machinedeployment_helpers.go +++ b/test/e2e/framework/machinedeployment_helpers.go @@ -33,7 +33,7 @@ import ( "sigs.k8s.io/cluster-api/util/patch" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kubesphere/kubekey/test/e2e/framework/internal/log" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/internal/log" ) // CreateMachineDeploymentInput is the input for CreateMachineDeployment. diff --git a/test/e2e/framework/machinepool_helpers.go b/test/e2e/framework/machinepool_helpers.go index dd26f4e1..6b635e61 100644 --- a/test/e2e/framework/machinepool_helpers.go +++ b/test/e2e/framework/machinepool_helpers.go @@ -33,7 +33,7 @@ import ( "sigs.k8s.io/cluster-api/util/patch" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kubesphere/kubekey/test/e2e/framework/internal/log" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/internal/log" ) // GetMachinePoolsByClusterInput is the input for GetMachinePoolsByCluster. diff --git a/test/e2e/framework/namespace_helpers.go b/test/e2e/framework/namespace_helpers.go index db7d9ec6..e8e388b4 100644 --- a/test/e2e/framework/namespace_helpers.go +++ b/test/e2e/framework/namespace_helpers.go @@ -36,7 +36,7 @@ import ( "sigs.k8s.io/cluster-api/util" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kubesphere/kubekey/test/e2e/framework/internal/log" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/internal/log" ) // CreateNamespaceInput is the input type for CreateNamespace. diff --git a/test/e2e/suites/k3s/common.go b/test/e2e/suites/k3s/common.go index 19fcfa46..1c4a2982 100644 --- a/test/e2e/suites/k3s/common.go +++ b/test/e2e/suites/k3s/common.go @@ -27,7 +27,7 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/cluster-api/util" - "github.com/kubesphere/kubekey/test/e2e/framework" + "github.com/kubesphere/kubekey/v3/test/e2e/framework" ) // Test suite constants for e2e config variables. diff --git a/test/e2e/suites/k3s/e2e_k3s_suite_test.go b/test/e2e/suites/k3s/e2e_k3s_suite_test.go index e0fab4b7..901bf3db 100644 --- a/test/e2e/suites/k3s/e2e_k3s_suite_test.go +++ b/test/e2e/suites/k3s/e2e_k3s_suite_test.go @@ -33,9 +33,9 @@ import ( "sigs.k8s.io/cluster-api/test/framework/ginkgoextensions" ctrl "sigs.k8s.io/controller-runtime" - "github.com/kubesphere/kubekey/test/e2e/framework" - "github.com/kubesphere/kubekey/test/e2e/framework/bootstrap" - "github.com/kubesphere/kubekey/test/e2e/framework/clusterctl" + "github.com/kubesphere/kubekey/v3/test/e2e/framework" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/bootstrap" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/clusterctl" ) // Test suite flags. diff --git a/test/e2e/suites/k3s/quick_start.go b/test/e2e/suites/k3s/quick_start.go index 89deb8ea..d6ad8f9f 100644 --- a/test/e2e/suites/k3s/quick_start.go +++ b/test/e2e/suites/k3s/quick_start.go @@ -28,8 +28,8 @@ import ( "k8s.io/utils/pointer" "sigs.k8s.io/cluster-api/util" - "github.com/kubesphere/kubekey/test/e2e/framework" - "github.com/kubesphere/kubekey/test/e2e/framework/clusterctl" + "github.com/kubesphere/kubekey/v3/test/e2e/framework" + "github.com/kubesphere/kubekey/v3/test/e2e/framework/clusterctl" ) // QuickStartSpecInput is the input for QuickStartSpec. diff --git a/util/collections/helpers.go b/util/collections/helpers.go index a5a18126..a79f7284 100644 --- a/util/collections/helpers.go +++ b/util/collections/helpers.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/controller-runtime/pkg/client" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" ) // GetFilteredKKInstancesForKKCluster returns a list of kkInstances that can be filtered or not. diff --git a/util/collections/kkinstance_collection.go b/util/collections/kkinstance_collection.go index 62d94137..51aa662f 100644 --- a/util/collections/kkinstance_collection.go +++ b/util/collections/kkinstance_collection.go @@ -21,7 +21,7 @@ import ( "sigs.k8s.io/cluster-api/util/conditions" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" ) // KKInstances is a set of KKInstances. diff --git a/util/collections/kkinstance_filters.go b/util/collections/kkinstance_filters.go index 78d87911..977f97a0 100644 --- a/util/collections/kkinstance_filters.go +++ b/util/collections/kkinstance_filters.go @@ -23,7 +23,7 @@ import ( "sigs.k8s.io/cluster-api/util" "sigs.k8s.io/controller-runtime/pkg/client" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" ) // Func is the functon definition for a filter. diff --git a/util/util.go b/util/util.go index 6fabea17..10ea671f 100644 --- a/util/util.go +++ b/util/util.go @@ -26,8 +26,8 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - infrav1 "github.com/kubesphere/kubekey/api/v1beta1" - "github.com/kubesphere/kubekey/pkg/scope" + infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1" + "github.com/kubesphere/kubekey/v3/pkg/scope" ) // GetInfraCluster returns the infrastructure cluster object corresponding to a Cluster.