feat(platform): support containerd as runtime (#1390) (#1470)

Author: Lis

api/openapi/zz_generated.openapi.go

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

api/platform/types.go

@@ -237,6 +237,13 @@ const (
 	GPUVirtual GPUType = "Virtual"
 )
 
+type ContainerRuntimeType = string
+
+const (
+	Containerd ContainerRuntimeType = "containerd"
+	Docker     ContainerRuntimeType = "docker"
+)
+
 // ClusterPhase defines the phase of cluster constructor.
 type ClusterPhase string
 
@@ -395,6 +402,8 @@ 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

@@ -26,14 +26,23 @@ COPY linux-arm64/cni-*.tar.gz          res/linux-arm64/
 COPY linux-amd64/conntrack-tools-*.tar.gz          res/linux-amd64/
 COPY linux-arm64/conntrack-tools-*.tar.gz          res/linux-arm64/
 
+COPY linux-amd64/nerdctl-*.tar.gz res/linux-amd64/
+COPY linux-arm64/nerdctl-*.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/kubernetes-*.tar.gz   res/linux-amd64/
 COPY linux-arm64/kubernetes-*.tar.gz   res/linux-arm64/
 
 COPY linux-amd64/NVIDIA-*.tar.gz       res/linux-amd64/
 
 COPY linux-amd64/nvidia-container-*.tar.gz res/linux-amd64/
 
+COPY containerd conf/containerd
+COPY kubeadm conf/kubeadm
+
 ENTRYPOINT ["sh"]

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-1
+VERSION = v1.20.4-2
 REGISTRY_PREFIX ?= tkestack
 
 COMMON_SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
@@ -34,6 +34,8 @@ include $(ROOT_DIR)/build/lib/docker-buildx.mk
 .PHONY: per.build
 per.build: download
 	@cp "$(ROOT_DIR)/build/docker/tools/$(IMAGE)/Dockerfile" "$(WORK_DIR)/Dockerfile"
+	@cp -r "$(ROOT_DIR)/pkg/platform/provider/baremetal/conf/containerd" "$(WORK_DIR)/containerd"
+	@cp -r "$(ROOT_DIR)/pkg/platform/provider/baremetal/conf/kubeadm" "$(WORK_DIR)/kubeadm"
 
 .PHONY: download
 download:
@@ -64,7 +66,7 @@ manifest.multiarch: per.build
 	#@rm -rf "$(WORK_DIR)"
 	@echo "===========> Pushing manifest $(REGISTRY_PREFIX)/$(IMAGE):$(VERSION) and then remove the local manifest list"
 	REGISTRY_PREFIX=$(REGISTRY_PREFIX) PLATFROMS="$(PLATFORMS)" IMAGE=$(IMAGE) VERSION=$(VERSION) \
-	  DOCKER_CLI_EXPERIMENTAL=enabled $(ROOT_DIR)/build/lib/create-manifest.sh 
+	  DOCKER_CLI_EXPERIMENTAL=enabled $(ROOT_DIR)/build/lib/create-manifest.sh
 
 ## help: Show this help info.
 .PHONY: help

api/platform/v1/types.go

@@ -56,6 +56,41 @@ function download::docker() {
   done
 }
 
+function download::containerd() {
+  if [ "${arch}" == "amd64" ]; then
+    containerd_arch=amd64
+    for version in ${CONTAINERD_VERSIONS}; do
+      wget -c "https://github.com/containerd/containerd/releases/download/v${version}/cri-containerd-cni-${version}-linux-${containerd_arch}.tar.gz" \
+        -O "containerd-${platform}-${version}.tar.gz"
+    done
+  elif [ "${arch}" == "arm64" ]; then
+    containerd_arch=arm64
+    for version in ${CONTAINERD_VERSIONS}; do
+      wget -c "https://tke-release-1251707795.cos.ap-guangzhou.myqcloud.com/cri-containerd-cni-${version}-linux-${containerd_arch}.tar.gz" \
+        -O "containerd-${platform}-${version}.tar.gz"
+    done
+  else
+    echo "[ERROR] Fail to get containerd ${arch} on ${platform} platform."
+    exit 255
+  fi
+}
+
+function download::nerdctl() {
+  if [ "${arch}" == "amd64" ]; then
+    nerdctl_arch=x86_64
+  elif [ "${arch}" == "arm64" ]; then
+    nerdctl_arch=arm64
+  else
+    echo "[ERROR] Fail to get nerdctl ${arch} on ${platform} platform."
+    exit 255
+  fi
+
+  for version in ${NERDCTL_VERSIONS}; do
+    wget -c "https://github.com/containerd/nerdctl/releases/download/v${version}/nerdctl-${version}-linux-${arch}.tar.gz" \
+      -O "nerdctl-${platform}-${version}.tar.gz"
+  done
+}
+
 function download::kubernetes() {
   for version in ${K8S_VERSIONS}; do
     if [[ "${version}" =~ "tke" ]]; then
@@ -115,6 +150,8 @@ for os in ${OSS}; do
 
     download::cni_plugins
     download::docker
+    download::containerd
+    download::nerdctl
     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-1
+PROVIDER_RES_VERSION=v1.20.4-2
 K8S_VERSION=${PROVIDER_RES_VERSION%-*}
 DOCKER_VERSION=19.03.14
 OSS=(linux)