Revert "feat(platform): support containerd as runtime (#1390)" (#1449)

This reverts commit 8d79f1c.

Author: leoryu

api/openapi/zz_generated.openapi.go

@@ -227,13 +227,6 @@ const (
 	GPUVirtual GPUType = "Virtual"
 )
 
-type ContainerRuntimeType = string
-
-const (
-	Containerd ContainerRuntimeType = "containerd"
-	Docker ContainerRuntimeType = "docker"
-)
-
 // ClusterPhase defines the phase of cluster constructor.
 type ClusterPhase string
 
@@ -391,8 +384,6 @@ type ClusterFeature struct {
 	// +optional
 	EnableCilium bool
 	// +optional
-	ContainerRuntime ContainerRuntimeType
-	// +optional
 	IPv6DualStack bool
 	// Upgrade control upgrade process.
 	// +optional

api/platform/types.go

@@ -233,13 +233,6 @@ const (
 	GPUVirtual GPUType = "Virtual"
 )
 
-type ContainerRuntimeType = string
-
-const (
-	Containerd ContainerRuntimeType = "containerd"
-	Docker     ContainerRuntimeType = "docker"
-)
-
 // ClusterPhase defines the phase of cluster constructor.
 type ClusterPhase string
 
@@ -398,8 +391,6 @@ type ClusterFeature struct {
 	IPv6DualStack bool `json:"ipv6DualStack,omitempty" protobuf:"bytes,13,opt,name=ipv6DualStack"`
 	// +optional
 	EnableCilium bool `json:"enableCilium,omitempty" protobuf:"bytes,14,opt,name=enableCilium"`
-	// +optional
-	ContainerRuntime ContainerRuntimeType `json:"containerRuntime,omitempty" protobuf:"bytes,15,opt,name=containerRuntime"`
 	// Upgrade control upgrade process.
 	// +optional
 	Upgrade Upgrade `json:"upgrade,omitempty" protobuf:"bytes,22,opt,name=upgrade"`

api/platform/v1/generated.pb.go

@@ -29,12 +29,6 @@ COPY linux-arm64/conntrack-tools-*.tar.gz          res/linux-arm64/
 COPY linux-amd64/docker-*.tar.gz       res/linux-amd64/
 COPY linux-arm64/docker-*.tar.gz       res/linux-arm64/
 
-COPY linux-amd64/containerd-*.tar.gz       res/linux-amd64/
-COPY linux-arm64/containerd-*.tar.gz       res/linux-arm64/
-
-COPY linux-amd64/critools-*.tar.gz       res/linux-amd64/
-COPY linux-arm64/critools-*.tar.gz       res/linux-arm64/
-
 COPY linux-amd64/kubernetes-*.tar.gz   res/linux-amd64/
 COPY linux-arm64/kubernetes-*.tar.gz   res/linux-arm64/
 

api/platform/v1/generated.proto

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations under the License.
 
 IMAGE = provider-res
-VERSION = v1.20.4-2
+VERSION = v1.20.4-1
 REGISTRY_PREFIX ?= tkestack
 
 COMMON_SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))

api/platform/v1/types.go

@@ -56,38 +56,6 @@ function download::docker() {
   done
 }
 
-function download::containerd() {
-  if [ "${arch}" == "amd64" ]; then
-    containerd_arch=amd64
-  elif [ "${arch}" == "arm64" ]; then
-    containerd_arch=amd64
-  else
-    echo "[ERROR] Fail to get containerd ${arch} on ${platform} platform."
-    exit 255
-  fi
-
-  for version in ${CONTAINERD_VERSIONS}; do
-    wget -c "https://github.com/containerd/containerd/releases/download/v${version}/containerd-${version}-linux-${containerd_arch}.tar.gz" \
-      -O "containerd-${platform}-${version}.tar.gz"
-  done
-}
-
-function download::critools() {
-  if [ "${arch}" == "amd64" ]; then
-    critools_arch=amd64
-  elif [ "${arch}" == "arm64" ]; then
-    critools_arch=arm
-  else
-    echo "[ERROR] Fail to get critools ${arch} on ${platform} platform."
-    exit 255
-  fi
-
-  for version in ${CRITOOLS_VERSIONS}; do
-    wget -c "https://github.com/kubernetes-sigs/cri-tools/releases/download/${version}/crictl-${version}-linux-${critools_arch}.tar.gz" \
-      -O "critools-${platform}-${version}.tar.gz"
-  done
-}
-
 function download::kubernetes() {
   for version in ${K8S_VERSIONS}; do
     if [[ "${version}" =~ "tke" ]]; then
@@ -147,8 +115,6 @@ for os in ${OSS}; do
 
     download::cni_plugins
     download::docker
-    download::containerd
-    download::critools
     download::kubernetes
     download::nvidia_driver
     download::nvidia_container_runtime

api/platform/v1/zz_generated.conversion.go

@@ -23,7 +23,7 @@ set -o pipefail
 REGISTRY_PREFIX=${REGISTRY_PREFIX:-tkestack}
 BUILDER=${BUILDER:-default}
 VERSION=${VERSION:-$(git describe --dirty --always --tags | sed 's/-/./g')}
-PROVIDER_RES_VERSION=v1.20.4-2
+PROVIDER_RES_VERSION=v1.20.4-1
 K8S_VERSION=${PROVIDER_RES_VERSION%-*}
 DOCKER_VERSION=19.03.14
 OSS=(linux)