Use containerd cri plugin

- remove cri-containerd package
- kubelet container mounting hack
  - previously cri-containerd created the /var/lib/cni/{bin,conf}
    directories and containerd appears to process runtime mounts
    before mkdir entries

Signed-off-by: Jason DeTiberus <[email protected]>

Author: detiber

.circleci/config.yml

@@ -68,7 +68,6 @@ image_build: &image_build
               load kubernetes-docker-image-cache-control-plane
               ;;
           cri-containerd)
-              load cri-containerd
               ;;
           *)
               echo "Unknown $KUBE_RUNTIME"
@@ -196,8 +195,6 @@ jobs:
 
   pkg-kubelet:
     <<: *linuxkit_pkg_build
-  pkg-cri-containerd:
-    <<: *linuxkit_pkg_build
   pkg-kube-e2e-test:
     <<: *linuxkit_pkg_build
 
@@ -275,7 +272,6 @@ jobs:
             cp .circleci/content-trust.key ~/.docker/trust/private/b056f84873aa0be205dfe826afa6e7458120c9569dd19a2a84154498fb1165d5.key
 
             linuxkit pkg push --nobuild pkg/kubelet
-            linuxkit pkg push --nobuild pkg/cri-containerd
             linuxkit pkg push --nobuild pkg/kube-e2e-test
             linuxkit pkg push --nobuild pkg/kubernetes-docker-image-cache-common
             linuxkit pkg push --nobuild pkg/kubernetes-docker-image-cache-control-plane
@@ -292,9 +288,6 @@ workflows:
       - pkg-kubelet:
           requires:
             - dependencies
-      - pkg-cri-containerd:
-          requires:
-            - dependencies
       - pkg-kube-e2e-test:
           requires:
             - dependencies
@@ -321,12 +314,10 @@ workflows:
           requires:
             - dependencies
             - pkg-kubelet
-            - pkg-cri-containerd
       - image-cri-containerd-bridge:
           requires:
             - dependencies
             - pkg-kubelet
-            - pkg-cri-containerd
 
       - push-pkgs-to-hub:
           # We want everything to have passed, which is a bit
@@ -335,7 +326,6 @@ workflows:
           requires:
             - lint
             - pkg-kubelet
-            - pkg-cri-containerd
             - pkg-kube-e2e-test
             - pkg-kubernetes-docker-image-cache-common
             - pkg-kubernetes-docker-image-cache-control-plane

Makefile

@@ -30,7 +30,6 @@ kube-weave.yaml:
 .PHONY: update-hashes
 update-hashes:
 	set -e ; for tag in $$(linuxkit pkg show-tag pkg/kubelet) \
-	           $$(linuxkit pkg show-tag pkg/cri-containerd) \
 	           $$(linuxkit pkg show-tag pkg/kubernetes-docker-image-cache-common) \
 	           $$(linuxkit pkg show-tag pkg/kubernetes-docker-image-cache-control-plane) ; do \
 	    image=$${tag%:*} ; \

pkg/cri-containerd/Dockerfile

@@ -1,8 +1,23 @@
-services:
-  - name: cri-containerd
-    image: linuxkit/cri-containerd:474d704f6dcb173b10768ab1d1bd61674468c7f9
-    cgroupsPath: podruntime/cri-containerd
 files:
+  - path: /etc/crictl.yaml
+    contents: |
+      runtime-endpoint: unix:///run/containerd/containerd.sock
+      image-endpoint: unix:///run/containerd/containerd.sock
+      timeout: 10
+  - path: /etc/containerd/config.toml
+    contents: |
+      state = "/run/containerd"
+      root = "/var/lib/containerd"
+      snapshotter = "io.containerd.snapshotter.v1.overlayfs"
+      [grpc]
+        address = "/run/containerd/containerd.sock"
+        uid = 0
+        gid = 0
+      [debug]
+        address = "/run/containerd/debug.sock"
+        level = "info"
+      [metrics]
+        address = ""
   - path: /etc/kubelet.sh.conf
     contents: |
-      KUBELET_ARGS="--container-runtime=remote --container-runtime-endpoint=unix:///var/run/cri-containerd.sock"
+      KUBELET_ARGS="--container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock"

pkg/cri-containerd/build.yml

@@ -24,6 +24,11 @@ onboot:
   - name: mounts
     image: linuxkit/mount:0eba853dfa99f01166831c30f37f6bb818b61f2f
     command: ["/usr/bin/mountie", "/var/lib/"]
+  - name: dir-hack
+    image: busybox:latest
+    command: ["mkdir", "-p", "/var/lib/cni/conf", "/var/lib/cni/bin"]
+    binds:
+    - /var:/var:rshared,rbind
 services:
   - name: getty
     image: linuxkit/getty:32247863cace34f3b441b4c5d9d3f5cb5f64d189
@@ -40,7 +45,7 @@ services:
     image: linuxkit/sshd:39d6bdc9a7489ceffa761ad5cb96c87b50d6732d
     cgroupsPath: systemreserved/sshd
   - name: kubelet
-    image: linuxkit/kubelet:ddd2e094e44aae9bab3eb3b8d378d2383d6cda01
+    image: linuxkit/kubelet:1775276ba903b90615d91f0bd034a527163ffbd4
     cgroupsPath: podruntime/kubelet
 files:
   - path: etc/linuxkit.yml