From a9bb72c6fdffa6bc2ec36c840eb3894efb4058d7 Mon Sep 17 00:00:00 2001
From: abelgana <32614067+abelgana@users.noreply.github.com>
Date: Tue, 9 Jan 2018 14:35:42 -0500
Subject: [PATCH] require-kubeconfig is depricated since k8s v1.8
---
roles/kubernetes/node/templates/kubelet.standard.env.j2 | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/roles/kubernetes/node/templates/kubelet.standard.env.j2 b/roles/kubernetes/node/templates/kubelet.standard.env.j2
index e50446a86..da4480f70 100644
--- a/roles/kubernetes/node/templates/kubelet.standard.env.j2
+++ b/roles/kubernetes/node/templates/kubelet.standard.env.j2
@@ -45,7 +45,11 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
{% set kubelet_args_dns %}{{ kubelet_args_cluster_dns }} --cluster-domain={{ dns_domain }} --resolv-conf={{ kube_resolv_conf }}{% endset %}
{# Location of the apiserver #}
+{% if kube_version | version_compare('v1.8', '<') %}
{% set kubelet_args_kubeconfig %}--kubeconfig={{ kube_config_dir}}/node-kubeconfig.yaml --require-kubeconfig{% endset %}
+{% else %}
+{% set kubelet_args_kubeconfig %}--kubeconfig={{ kube_config_dir}}/node-kubeconfig.yaml{% endset %}
+{% endif %}
{% if standalone_kubelet|bool %}
{# We are on a master-only host. Make the master unschedulable in this case. #}
--
GitLab