优化离线包结构

dk-lockdown · Jan 24, 2021 · 029cadd · 029cadd
1 parent aee9942
commit 029cadd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
 	}