plumb cni settings

pkg/cri-containerd/Dockerfile

@@ -47,5 +47,5 @@ RUN make DESTDIR=/out install
 
 FROM scratch
 WORKDIR /
-ENTRYPOINT ["cri-containerd", "-v", "2", "--alsologtostderr", "--network-bin-dir", "/var/lib/cni/opt/bin", "--network-conf-dir", "/var/lib/cni/etc/net.d"]
+ENTRYPOINT ["cri-containerd", "-v", "2", "--alsologtostderr", "--network-bin-dir", "/opt/cni/bin", "--network-conf-dir", "/etc/cni/net.d"]
 COPY --from=build /out /

pkg/cri-containerd/build.yml

@@ -11,8 +11,8 @@ config:
   - /tmp:/tmp
   - /var:/var:rshared,rbind
   - /var/lib/kubeadm:/etc/kubernetes
-  - /var/lib/cni/etc:/etc/cni:rshared,rbind
-  - /var/lib/cni/opt:/opt/cni:rshared,rbind
+  - /var/lib/cni/conf:/etc/cni/net.d:rshared,rbind
+  - /var/lib/cni/bin:/opt/cni/bin:rshared,rbind
   - /run/containerd/containerd.sock:/run/containerd/containerd.sock
   - /var/lib/kubelet-plugins:/usr/libexec/kubernetes/kubelet-plugins:rshared,rbind
   mounts:
@@ -30,6 +30,6 @@ config:
   runtime:
     mkdir:
     - /var/lib/kubeadm
-    - /var/lib/cni/etc/net.d
-    - /var/lib/cni/opt
+    - /var/lib/cni/conf
+    - /var/lib/cni/bin
     - /var/lib/kubelet-plugins

pkg/kubelet/build.yml

@@ -14,6 +14,8 @@ config:
   - /etc/kubelet.sh.conf:/etc/kubelet.sh.conf
   - /etc/kubeadm:/etc/kubeadm
   - /var/lib/kubelet-plugins:/usr/libexec/kubernetes/kubelet-plugins:rshared,rbind
+  - /var/lib/cni/conf:/etc/cni/net.d:rshared,rbind
+  - /var/lib/cni/bin:/opt/cni/bin:rshared,rbind
   mounts:
   - type: cgroup
     options:
@@ -29,19 +31,19 @@ config:
   runtime:
     mkdir:
     - /var/lib/kubeadm
-    - /var/lib/cni/etc
-    - /var/lib/cni/opt
+    - /var/lib/cni/conf
+    - /var/lib/cni/bin
     - /var/lib/kubelet-plugins
     mounts:
     - type: bind
-      source: /var/lib/cni/opt
-      destination: /opt/cni
+      source: /var/lib/cni/bin
+      destination: /opt/cni/bin
       options:
       - rw
       - bind
     - type: bind
-      source: /var/lib/cni/etc
-      destination: /etc/cni
+      source: /var/lib/cni/conf
+      destination: /etc/cni/net.d
       options:
       - rw
       - bind

pkg/kubelet/kubelet.sh

@@ -16,14 +16,14 @@ if [ -n "$KUBELET_DISABLED" ] ; then
 fi
 
 if [ ! -e /var/lib/cni/.opt.defaults-extracted ] ; then
-    mkdir -p /var/lib/cni/opt/bin
-    tar -xzf /root/cni.tgz -C /var/lib/cni/opt/bin
+    mkdir -p /var/lib/cni/bin
+    tar -xzf /root/cni.tgz -C /var/lib/cni/bin
     touch /var/lib/cni/.opt.defaults-extracted
 fi
 
-if [ ! -e /var/lib/cni/.cni.configs-extracted ] && [ -d /var/config/cni/etc/net.d ] ; then
-    mkdir -p /var/lib/cni/etc/net.d
-    cp /var/config/cni/etc/net.d/* /var/lib/cni/etc/net.d/
+if [ ! -e /var/lib/cni/.cni.conf-extracted ] && [ -d /var/config/cni ] ; then
+    mkdir -p /var/lib/cni/conf
+    cp /var/config/cni/* /var/lib/cni/conf/
     touch /var/lib/cni/.cni.configs-extracted
 fi
 
@@ -72,7 +72,7 @@ exec kubelet --kubeconfig=/etc/kubernetes/kubelet.conf \
 	      --cgroups-per-qos=false \
 	      --enforce-node-allocatable= \
 	      --network-plugin=cni \
-	      --cni-conf-dir=/var/lib/cni/etc/net.d \
-	      --cni-bin-dir=/var/lib/cni/opt/bin \
+	      --cni-conf-dir=/etc/cni/net.d \
+	      --cni-bin-dir=/opt/cni/bin \
 	      --cadvisor-port=0 \
 	      $KUBELET_ARGS $@

yml/bridge.yml

@@ -6,7 +6,7 @@ onboot:
       - "-c"
       - |
         set -ex
-        cat <<EOF >/var/lib/cni/etc/net.d/10-default.conflist
+        cat <<EOF >/var/lib/cni/conf/10-default.conflist
         {
           "cniVersion": "0.3.1",
           "name": "default",
@@ -36,13 +36,13 @@ onboot:
           ]
         }
         EOF
-        cat <<EOF >/var/lib/cni/etc/net.d/99-loopback.conf
+        cat <<EOF >/var/lib/cni/conf/99-loopback.conf
         {
           "cniVersion": "0.2.0",
           "type": "loopback"
         }
         EOF
     runtime:
-      mkdir: ["/var/lib/cni/etc/net.d"]
+      mkdir: ["/var/lib/cni/conf"]
     binds:
       - /var/lib:/var/lib

yml/cri-containerd.yml

@@ -1,6 +1,6 @@
 services:
   - name: cri-containerd
-    image: linuxkit/cri-containerd:0a91a4e43787a89c0d4824ea71072e56a29bb833
+    image: linuxkit/cri-containerd:c4146c2fc5a91b6c46b7417305a958a0199f06af
     cgroupsPath: podruntime/runtime
 files:
   - path: /etc/kubelet.sh.conf

yml/docker.yml

@@ -15,13 +15,13 @@ services:
      - /run:/run
      - /var:/var:rshared,rbind
      - /var/lib/kubeadm:/etc/kubernetes
-     - /var/lib/cni/etc:/etc/cni:rshared,rbind
-     - /var/lib/cni/opt:/opt/cni:rshared,rbind
+     - /var/lib/cni/conf:/etc/cni/net.d:rshared,rbind
+     - /var/lib/cni/bin:/opt/cni/bin:rshared,rbind
      - /var/lib/kubelet-plugins:/usr/libexec/kubernetes/kubelet-plugins:rshared,rbind
     rootfsPropagation: shared
     command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
     runtime:
-      mkdir: ["/var/lib/kubeadm", "/var/lib/cni/etc", "/var/lib/cni/opt", "/var/lib/kubelet-plugins"]
+      mkdir: ["/var/lib/kubeadm", "/var/lib/cni/conf", "/var/lib/cni/bin", "/var/lib/kubelet-plugins"]
   - name: kubernetes-docker-image-cache-common
     image: linuxkit/kubernetes-docker-image-cache-common:d406f234bf7747ea4f25b8f6d6740f7557ad1255
 files:

yml/kube.yml

@@ -36,7 +36,7 @@ services:
   - name: sshd
     image: linuxkit/sshd:ac5e8364e2e9aa8717a3295c51eb60b8c57373d5
   - name: kubelet
-    image: linuxkit/kubelet:11082f2f27278399856d2ec37b112c79bc68c5a6
+    image: linuxkit/kubelet:d581c755f04a8a4060e9947cabe737d6b70fdd1b
 files:
   - path: etc/linuxkit.yml
     metadata: yaml
@@ -51,9 +51,9 @@ files:
     directory: true
   - path: /etc/sysctl.d/01-kubernetes.conf
     contents: 'net.ipv4.ip_forward = 1'
-  - path: /opt/cni
+  - path: /etc/cni/net.d
     directory: true
-  - path: /etc/cni
+  - path: /opt/cni/bin
     directory: true
   - path: root/.ssh/authorized_keys
     source: ~/.ssh/id_rsa.pub