From 592618ba66e5b9072fe59eb74870fe2c58950c30 Mon Sep 17 00:00:00 2001
From: gjmzj <gaojianming.zj@139.com>
Date: Fri, 20 Nov 2020 00:29:01 +0800
Subject: [PATCH] =?UTF-8?q?kubeasz-ext-bin=200.7.0=20=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BDcontainerd=E7=9B=B8=E5=85=B3=E4=BA=8C?=
 =?UTF-8?q?=E8=BF=9B=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/easzup | 37 ++-----------------------------------
 1 file changed, 2 insertions(+), 35 deletions(-)

diff --git a/tools/easzup b/tools/easzup
index f618724..873ccc7 100755
--- a/tools/easzup
+++ b/tools/easzup
@@ -16,9 +16,8 @@ set -o errexit
 DOCKER_VER=19.03.13
 KUBEASZ_VER=2.2.2
 K8S_BIN_VER=v1.19.4
-EXT_BIN_VER=0.6.0
+EXT_BIN_VER=0.7.0
 SYS_PKG_VER=0.3.3
-CONTAINERD_VER=1.2.6
 
 # images needed by k8s cluster
 calicoVer=v3.8.8
@@ -239,40 +238,12 @@ function get_offline_image() {
   fi
 }
 
-function get_containerd_bin() {
-  echo -e "[INFO] \033[33mdownloading Containerd binaries\033[0m $CONTAINERD_VER"
-  if [[ "$REGISTRY_MIRROR" == CN ]];then
-    CONTAINERD_URL="https://storage.googleapis.com.cnpmjs.org/cri-containerd-release/cri-containerd-${CONTAINERD_VER}.linux-amd64.tar.gz"
-  else
-    CONTAINERD_URL="https://storage.googleapis.com/cri-containerd-release/cri-containerd-${CONTAINERD_VER}.linux-amd64.tar.gz"
-  fi
-  
-  mkdir -p /etc/ansible/bin/containerd-bin /etc/ansible/down/containerd
-  if [[ -f "/etc/ansible/down/cri-containerd-${CONTAINERD_VER}.linux-amd64.tar.gz" ]];then
-    echo "[INFO] containerd binaries already existed"
-  else
-    echo -e "[INFO] \033[33mdownloading containerd binaries\033[0m $CONTAINERD_VER"
-    if [[ -e /usr/bin/curl ]];then
-      curl -C- -O --retry 3 "$CONTAINERD_URL" || { echo "[ERROR] downloading containerd failed"; exit 1; }
-    else
-      wget -c "$CONTAINERD_URL" || { echo "[ERROR] downloading containerd failed"; exit 1; }
-    fi
-    /bin/mv -f ./cri-containerd-${CONTAINERD_VER}.linux-amd64.tar.gz /etc/ansible/down
-  fi
-
-  tar zxf /etc/ansible/down/cri-containerd-${CONTAINERD_VER}.linux-amd64.tar.gz -C /etc/ansible/down/containerd && \
-  /bin/cp -f /etc/ansible/down/containerd/usr/local/bin/{containerd,containerd-shim,containerd-shim-runc-v1,crictl,ctr} /etc/ansible/bin/containerd-bin && \
-  /bin/cp -f /etc/ansible/down/containerd/usr/local/sbin/runc /etc/ansible/bin/containerd-bin && \
-  rm -rf /etc/ansible/down/containerd
-}
-
 function download_all() {
   download_docker && \
   install_docker && \
   get_kubeasz && \
   get_k8s_bin && \
   get_ext_bin && \
-  get_containerd_bin && \
   get_offline_image
 }
 
@@ -334,7 +305,6 @@ Usage: easzup [options] [args]
     -m <str>   set docker registry mirrors, default "CN"(used in Mainland,China)
     -p <ver>   set kubeasz-sys-pkg version, default "$SYS_PKG_VER"
     -z <ver>   set kubeasz version, default "$KUBEASZ_VER"
-    -c <ver>   set containerd version, default "$CONTAINERD_VER"
   
 see more at https://github.com/kubeasz/dockerfiles
 EOF
@@ -351,7 +321,7 @@ function main() {
   
   REGISTRY_MIRROR="CN"
   ACTION=""
-  while getopts "CDPSd:e:k:m:p:z:c:" OPTION; do
+  while getopts "CDPSd:e:k:m:p:z:" OPTION; do
       case "$OPTION" in
         C)
           ACTION="clean_container"
@@ -383,9 +353,6 @@ function main() {
         z)
           KUBEASZ_VER="$OPTARG"
           ;;
-        c)
-          CONTAINERD_VER="$OPTARG"
-          ;;
         ?)
           usage
           exit 1