From 029cadd546aeea0619682b40105e462ba4842688 Mon Sep 17 00:00:00 2001 From: liuxiaomin Date: Sun, 24 Jan 2021 22:29:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A6=BB=E7=BA=BF=E5=8C=85?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- pkg/genie/init_package.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fd45a95..0ac4b53 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ https://kubernetes-release.pek3b.qingstor.com/release/${RELEASE}/bin/linux/${ARC | | +-- containerd.io.rpm | | +-- docker-ce.rpm | | +-- docker-ce-cli.rpm -+-- images -| +-- kubernetes ++-- images +| +-- kubernetes | | +-- ${version} | | | +-- k8s.gcr.io/kube-apiserver:v1.19.0 | | | +-- k8s.gcr.io/kube-controller-manager:v1.19.0 diff --git a/pkg/genie/init_package.go b/pkg/genie/init_package.go index 35bdcd1..810929b 100644 --- a/pkg/genie/init_package.go +++ b/pkg/genie/init_package.go @@ -129,7 +129,7 @@ func copyImagesOnMaster0(node Node, config *v1alpha1.InitConfiguration) error { if !si.IsDir() { pp = filepath.Dir(config.PkgPath) } - err = node.SSHCommand.Copy(fmt.Sprintf("%s/images", pp), "/tmp/images") + err = node.SSHCommand.Copy(fmt.Sprintf("%s/images/kubernetes/%s", pp, config.Kubernetes.Version), "/tmp/images") if err != nil { return err }