Merge pull request #6473 from VerwaerdeWim/capd-worker-node-containerd

🐛 CAPD: Add containerd socket to worker nodes
kubernetes-sigs · May 3, 2022 · 2c515c5 · 2c515c5
2 parents e77f474 + e2b323b
commit 2c515c5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/test/infrastructure/docker/templates/cluster-template-development.yaml b/test/infrastructure/docker/templates/cluster-template-development.yaml
@@ -48,6 +48,7 @@ spec:
         certSANs: [localhost, 127.0.0.1, 0.0.0.0]
     initConfiguration:
       nodeRegistration:
+        # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found
         criSocket: unix:///var/run/containerd/containerd.sock
         kubeletExtraArgs:
           # We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
@@ -56,6 +57,7 @@ spec:
           eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
     joinConfiguration:
       nodeRegistration:
+        # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found
         criSocket: unix:///var/run/containerd/containerd.sock
         kubeletExtraArgs:
           # We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
@@ -98,6 +100,8 @@ spec:
     spec:
       joinConfiguration:
         nodeRegistration:
+          # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found
+          criSocket: unix:///var/run/containerd/containerd.sock
           kubeletExtraArgs:
             # We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
             # kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726

diff --git a/test/infrastructure/docker/templates/clusterclass-quick-start.yaml b/test/infrastructure/docker/templates/clusterclass-quick-start.yaml
@@ -219,6 +219,7 @@ spec:
             certSANs: [localhost, 127.0.0.1, 0.0.0.0]
         initConfiguration:
           nodeRegistration:
+            # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found
             criSocket: unix:///var/run/containerd/containerd.sock
             kubeletExtraArgs:
               # We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
@@ -227,6 +228,7 @@ spec:
               eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
         joinConfiguration:
           nodeRegistration:
+            # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found
             criSocket: unix:///var/run/containerd/containerd.sock
             kubeletExtraArgs:
               # We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
@@ -265,6 +267,8 @@ spec:
     spec:
       joinConfiguration:
         nodeRegistration:
+          # We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found
+          criSocket: unix:///var/run/containerd/containerd.sock
           kubeletExtraArgs:
             # We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
             # kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726