Merge pull request #15463 from prezha/fix-TestNetworkPlugins-Linux_Docker

improve how CRs and k8s work with CNI plugins and cgroup drivers

Author: spowelljr

Diff for: cmd/minikube/cmd/docker-env.go

@@ -199,7 +199,7 @@ func mustRestartDockerd(name string, runner command.Runner) {
 	if err := sysinit.New(runner).Reload("docker"); err != nil {
 		klog.Warningf("will try to restart dockerd because reload failed: %v", err)
 		if err := sysinit.New(runner).Restart("docker"); err != nil {
-			klog.Warningf("Couldn't restart docker inside minikbue within '%v' because: %v", name, err)
+			klog.Warningf("Couldn't restart docker inside minikube within '%v' because: %v", name, err)
 			return
 		}
 		// if we get to the point that we have to restart docker (instead of reload)

Diff for: deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml

@@ -40,8 +40,7 @@ oom_score = 0
     [plugins."io.containerd.grpc.v1.cri".containerd]
       discard_unpacked_layers = true
       snapshotter = "overlayfs"
-      [plugins."io.containerd.grpc.v1.cri".containerd.default_runtime]
-        runtime_type = "io.containerd.runc.v2"
+      default_runtime_name = "runc"
       [plugins."io.containerd.grpc.v1.cri".containerd.untrusted_workload_runtime]
         runtime_type = ""
         runtime_engine = ""
@@ -54,7 +53,7 @@ oom_score = 0
 
     [plugins."io.containerd.grpc.v1.cri".cni]
       bin_dir = "/opt/cni/bin"
-      conf_dir = "/etc/cni/net.mk"
+      conf_dir = "/etc/cni/net.d"
       conf_template = ""
     [plugins."io.containerd.grpc.v1.cri".registry]
       config_path = "/etc/containerd/certs.d"

Diff for: deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml.default

@@ -15,6 +15,6 @@ sha256 85a531725f15e2d136131119d42af4507a5389e0947015152075c4c93816fb5c v1.4.12.
 sha256 7507913ba169c103ab67bc51bec31cd977d4348d7bc842da32b7eab5f930a14b v1.5.10.tar.gz
 sha256 02b79d5e2b07b5e64cd28f1fe84395ee11eef95fc49fd923a9ab93022b148be6 v1.5.11.tar.gz
 sha256 f422e21e35705d1e741c1f3280813e43f811eaff4dcc5cdafac8b8952b15f468 v1.6.4.tar.gz
-sha265 27afb673c20d53aa5c31aec07b38eb7e4dc911e7e1f0c76fac9513bbf070bd24 v1.6.6.tar.gz
+sha256 27afb673c20d53aa5c31aec07b38eb7e4dc911e7e1f0c76fac9513bbf070bd24 v1.6.6.tar.gz
 sha256 f5f938513c28377f64f85e84f2750d39f26b01262f3a062b7e8ce35b560ca407 v1.6.8.tar.gz
 sha256 a034b2273533207d5d96bef8bd3fce1efff85139815efb756d90c705ae1a05ce v1.6.9.tar.gz

Diff for: deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash

@@ -14,6 +14,7 @@ CONTAINERD_BIN_AARCH64_ENV = \
 	CGO_ENABLED=1 \
 	GO111MODULE=off \
 	GOPATH="$(CONTAINERD_BIN_AARCH64_GOPATH)" \
+	GOBIN="$(CONTAINERD_BIN_AARCH64_GOPATH)/bin" \
 	PATH=$(CONTAINERD_BIN_AARCH64_GOPATH)/bin:$(BR_PATH) \
 	GOARCH=arm64
 

Diff for: deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk

@@ -15,8 +15,9 @@ ExecStart=/usr/bin/containerd \
       $CONTAINERD_MINIKUBE_OPTIONS \
       --root ${PERSISTENT_DIR}/var/lib/containerd
 TasksMax=8192
+# ref: https://github.com/containerd/containerd/blob/main/docs/ops.md#systemd
 Delegate=yes
-KillMode=mixed
+KillMode=process
 LimitNOFILE=1048576
 # Having non-zero Limit*s causes performance problems due to accounting overhead
 # in the kernel. We recommend using cgroups to do container-local accounting.

Diff for: deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd.service

@@ -40,8 +40,7 @@ oom_score = 0
     [plugins."io.containerd.grpc.v1.cri".containerd]
       discard_unpacked_layers = true
       snapshotter = "overlayfs"
-      [plugins."io.containerd.grpc.v1.cri".containerd.default_runtime]
-        runtime_type = "io.containerd.runc.v2"
+      default_runtime_name = "runc"
       [plugins."io.containerd.grpc.v1.cri".containerd.untrusted_workload_runtime]
         runtime_type = ""
         runtime_engine = ""
@@ -54,11 +53,11 @@ oom_score = 0
 
     [plugins."io.containerd.grpc.v1.cri".cni]
       bin_dir = "/opt/cni/bin"
-      conf_dir = "/etc/cni/net.mk"
+      conf_dir = "/etc/cni/net.d"
       conf_template = ""
     [plugins."io.containerd.grpc.v1.cri".registry]
       config_path = "/etc/containerd/certs.d"
-      
+
   [plugins."io.containerd.service.v1.diff-service"]
     default = ["walking"]
   [plugins."io.containerd.gc.v1.scheduler"]

Diff for: deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml

@@ -15,8 +15,9 @@ ExecStart=/usr/bin/containerd \
       $CONTAINERD_MINIKUBE_OPTIONS \
       --root ${PERSISTENT_DIR}/var/lib/containerd
 TasksMax=8192
+# ref: https://github.com/containerd/containerd/blob/main/docs/ops.md#systemd
 Delegate=yes
-KillMode=mixed
+KillMode=process
 LimitNOFILE=1048576
 # Having non-zero Limit*s causes performance problems due to accounting overhead
 # in the kernel. We recommend using cgroups to do container-local accounting.

Diff for: deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml.default

@@ -1,7 +1,7 @@
 version = 2
-root = "/var/lib/containerd"                                     
+root = "/var/lib/containerd"
 state = "/run/containerd"
-oom_score = 0      
+oom_score = 0
 # imports
 
 [grpc]
@@ -40,8 +40,7 @@ oom_score = 0
     [plugins."io.containerd.grpc.v1.cri".containerd]
       discard_unpacked_layers = true
       snapshotter = "overlayfs"
-      [plugins."io.containerd.grpc.v1.cri".containerd.default_runtime]
-        runtime_type = "io.containerd.runc.v2"
+      default_runtime_name = "runc"
       [plugins."io.containerd.grpc.v1.cri".containerd.untrusted_workload_runtime]
         runtime_type = ""
         runtime_engine = ""
@@ -54,7 +53,7 @@ oom_score = 0
 
     [plugins."io.containerd.grpc.v1.cri".cni]
       bin_dir = "/opt/cni/bin"
-      conf_dir = "/etc/cni/net.mk"
+      conf_dir = "/etc/cni/net.d"
       conf_template = ""
     [plugins."io.containerd.grpc.v1.cri".registry]
       config_path = "/etc/containerd/certs.d"