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 #1283 from pixiake/lb 

Fix: --with-kubernetes override the configuration of spec.kubernetes
This commit is contained in:
KubeSphere CI Bot 2022-05-17 17:22:45 +08:00 committed by GitHub
parent 1603ac2d1b 212fb20df3
commit 16e918132c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/bootstrap/confirm/tasks.go
View File

@ -190,17 +190,18 @@ func (u *UpgradeConfirm) Execute(runtime connector.Runtime) error {
}
if cmp == 0 || cmp == 1 {
for _, result := range results {
dockerVersion, err := RefineDockerVersion(result.Docker)
if err != nil {
logger.Log.Fatalf("Failed to get docker version: %v", err)
if len(result.Docker) != 0 {
dockerVersion, err := RefineDockerVersion(result.Docker)
if err != nil {
logger.Log.Fatalf("Failed to get docker version: %v", err)
}
cmp, err := versionutil.MustParseSemantic(dockerVersion).Compare("20.10.0")
if err != nil {
logger.Log.Fatalf("Failed to compare docker version: %v", err)
}
warningFlag = warningFlag || (cmp == -1)
}
cmp, err := versionutil.MustParseSemantic(dockerVersion).Compare("20.10.0")
if err != nil {
logger.Log.Fatalf("Failed to compare docker version: %v", err)
}
warningFlag = warningFlag || (cmp == -1)
}
if warningFlag {
fmt.Println(`
Warning:

10
pkg/common/loader.go
View File

@ -233,14 +233,10 @@ func (f FileLoader) Load() (*kubekeyapiv1alpha2.Cluster, error) {
if f.KubernetesVersion != "" {
s := strings.Split(f.KubernetesVersion, "-")
if len(s) > 1 {
clusterCfg.Spec.Kubernetes = kubekeyapiv1alpha2.Kubernetes{
Version: s[0],
Type: s[1],
}
clusterCfg.Spec.Kubernetes.Version = s[0]
clusterCfg.Spec.Kubernetes.Type = s[1]
} else {
clusterCfg.Spec.Kubernetes = kubekeyapiv1alpha2.Kubernetes{
Version: f.KubernetesVersion,
}
clusterCfg.Spec.Kubernetes.Version = f.KubernetesVersion
}
}

47
pkg/images/tasks.go
View File

@ -40,28 +40,31 @@ type PullImage struct {
}
func (p *PullImage) Execute(runtime connector.Runtime) error {
i := Images{}
i.Images = []Image{
GetImage(runtime, p.KubeConf, "etcd"),
GetImage(runtime, p.KubeConf, "pause"),
GetImage(runtime, p.KubeConf, "kube-apiserver"),
GetImage(runtime, p.KubeConf, "kube-controller-manager"),
GetImage(runtime, p.KubeConf, "kube-scheduler"),
GetImage(runtime, p.KubeConf, "kube-proxy"),
GetImage(runtime, p.KubeConf, "coredns"),
GetImage(runtime, p.KubeConf, "k8s-dns-node-cache"),
GetImage(runtime, p.KubeConf, "calico-kube-controllers"),
GetImage(runtime, p.KubeConf, "calico-cni"),
GetImage(runtime, p.KubeConf, "calico-node"),
GetImage(runtime, p.KubeConf, "calico-flexvol"),
GetImage(runtime, p.KubeConf, "cilium"),
GetImage(runtime, p.KubeConf, "operator-generic"),
GetImage(runtime, p.KubeConf, "flannel"),
GetImage(runtime, p.KubeConf, "kubeovn"),
GetImage(runtime, p.KubeConf, "haproxy"),
}
if err := i.PullImages(runtime, p.KubeConf); err != nil {
return err
if !p.KubeConf.Arg.SkipPullImages {
i := Images{}
i.Images = []Image{
GetImage(runtime, p.KubeConf, "etcd"),
GetImage(runtime, p.KubeConf, "pause"),
GetImage(runtime, p.KubeConf, "kube-apiserver"),
GetImage(runtime, p.KubeConf, "kube-controller-manager"),
GetImage(runtime, p.KubeConf, "kube-scheduler"),
GetImage(runtime, p.KubeConf, "kube-proxy"),
GetImage(runtime, p.KubeConf, "coredns"),
GetImage(runtime, p.KubeConf, "k8s-dns-node-cache"),
GetImage(runtime, p.KubeConf, "calico-kube-controllers"),
GetImage(runtime, p.KubeConf, "calico-cni"),
GetImage(runtime, p.KubeConf, "calico-node"),
GetImage(runtime, p.KubeConf, "calico-flexvol"),
GetImage(runtime, p.KubeConf, "cilium"),
GetImage(runtime, p.KubeConf, "operator-generic"),
GetImage(runtime, p.KubeConf, "flannel"),
GetImage(runtime, p.KubeConf, "kubeovn"),
GetImage(runtime, p.KubeConf, "haproxy"),
}
if err := i.PullImages(runtime, p.KubeConf); err != nil {
return err
}
}
return nil
}