feat(platform): remove kubeadm packge (tkestack#1017)

k8ssphere · Dec 23, 2020 · bc71158 · bc71158
1 parent be4e509
commit bc71158
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 21 deletions.
diff --git a/build/docker/tools/provider-res/Dockerfile b/build/docker/tools/provider-res/Dockerfile
@@ -32,9 +32,6 @@ COPY linux-arm64/docker-*.tar.gz res/linux-arm64/
 COPY linux-amd64/kubernetes-*.tar.gz res/linux-amd64/
 COPY linux-arm64/kubernetes-*.tar.gz res/linux-arm64/
 
-COPY linux-amd64/kubeadm-*.tar.gz res/linux-amd64/
-COPY linux-arm64/kubeadm-*.tar.gz res/linux-arm64/
-
 COPY linux-amd64/NVIDIA-*.tar.gz res/linux-amd64/
 
 COPY linux-amd64/nvidia-container-*.tar.gz res/linux-amd64/

diff --git a/build/docker/tools/provider-res/download.sh b/build/docker/tools/provider-res/download.sh
@@ -63,15 +63,6 @@ function download::kubernetes() {
  done
 }
 
-function download::kubeadm() {
- for version in ${K8S_VERSIONS}; do
- wget -c "https://storage.googleapis.com/kubernetes-release/release/${version}/bin/${os}/${arch}/kubeadm"
- chmod +x kubeadm
- GZIP=-n tar cvzf "kubeadm-${platform}-${version}.tar.gz" kubeadm
- rm kubeadm
- done
-}
-
 function download::nvidia_driver() {
  if ! { [ "${os}" == "linux" ] && [ "${arch}" == "amd64" ]; }; then
  return
@@ -120,7 +111,6 @@ for os in ${OSS}; do
  download::cni_plugins
  download::docker
  download::kubernetes
- download::kubeadm
  download::nvidia_driver
  download::nvidia_container_runtime
  download::pkgs

diff --git a/pkg/platform/provider/baremetal/constants/constants.go b/pkg/platform/provider/baremetal/constants/constants.go
@@ -49,6 +49,10 @@ const (
  KubeSchedulerPodManifestFile = KubeletPodManifestDir + "kube-scheduler.yaml"
  KeepavlivedManifestFile = KubeletPodManifestDir + "keepalived.yaml"
 
+ KubeadmPathInNodePackge = "kubernetes/node/bin/kubeadm"
+ KubeletPathInNodePackge = "kubernetes/node/bin/kubelet"
+ KubectlPathInNodePackge = "kubernetes/node/bin/kubectl"
+
  DstTmpDir = "/tmp/k8s/"
  DstBinDir = "/usr/bin/"
  CNIBinDir = "/opt/cni/bin/"

diff --git a/pkg/platform/provider/baremetal/phases/kubeadm/kubeadm.go b/pkg/platform/provider/baremetal/phases/kubeadm/kubeadm.go
@@ -73,13 +73,13 @@ var (
 )
 
 func Install(s ssh.Interface, version string) error {
- dstFile, err := res.Kubeadm.CopyToNode(s, version)
+ dstFile, err := res.KubernetesNode.CopyToNode(s, version)
  if err != nil {
  return err
  }
 
- cmd := "tar xvaf %s -C %s "
- _, stderr, exit, err := s.Execf(cmd, dstFile, constants.DstBinDir)
+ cmd := "tar -C %s -xvaf %s %s --strip-components=3"
+ _, stderr, exit, err := s.Execf(cmd, constants.DstBinDir, dstFile, constants.KubeadmPathInNodePackge)
  if err != nil || exit != 0 {
  return fmt.Errorf("exec %q failed:exit %d:stderr %s:error %s", cmd, exit, stderr, err)
  }

diff --git a/pkg/platform/provider/baremetal/res/res.go b/pkg/platform/provider/baremetal/res/res.go
@@ -44,11 +44,6 @@ var (
  Versions: spec.ConntrackToolsVersions,
  TargetDir: "/",
  }
-
- Kubeadm = Package{
- Name: "kubeadm",
- Versions: spec.K8sValidVersionsWithV,
- }
  KubernetesNode = Package{
  Name: "kubernetes-node",
  Versions: spec.K8sValidVersionsWithV,