Skip to content

Commit 5550b5a

Browse files
shubham14bajpaishubham14bajpai
committed
prefix criSocket path with unix:// in test configuration yamls
1 parent 294917f commit 5550b5a

File tree

18 files changed

+33
-33
lines changed

18 files changed

+33
-33
lines changed

‎cmd/clusterctl/client/cluster/assets/topology-test/existing-my-cluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ spec:
8888
initConfiguration:
8989
localAPIEndpoint: {}
9090
nodeRegistration:
91-
criSocket: /var/run/containerd/containerd.sock
91+
criSocket: unix:///var/run/containerd/containerd.sock
9292
kubeletExtraArgs:
9393
cgroup-driver: cgroupfs
9494
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
9595
joinConfiguration:
9696
discovery: {}
9797
nodeRegistration:
98-
criSocket: /var/run/containerd/containerd.sock
98+
criSocket: unix:///var/run/containerd/containerd.sock
9999
kubeletExtraArgs:
100100
cgroup-driver: cgroupfs
101101
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%

‎cmd/clusterctl/client/cluster/assets/topology-test/existing-my-second-cluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ spec:
8989
initConfiguration:
9090
localAPIEndpoint: {}
9191
nodeRegistration:
92-
criSocket: /var/run/containerd/containerd.sock
92+
criSocket: unix:///var/run/containerd/containerd.sock
9393
kubeletExtraArgs:
9494
cgroup-driver: cgroupfs
9595
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
9696
joinConfiguration:
9797
discovery: {}
9898
nodeRegistration:
99-
criSocket: /var/run/containerd/containerd.sock
99+
criSocket: unix:///var/run/containerd/containerd.sock
100100
kubeletExtraArgs:
101101
cgroup-driver: cgroupfs
102102
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%

‎cmd/clusterctl/client/cluster/assets/topology-test/my-cluster-class.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ spec:
5656
certSANs: [ localhost, 127.0.0.1 ]
5757
initConfiguration:
5858
nodeRegistration:
59-
criSocket: /var/run/containerd/containerd.sock
59+
criSocket: unix:///var/run/containerd/containerd.sock
6060
kubeletExtraArgs:
6161
# We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
6262
# kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726
6363
cgroup-driver: cgroupfs
6464
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
6565
joinConfiguration:
6666
nodeRegistration:
67-
criSocket: /var/run/containerd/containerd.sock
67+
criSocket: unix:///var/run/containerd/containerd.sock
6868
kubeletExtraArgs:
6969
# We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
7070
# kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726

‎cmd/clusterctl/client/cluster/assets/topology-test/new-clusterclass-and-cluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ spec:
8282
certSANs: [ localhost, 127.0.0.1 ]
8383
initConfiguration:
8484
nodeRegistration:
85-
criSocket: /var/run/containerd/containerd.sock
85+
criSocket: unix:///var/run/containerd/containerd.sock
8686
kubeletExtraArgs:
8787
# We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
8888
# kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726
8989
cgroup-driver: cgroupfs
9090
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
9191
joinConfiguration:
9292
nodeRegistration:
93-
criSocket: /var/run/containerd/containerd.sock
93+
criSocket: unix:///var/run/containerd/containerd.sock
9494
kubeletExtraArgs:
9595
# We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
9696
# kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726

‎controlplane/kubeadm/api/v1alpha3/webhook_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ func TestKubeadmControlPlaneConversion(t *testing.T) {
7373
InitConfiguration: &upstreamv1beta1.InitConfiguration{
7474
NodeRegistration: upstreamv1beta1.NodeRegistrationOptions{
7575
Name: "foo",
76-
CRISocket: "/var/run/containerd/containerd.sock",
76+
CRISocket: "unix:///var/run/containerd/containerd.sock",
7777
},
7878
},
7979
JoinConfiguration: &upstreamv1beta1.JoinConfiguration{
8080
NodeRegistration: upstreamv1beta1.NodeRegistrationOptions{
8181
Name: "foo",
82-
CRISocket: "/var/run/containerd/containerd.sock",
82+
CRISocket: "unix:///var/run/containerd/containerd.sock",
8383
},
8484
},
8585
},

‎docs/book/src/clusterctl/commands/alpha-topology-plan.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ spec:
104104
certSANs: [ localhost, 127.0.0.1 ]
105105
initConfiguration:
106106
nodeRegistration:
107-
criSocket: /var/run/containerd/containerd.sock
107+
criSocket: unix:///var/run/containerd/containerd.sock
108108
kubeletExtraArgs:
109109
cgroup-driver: cgroupfs
110110
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
111111
joinConfiguration:
112112
nodeRegistration:
113-
criSocket: /var/run/containerd/containerd.sock
113+
criSocket: unix:///var/run/containerd/containerd.sock
114114
kubeletExtraArgs:
115115
cgroup-driver: cgroupfs
116116
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'

‎test/e2e/data/infrastructure-docker/v1alpha3/bases/cluster-with-kcp.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ spec:
6565
certSANs: [localhost, 127.0.0.1, 0.0.0.0, host.docker.internal]
6666
initConfiguration:
6767
nodeRegistration:
68-
criSocket: /var/run/containerd/containerd.sock
68+
criSocket: unix:///var/run/containerd/containerd.sock
6969
kubeletExtraArgs:
7070
# We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
7171
# kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726
7272
cgroup-driver: cgroupfs
7373
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
7474
joinConfiguration:
7575
nodeRegistration:
76-
criSocket: /var/run/containerd/containerd.sock
76+
criSocket: unix:///var/run/containerd/containerd.sock
7777
kubeletExtraArgs:
7878
# We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
7979
# kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726

‎test/e2e/data/infrastructure-docker/v1alpha3/bases/md.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
spec:
2323
joinConfiguration:
2424
nodeRegistration:
25-
criSocket: /var/run/containerd/containerd.sock
25+
criSocket: unix:///var/run/containerd/containerd.sock
2626
kubeletExtraArgs:
2727
# We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
2828
# kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726

‎test/e2e/data/infrastructure-docker/v1alpha4/bases/cluster-with-kcp.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ spec:
6666
certSANs: [localhost, 127.0.0.1, 0.0.0.0, host.docker.internal]
6767
initConfiguration:
6868
nodeRegistration:
69-
criSocket: /var/run/containerd/containerd.sock
69+
criSocket: unix:///var/run/containerd/containerd.sock
7070
kubeletExtraArgs:
7171
# We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
7272
# kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726
7373
cgroup-driver: cgroupfs
7474
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
7575
joinConfiguration:
7676
nodeRegistration:
77-
criSocket: /var/run/containerd/containerd.sock
77+
criSocket: unix:///var/run/containerd/containerd.sock
7878
kubeletExtraArgs:
7979
# We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
8080
# kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726

‎test/e2e/data/infrastructure-docker/v1alpha4/bases/md.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
spec:
2323
joinConfiguration:
2424
nodeRegistration:
25-
criSocket: /var/run/containerd/containerd.sock
25+
criSocket: unix:///var/run/containerd/containerd.sock
2626
kubeletExtraArgs:
2727
# We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
2828
# kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726

0 commit comments

Comments
 (0)