15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-26 01:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1668 from 24sama/master 

feat: modify go mod path
This commit is contained in:
KubeSphere CI Bot 2022-12-19 14:36:51 +08:00 committed by GitHub
parent 8a645c913a 4564012ae0
commit db8aca4fb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
338 changed files with 1297 additions and 1348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.golangci.yml
View File

@ -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

8
Makefile
View File

@ -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:

12
bootstrap/k3s/controllers/k3sconfig_controller.go
View File

@ -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.

6
bootstrap/k3s/main.go
View File

@ -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
)

2
bootstrap/k3s/pkg/cloudinit/controlplane_init.go
View File

@ -17,7 +17,7 @@
package cloudinit
import (
"github.com/kubesphere/kubekey/util/secret"
"github.com/kubesphere/kubekey/v3/util/secret"
)
const (

2
bootstrap/k3s/pkg/types/util.go
View File

@ -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.

10
cmd/kk/apis/kubekey/v1alpha2/cluster_types.go
View File

@ -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

2
cmd/kk/apis/kubekey/v1alpha2/default.go
View File

@ -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 (

2
cmd/kk/cmd/add/add.go
View File

@ -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 {

8
cmd/kk/cmd/add/add_nodes.go
View File

@ -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 {

2
cmd/kk/cmd/alpha/alpha.go
View File

@ -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

6
cmd/kk/cmd/alpha/create.go
View File

@ -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
}

2
cmd/kk/cmd/alpha/cri/cri.go
View File

@ -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 {

8
cmd/kk/cmd/alpha/cri/migrate_cri.go
View File

@ -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 {

8
cmd/kk/cmd/alpha/upgrade.go
View File

@ -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
}

4
cmd/kk/cmd/artifact/artifact.go
View File

@ -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 {

8
cmd/kk/cmd/artifact/export.go
View File

@ -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 {

2
cmd/kk/cmd/artifact/images/images.go
View File

@ -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 {

16
cmd/kk/cmd/artifact/images/push.go
View File

@ -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 {

8
cmd/kk/cmd/artifact/import.go
View File

@ -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 {

2
cmd/kk/cmd/cert/cert.go
View File

@ -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 {

8
cmd/kk/cmd/cert/list_cert.go
View File

@ -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 {

8
cmd/kk/cmd/cert/renew_cert.go
View File

@ -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 {

2
cmd/kk/cmd/completion/completion.go
View File

@ -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

12
cmd/kk/cmd/create/cluster.go
View File

@ -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 {

10
cmd/kk/cmd/create/config.go
View File

@ -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 {

2
cmd/kk/cmd/create/create.go
View File

@ -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 {

8
cmd/kk/cmd/create/manifest.go
View File

@ -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 {

10
cmd/kk/cmd/create/phase/binary.go
View File

@ -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 {

8
cmd/kk/cmd/create/phase/configure.go
View File

@ -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 {

8
cmd/kk/cmd/create/phase/etcd.go
View File

@ -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 {

8
cmd/kk/cmd/create/phase/images.go
View File

@ -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 {

8
cmd/kk/cmd/create/phase/init.go
View File

@ -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 {

8
cmd/kk/cmd/create/phase/join.go
View File

@ -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 {

10
cmd/kk/cmd/create/phase/kubesphere.go
View File

@ -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 {

8
cmd/kk/cmd/create/phase/os.go
View File

@ -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 {

2
cmd/kk/cmd/delete/delete.go
View File

@ -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 {

8
cmd/kk/cmd/delete/delete_cluster.go
View File

@ -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 {

8
cmd/kk/cmd/delete/delete_node.go
View File

@ -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 {

2
cmd/kk/cmd/init/init.go
View File

@ -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 {

8
cmd/kk/cmd/init/init_os.go
View File

@ -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 {

8
cmd/kk/cmd/init/init_registry.go
View File

@ -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 {

2
cmd/kk/cmd/plugin/list.go
View File

@ -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 {

2
cmd/kk/cmd/plugin/plugin.go
View File

@ -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 (

24
cmd/kk/cmd/root.go
View File

@ -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 {

11
cmd/kk/cmd/upgrade/phase/binary.go
View File

@ -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 {

9
cmd/kk/cmd/upgrade/phase/images.go
View File

@ -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 {

11
cmd/kk/cmd/upgrade/phase/kubesphere.go
View File

@ -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 {

8
cmd/kk/cmd/upgrade/phase/nodes.go
View File

@ -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 {

13
cmd/kk/cmd/upgrade/upgrade.go
View File

@ -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 {

4
cmd/kk/cmd/version/version.go
View File

@ -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 {

2
cmd/kk/main.go
View File

@ -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

4
cmd/kk/pkg/addons/addons.go
View File

@ -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 {

6
cmd/kk/pkg/addons/charts.go
View File

@ -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{}) {

4
cmd/kk/pkg/addons/module.go
View File

@ -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 {

6
cmd/kk/pkg/addons/tasks.go
View File

@ -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 {

13
cmd/kk/pkg/artifact/manifest.go
View File

@ -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 {

4
cmd/kk/pkg/artifact/module.go
View File

@ -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 {

5
cmd/kk/pkg/artifact/prepares.go
View File

@ -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 {

8
cmd/kk/pkg/artifact/tasks.go
View File

@ -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 {

8
cmd/kk/pkg/artifact/templates/manifest.go
View File

@ -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.

13
cmd/kk/pkg/binaries/k3s.go
View File

@ -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.

13
cmd/kk/pkg/binaries/k8e.go
View File

@ -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.

13
cmd/kk/pkg/binaries/kubernetes.go
View File

@ -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.

7
cmd/kk/pkg/binaries/module.go
View File

@ -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 {

12
cmd/kk/pkg/binaries/registry.go
View File

@ -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.

7
cmd/kk/pkg/binaries/tasks.go
View File

@ -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 {

6
cmd/kk/pkg/bootstrap/confirm/module.go
View File

@ -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 {

10
cmd/kk/pkg/bootstrap/confirm/tasks.go
View File

@ -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.

8
cmd/kk/pkg/bootstrap/customscripts/module.go
View File

@ -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)

14
cmd/kk/pkg/bootstrap/customscripts/tasks.go
View File

@ -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)
}

12
cmd/kk/pkg/bootstrap/os/module.go
View File

@ -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 {

6
cmd/kk/pkg/bootstrap/os/prepares.go
View File

@ -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 {

3
cmd/kk/pkg/bootstrap/os/repository/repository.go
View File

@ -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 {

2
cmd/kk/pkg/bootstrap/os/repository/repository_deb.go
View File

@ -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 {

2
cmd/kk/pkg/bootstrap/os/repository/repository_rpm.go
View File

@ -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 {

12
cmd/kk/pkg/bootstrap/os/rollback.go
View File

@ -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 {

10
cmd/kk/pkg/bootstrap/os/tasks.go
View File

@ -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 {

8
cmd/kk/pkg/bootstrap/os/templates/init_script.go
View File

@ -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(

8
cmd/kk/pkg/bootstrap/precheck/module.go
View File

@ -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 {

5
cmd/kk/pkg/bootstrap/precheck/prepares.go
View File

@ -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 {

12
cmd/kk/pkg/bootstrap/precheck/tasks.go
View File

@ -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 {

14
cmd/kk/pkg/bootstrap/registry/certs.go
View File

@ -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 (

16
cmd/kk/pkg/bootstrap/registry/module.go
View File

@ -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 {

4
cmd/kk/pkg/bootstrap/registry/prepares.go
View File

@ -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 {

9
cmd/kk/pkg/bootstrap/registry/tasks.go
View File

@ -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 {

14
cmd/kk/pkg/certs/module.go
View File

@ -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 {

6
cmd/kk/pkg/certs/prepares.go
View File

@ -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 {

20
cmd/kk/pkg/certs/tasks.go
View File

@ -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 {

4
cmd/kk/pkg/common/artifact_action.go
View File

@ -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 {

4
cmd/kk/pkg/common/artifact_module.go
View File

@ -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 {

4
cmd/kk/pkg/common/artifact_prepare.go
View File

@ -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 {

4
cmd/kk/pkg/common/artifact_runtime.go
View File

@ -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 {

4
cmd/kk/pkg/common/kube_action.go
View File

@ -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 {

4
cmd/kk/pkg/common/kube_module.go
View File

@ -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 {

4
cmd/kk/pkg/common/kube_prepare.go
View File

@ -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 {

4
cmd/kk/pkg/common/kube_rollback.go
View File

@ -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 {

4
cmd/kk/pkg/common/kube_runtime.go
View File

@ -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 {

6
cmd/kk/pkg/common/loader.go
View File

@ -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 (

4
cmd/kk/pkg/common/local_runtime.go
View File

@ -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 {

Some files were not shown because too many files have changed in this diff Show More