diff --git a/cmd/kk/pkg/bootstrap/os/tasks.go b/cmd/kk/pkg/bootstrap/os/tasks.go index f4a41ece7..1f3467610 100644 --- a/cmd/kk/pkg/bootstrap/os/tasks.go +++ b/cmd/kk/pkg/bootstrap/os/tasks.go @@ -136,7 +136,7 @@ var ( etcdFiles = []string{ "/usr/local/bin/etcd", "/etc/ssl/etcd", - "/var/lib/etcd", + "/var/lib/etcd/*", "/etc/etcd.env", } clusterFiles = []string{ @@ -149,7 +149,7 @@ var ( "/var/log/pods/", "/var/lib/cni", "/var/lib/calico", - "/var/lib/kubelet", + "/var/lib/kubelet/*", "/run/calico", "/run/flannel", "/etc/flannel", @@ -231,7 +231,7 @@ func (r *RemoveNodeFiles) Execute(runtime connector.Runtime) error { "/var/log/pods/", "/var/lib/cni", "/var/lib/calico", - "/var/lib/kubelet", + "/var/lib/kubelet/*", "/run/calico", "/run/flannel", "/etc/flannel", diff --git a/cmd/kk/pkg/bootstrap/precheck/tasks.go b/cmd/kk/pkg/bootstrap/precheck/tasks.go index a194910e9..17b227043 100644 --- a/cmd/kk/pkg/bootstrap/precheck/tasks.go +++ b/cmd/kk/pkg/bootstrap/precheck/tasks.go @@ -241,9 +241,11 @@ func (k *KsVersionCheck) Execute(runtime connector.Runtime) error { ccKsVersionStr, ccErr := runtime.GetRunner().SudoCmd( "/usr/local/bin/kubectl get ClusterConfiguration ks-installer -n kubesphere-system -o jsonpath='{.metadata.labels.version}'", false) - if ccErr == nil && ksVersionStr == "v3.1.0" { + + if ccErr == nil && versionutil.MustParseSemantic(ccKsVersionStr).AtLeast(versionutil.MustParseSemantic("v3.1.0")) { ksVersionStr = ccKsVersionStr } + k.PipelineCache.Set(common.KubeSphereVersion, ksVersionStr) return nil } diff --git a/cmd/kk/pkg/kubernetes/kubernetes_status.go b/cmd/kk/pkg/kubernetes/kubernetes_status.go index be6448b1d..582d5f596 100644 --- a/cmd/kk/pkg/kubernetes/kubernetes_status.go +++ b/cmd/kk/pkg/kubernetes/kubernetes_status.go @@ -65,7 +65,7 @@ func (k *KubernetesStatus) SearchJoinInfo(runtime connector.Runtime) error { return nil } - uploadCertsCmd := "/usr/local/bin/kubeadm init phase upload-certs --upload-certs" + uploadCertsCmd := "/usr/local/bin/kubeadm init phase upload-certs --upload-certs --config /etc/kubernetes/kubeadm-config.yaml" output, err := runtime.GetRunner().SudoCmd(uploadCertsCmd, true) if err != nil { return errors.Wrap(errors.WithStack(err), "Failed to upload kubeadm certs") diff --git a/cmd/kk/pkg/kubernetes/module.go b/cmd/kk/pkg/kubernetes/module.go index 8d2357d86..4b6c76aed 100644 --- a/cmd/kk/pkg/kubernetes/module.go +++ b/cmd/kk/pkg/kubernetes/module.go @@ -469,8 +469,23 @@ func (s *SetUpgradePlanModule) Init() { Action: &SetUpgradePlan{Step: s.Step}, } + generateKubeadmConfigInit := &task.RemoteTask{ + Name: "GenerateKubeadmConfig", + Desc: "Generate kubeadm config", + Hosts: s.Runtime.GetHostsByRole(common.Master), + Prepare: &prepare.PrepareCollection{ + new(common.OnlyFirstMaster), + }, + Action: &GenerateKubeadmConfig{ + IsInitConfiguration: true, + WithSecurityEnhancement: s.KubeConf.Arg.SecurityEnhancement, + }, + Parallel: true, + } + s.Tasks = []task.Interface{ plan, + generateKubeadmConfigInit, } } diff --git a/cmd/kk/pkg/version/kubernetes/version_enum.go b/cmd/kk/pkg/version/kubernetes/version_enum.go index a20034c6d..3d4b18898 100644 --- a/cmd/kk/pkg/version/kubernetes/version_enum.go +++ b/cmd/kk/pkg/version/kubernetes/version_enum.go @@ -35,6 +35,7 @@ const ( V123 V124 V125 + V126 ) var VersionList = []Version{ @@ -45,6 +46,7 @@ var VersionList = []Version{ V123, V124, V125, + V126, } func (v Version) String() string { @@ -63,6 +65,8 @@ func (v Version) String() string { return "v1.24" case V125: return "v1.25" + case V126: + return "v1.26" default: return "invalid option" } diff --git a/cmd/kk/pkg/version/kubesphere/ks_installer.go b/cmd/kk/pkg/version/kubesphere/ks_installer.go index fdcaeec52..c780b3b95 100644 --- a/cmd/kk/pkg/version/kubesphere/ks_installer.go +++ b/cmd/kk/pkg/version/kubesphere/ks_installer.go @@ -236,7 +236,5 @@ var KsV340 = &KsInstaller{ V332.String(), V331.String(), V330.String(), - V320.String(), - V321.String(), }, }