Merge pull request #475 from treydock/unix-socket

Update criSocket to avoid deprecation warnings
puppetlabs · Feb 22, 2021 · e5d338e · e5d338e
2 parents 66cdd45 + da53186
commit e5d338e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/templates/v1alpha3/config_kubeadm.yaml.erb b/templates/v1alpha3/config_kubeadm.yaml.erb
@@ -15,7 +15,7 @@ kind: InitConfiguration
 nodeRegistration:
   name: <%= @node_name %>
   <%- if @container_runtime == "cri_containerd" -%>
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   <%- end -%>
   kubeletExtraArgs:
     cgroup-driver: <%= @cgroup_driver %>
@@ -99,7 +99,7 @@ clusterName: <%= @kubernetes_cluster_name %>
 nodeRegistration:
   name: <%= @node_name %>
   <%- if @container_runtime == "cri_containerd" -%>
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   <%- end -%>
   kubeletExtraArgs:
     cgroup-driver: <%= @cgroup_driver %>

diff --git a/templates/v1alpha3/config_worker.yaml.erb b/templates/v1alpha3/config_worker.yaml.erb
@@ -23,7 +23,7 @@ token: <%= @token %>
 nodeRegistration:
   name: <%= @node_name %>
   <%- if @container_runtime == "cri_containerd" -%>
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   <%- end -%>
   kubeletExtraArgs:
     cgroup-driver: <%= @cgroup_driver %>

diff --git a/templates/v1beta1/config_kubeadm.yaml.erb b/templates/v1beta1/config_kubeadm.yaml.erb
@@ -15,7 +15,7 @@ localAPIEndpoint:
 nodeRegistration:
   name: <%= @node_name %>
   <%- if @container_runtime == "cri_containerd" -%>
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   <%- end -%>
   kubeletExtraArgs:
     cgroup-driver: <%= @cgroup_driver %>

diff --git a/templates/v1beta1/config_worker.yaml.erb b/templates/v1beta1/config_worker.yaml.erb
@@ -13,7 +13,7 @@ discovery:
 nodeRegistration:
   name: <%= @node_name %>
   <%- if @container_runtime == "cri_containerd" -%>
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   <%- end -%>
   kubeletExtraArgs:
     cgroup-driver: <%= @cgroup_driver %>

diff --git a/templates/v1beta2/config_kubeadm.yaml.erb b/templates/v1beta2/config_kubeadm.yaml.erb
@@ -14,7 +14,7 @@ localAPIEndpoint:
 nodeRegistration:
   name: <%= @node_name %>
   <%- if @container_runtime == "cri_containerd" -%>
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   <%- end -%>
   taints:
   - effect: NoSchedule

diff --git a/templates/v1beta2/config_worker.yaml.erb b/templates/v1beta2/config_worker.yaml.erb
@@ -16,7 +16,7 @@ discovery:
 nodeRegistration:
   name: <%= @node_name %>
   <%- if @container_runtime == "cri_containerd" -%>
-  criSocket: /run/containerd/containerd.sock
+  criSocket: unix:///run/containerd/containerd.sock
   taints: null
   <%- end -%>
   kubeletExtraArgs: