Merge pull request #6169 from shubham14bajpai/criSocket

🌱 Prefix criSocket path with unix:// in test configuration YAMLs
kubernetes-sigs · Feb 18, 2022 · 82a6513 · 82a6513
2 parents 07a9e53 + 5550b5a
commit 82a6513
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 33 deletions.
diff --git a/cmd/clusterctl/client/cluster/assets/topology-test/existing-my-cluster.yaml b/cmd/clusterctl/client/cluster/assets/topology-test/existing-my-cluster.yaml
@@ -88,14 +88,14 @@ spec:
     initConfiguration:
       localAPIEndpoint: {}
       nodeRegistration:
-        criSocket: /var/run/containerd/containerd.sock
+        criSocket: unix:///var/run/containerd/containerd.sock
         kubeletExtraArgs:
           cgroup-driver: cgroupfs
           eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
     joinConfiguration:
       discovery: {}
       nodeRegistration:
-        criSocket: /var/run/containerd/containerd.sock
+        criSocket: unix:///var/run/containerd/containerd.sock
         kubeletExtraArgs:
           cgroup-driver: cgroupfs
           eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%

diff --git a/cmd/clusterctl/client/cluster/assets/topology-test/existing-my-second-cluster.yaml b/cmd/clusterctl/client/cluster/assets/topology-test/existing-my-second-cluster.yaml
@@ -89,14 +89,14 @@ spec:
     initConfiguration:
       localAPIEndpoint: {}
       nodeRegistration:
-        criSocket: /var/run/containerd/containerd.sock
+        criSocket: unix:///var/run/containerd/containerd.sock
         kubeletExtraArgs:
           cgroup-driver: cgroupfs
           eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
     joinConfiguration:
       discovery: {}
       nodeRegistration:
-        criSocket: /var/run/containerd/containerd.sock
+        criSocket: unix:///var/run/containerd/containerd.sock
         kubeletExtraArgs:
           cgroup-driver: cgroupfs
           eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%

diff --git a/cmd/clusterctl/client/cluster/assets/topology-test/my-cluster-class.yaml b/cmd/clusterctl/client/cluster/assets/topology-test/my-cluster-class.yaml
@@ -56,15 +56,15 @@ spec:
             certSANs: [ localhost, 127.0.0.1 ]
         initConfiguration:
           nodeRegistration:
-            criSocket: /var/run/containerd/containerd.sock
+            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
               cgroup-driver: cgroupfs
               eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
         joinConfiguration:
           nodeRegistration:
-            criSocket: /var/run/containerd/containerd.sock
+            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/cmd/clusterctl/client/cluster/assets/topology-test/new-clusterclass-and-cluster.yaml b/cmd/clusterctl/client/cluster/assets/topology-test/new-clusterclass-and-cluster.yaml
@@ -82,15 +82,15 @@ spec:
             certSANs: [ localhost, 127.0.0.1 ]
         initConfiguration:
           nodeRegistration:
-            criSocket: /var/run/containerd/containerd.sock
+            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
               cgroup-driver: cgroupfs
               eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
         joinConfiguration:
           nodeRegistration:
-            criSocket: /var/run/containerd/containerd.sock
+            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/controlplane/kubeadm/api/v1alpha3/webhook_test.go b/controlplane/kubeadm/api/v1alpha3/webhook_test.go
@@ -73,13 +73,13 @@ func TestKubeadmControlPlaneConversion(t *testing.T) {
 				InitConfiguration: &upstreamv1beta1.InitConfiguration{
 					NodeRegistration: upstreamv1beta1.NodeRegistrationOptions{
 						Name:      "foo",
-						CRISocket: "/var/run/containerd/containerd.sock",
+						CRISocket: "unix:///var/run/containerd/containerd.sock",
 					},
 				},
 				JoinConfiguration: &upstreamv1beta1.JoinConfiguration{
 					NodeRegistration: upstreamv1beta1.NodeRegistrationOptions{
 						Name:      "foo",
-						CRISocket: "/var/run/containerd/containerd.sock",
+						CRISocket: "unix:///var/run/containerd/containerd.sock",
 					},
 				},
 			},

diff --git a/docs/book/src/clusterctl/commands/alpha-topology-plan.md b/docs/book/src/clusterctl/commands/alpha-topology-plan.md
@@ -104,13 +104,13 @@ spec:
             certSANs: [ localhost, 127.0.0.1 ]
         initConfiguration:
           nodeRegistration:
-            criSocket: /var/run/containerd/containerd.sock
+            criSocket: unix:///var/run/containerd/containerd.sock
             kubeletExtraArgs:
               cgroup-driver: cgroupfs
               eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
         joinConfiguration:
           nodeRegistration:
-            criSocket: /var/run/containerd/containerd.sock
+            criSocket: unix:///var/run/containerd/containerd.sock
             kubeletExtraArgs:
               cgroup-driver: cgroupfs
               eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'

diff --git a/test/e2e/data/infrastructure-docker/v1alpha3/bases/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-docker/v1alpha3/bases/cluster-with-kcp.yaml
@@ -65,15 +65,15 @@ spec:
         certSANs: [localhost, 127.0.0.1, 0.0.0.0, host.docker.internal]
     initConfiguration:
       nodeRegistration:
-        criSocket: /var/run/containerd/containerd.sock
+        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
           cgroup-driver: cgroupfs
           eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
     joinConfiguration:
       nodeRegistration:
-        criSocket: /var/run/containerd/containerd.sock
+        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/e2e/data/infrastructure-docker/v1alpha3/bases/md.yaml b/test/e2e/data/infrastructure-docker/v1alpha3/bases/md.yaml
@@ -22,7 +22,7 @@ spec:
     spec:
       joinConfiguration:
         nodeRegistration:
-          criSocket: /var/run/containerd/containerd.sock
+          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/e2e/data/infrastructure-docker/v1alpha4/bases/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-docker/v1alpha4/bases/cluster-with-kcp.yaml
@@ -66,15 +66,15 @@ spec:
         certSANs: [localhost, 127.0.0.1, 0.0.0.0, host.docker.internal]
     initConfiguration:
       nodeRegistration:
-        criSocket: /var/run/containerd/containerd.sock
+        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
           cgroup-driver: cgroupfs
           eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
     joinConfiguration:
       nodeRegistration:
-        criSocket: /var/run/containerd/containerd.sock
+        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/e2e/data/infrastructure-docker/v1alpha4/bases/md.yaml b/test/e2e/data/infrastructure-docker/v1alpha4/bases/md.yaml
@@ -22,7 +22,7 @@ spec:
     spec:
       joinConfiguration:
         nodeRegistration:
-          criSocket: /var/run/containerd/containerd.sock
+          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/.../infrastructure-docker/v1alpha4/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml b/.../infrastructure-docker/v1alpha4/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml
@@ -46,15 +46,15 @@ spec:
       certSANs: [localhost, 127.0.0.1]
   initConfiguration:
     nodeRegistration:
-      criSocket: /var/run/containerd/containerd.sock
+      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
         cgroup-driver: cgroupfs
         eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
   joinConfiguration:
     nodeRegistration:
-      criSocket: /var/run/containerd/containerd.sock
+      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/e2e/data/infrastructure-docker/v1beta1/bases/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-docker/v1beta1/bases/cluster-with-kcp.yaml
@@ -66,15 +66,15 @@ spec:
         certSANs: [localhost, 127.0.0.1, 0.0.0.0, host.docker.internal]
     initConfiguration:
       nodeRegistration:
-        criSocket: /var/run/containerd/containerd.sock
+        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
           cgroup-driver: cgroupfs
           eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
     joinConfiguration:
       nodeRegistration:
-        criSocket: /var/run/containerd/containerd.sock
+        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/e2e/data/infrastructure-docker/v1beta1/bases/md.yaml b/test/e2e/data/infrastructure-docker/v1beta1/bases/md.yaml
@@ -22,7 +22,7 @@ spec:
     spec:
       joinConfiguration:
         nodeRegistration:
-          criSocket: /var/run/containerd/containerd.sock
+          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/...a/infrastructure-docker/v1beta1/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml b/...a/infrastructure-docker/v1beta1/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml
@@ -46,15 +46,15 @@ spec:
       certSANs: [localhost, 127.0.0.1]
   initConfiguration:
     nodeRegistration:
-      criSocket: /var/run/containerd/containerd.sock
+      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
         cgroup-driver: cgroupfs
         eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
   joinConfiguration:
     nodeRegistration:
-      criSocket: /var/run/containerd/containerd.sock
+      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/e2e/data/infrastructure-docker/v1beta1/clusterclass-quick-start.yaml b/test/e2e/data/infrastructure-docker/v1beta1/clusterclass-quick-start.yaml
@@ -154,15 +154,15 @@ spec:
             certSANs: [localhost, 127.0.0.1, 0.0.0.0, host.docker.internal]
         initConfiguration:
           nodeRegistration:
-            criSocket: /var/run/containerd/containerd.sock
+            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
               cgroup-driver: cgroupfs
               eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
         joinConfiguration:
           nodeRegistration:
-            criSocket: /var/run/containerd/containerd.sock
+            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
@@ -200,7 +200,7 @@ spec:
     spec:
       joinConfiguration:
         nodeRegistration:
-          criSocket: /var/run/containerd/containerd.sock
+          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/internal/provisioning/cloudinit/kindadapter_test.go b/test/infrastructure/docker/internal/provisioning/cloudinit/kindadapter_test.go
@@ -99,7 +99,7 @@ write_files:
         \ v1.13.6\nnetworking:\n  dnsDomain: cluster.local\n  podSubnet: 192.168.0.0/16\n\
         \  serviceSubnet: 10.96.0.0/12\nscheduler: {}\n\n---\napiVersion: kubeadm.k8s.io/v1beta1\n\
         kind: InitConfiguration\nlocalAPIEndpoint:\n  advertiseAddress: \"\"\n  bindPort:\
-        \ 0\nnodeRegistration:\n  criSocket: /var/run/containerd/containerd.sock\n\
+        \ 0\nnodeRegistration:\n  criSocket: unix:///var/run/containerd/containerd.sock\n\
         \  kubeletExtraArgs:\n    cloud-provider: aws\n  name: 'ip-10-0-0-223.us-west-2.compute.internal'\n"
     owner: root:root
     path: /run/kubeadm/kubeadm.yaml

diff --git a/test/infrastructure/docker/templates/cluster-template-development.yaml b/test/infrastructure/docker/templates/cluster-template-development.yaml
@@ -48,15 +48,15 @@ spec:
         certSANs: [localhost, 127.0.0.1, 0.0.0.0]
     initConfiguration:
       nodeRegistration:
-        criSocket: /var/run/containerd/containerd.sock
+        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
           cgroup-driver: cgroupfs
           eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
     joinConfiguration:
       nodeRegistration:
-        criSocket: /var/run/containerd/containerd.sock
+        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
@@ -151,15 +151,15 @@ spec:
             certSANs: [localhost, 127.0.0.1, 0.0.0.0]
         initConfiguration:
           nodeRegistration:
-            criSocket: /var/run/containerd/containerd.sock
+            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
               cgroup-driver: cgroupfs
               eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
         joinConfiguration:
           nodeRegistration:
-            criSocket: /var/run/containerd/containerd.sock
+            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