fix: a sha256 checking bug when downloading different versions of bin…

…ary files Signed-off-by: 24sama <[email protected]>
kubesphere · Dec 7, 2022 · ce9a04e · ce9a04e
1 parent 736af43
commit ce9a04e
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/pkg/service/operation/file/containerd.go b/pkg/service/operation/file/containerd.go
@@ -44,7 +44,7 @@ func NewContainerd(sshClient ssh.Interface, rootFs rootfs.Interface, version, ar
 		RootFs:         rootFs,
 		Type:           FileBinary,
 		Name:           fileName,
-		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), fileName),
+		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), ContainerdID, version, arch, fileName),
 		RemoteFullPath: filepath.Join(BinDir, fileName),
 	})
 	if err != nil {

diff --git a/pkg/service/operation/file/crictl.go b/pkg/service/operation/file/crictl.go
@@ -46,7 +46,7 @@ func NewCrictl(sshClient ssh.Interface, rootFs rootfs.Interface, version, arch s
 		RootFs:         rootFs,
 		Type:           FileBinary,
 		Name:           fileName,
-		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), fileName),
+		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), CrictlID, version, arch, fileName),
 		RemoteFullPath: filepath.Join(BinDir, fileName),
 	})
 	if err != nil {

diff --git a/pkg/service/operation/file/docker.go b/pkg/service/operation/file/docker.go
@@ -60,7 +60,7 @@ func NewDocker(sshClient ssh.Interface, rootFs rootfs.Interface, version, arch s
 		RootFs:         rootFs,
 		Type:           FileBinary,
 		Name:           fileName,
-		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), fileName),
+		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), DockerID, version, arch, fileName),
 		RemoteFullPath: filepath.Join(directory.BinDir, fileName),
 	})
 	if err != nil {
@@ -100,7 +100,7 @@ func NewCRIDockerd(sshClient ssh.Interface, rootFs rootfs.Interface, version, ar
 		RootFs:         rootFs,
 		Type:           FileBinary,
 		Name:           fileName,
-		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), fileName),
+		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), CRIDockerdID, version, arch, fileName),
 		RemoteFullPath: filepath.Join(directory.BinDir, fileName),
 	})
 	if err != nil {

diff --git a/pkg/service/operation/file/k3s.go b/pkg/service/operation/file/k3s.go
@@ -46,7 +46,7 @@ func NewK3s(sshClient ssh.Interface, rootFs rootfs.Interface, version, arch stri
 		RootFs:         rootFs,
 		Type:           FileBinary,
 		Name:           fileName,
-		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), fileName),
+		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), K3sID, version, arch, fileName),
 		RemoteFullPath: filepath.Join(BinDir, fileName),
 	})
 	if err != nil {

diff --git a/pkg/service/operation/file/kubeadm.go b/pkg/service/operation/file/kubeadm.go
@@ -46,7 +46,7 @@ func NewKubeadm(sshClient ssh.Interface, rootFs rootfs.Interface, version, arch
 		RootFs:         rootFs,
 		Type:           FileBinary,
 		Name:           fileName,
-		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), fileName),
+		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), KubeadmID, version, arch, fileName),
 		RemoteFullPath: filepath.Join(BinDir, fileName),
 	})
 	if err != nil {

diff --git a/pkg/service/operation/file/kubecni.go b/pkg/service/operation/file/kubecni.go
@@ -48,7 +48,7 @@ func NewKubecni(sshClient ssh.Interface, rootFs rootfs.Interface, version, arch
 		RootFs:         rootFs,
 		Type:           FileBinary,
 		Name:           fileName,
-		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), fileName),
+		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), KubecniID, version, arch, fileName),
 		RemoteFullPath: filepath.Join(OptCniBinDir, fileName),
 	})
 	if err != nil {

diff --git a/pkg/service/operation/file/kubectl.go b/pkg/service/operation/file/kubectl.go
@@ -46,7 +46,7 @@ func NewKubectl(sshClient ssh.Interface, rootFs rootfs.Interface, version, arch
 		RootFs:         rootFs,
 		Type:           FileBinary,
 		Name:           fileName,
-		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), fileName),
+		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), KubectlID, version, arch, fileName),
 		RemoteFullPath: filepath.Join(BinDir, fileName),
 	})
 	if err != nil {

diff --git a/pkg/service/operation/file/kubelet.go b/pkg/service/operation/file/kubelet.go
@@ -46,7 +46,7 @@ func NewKubelet(sshClient ssh.Interface, rootFs rootfs.Interface, version, arch
 		RootFs:         rootFs,
 		Type:           FileBinary,
 		Name:           fileName,
-		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), fileName),
+		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), KubeletID, version, arch, fileName),
 		RemoteFullPath: filepath.Join(BinDir, fileName),
 	})
 	if err != nil {

diff --git a/pkg/service/operation/file/runc.go b/pkg/service/operation/file/runc.go
@@ -45,7 +45,7 @@ func NewRunc(sshClient ssh.Interface, rootFs rootfs.Interface, version, arch str
 		RootFs:         rootFs,
 		Type:           FileBinary,
 		Name:           fileName,
-		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), fileName),
+		LocalFullPath:  filepath.Join(rootFs.ClusterRootFsDir(), RuncID, version, arch, fileName),
 		RemoteFullPath: filepath.Join(BinDir, fileName),
 	})
 	if err != nil {