From da531865afb90e951c4d0a13b5ac8999fcd9bd87 Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Thu, 21 Jan 2021 14:45:29 -0500 Subject: [PATCH] Update criSocket to avoid deprecation warnings --- templates/v1alpha3/config_kubeadm.yaml.erb | 4 ++-- templates/v1alpha3/config_worker.yaml.erb | 2 +- templates/v1beta1/config_kubeadm.yaml.erb | 2 +- templates/v1beta1/config_worker.yaml.erb | 2 +- templates/v1beta2/config_kubeadm.yaml.erb | 2 +- templates/v1beta2/config_worker.yaml.erb | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/v1alpha3/config_kubeadm.yaml.erb b/templates/v1alpha3/config_kubeadm.yaml.erb index b2726e22..ef8c2cc6 100644 --- 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 index cc27668b..bc35045b 100644 --- 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 index e70fde83..4acf5081 100644 --- 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 index 1c8cb8ea..5afd48ef 100644 --- 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 index f9c34389..fa8b8873 100644 --- 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 index 47f9f204..95c738df 100644 --- 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: