From 3aabba753511f05660ea32e0bfb934941578307d Mon Sep 17 00:00:00 2001
From: Xavier Mehrenberger <Lastpixl@users.noreply.github.com>
Date: Thu, 24 Aug 2017 16:01:30 +0200
Subject: [PATCH] Remove discontinued option --reconcile-cidr if
kube_network_plugin=="cloud" (#1568)
---
roles/kubernetes/node/templates/kubelet.j2 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/roles/kubernetes/node/templates/kubelet.j2 b/roles/kubernetes/node/templates/kubelet.j2
index cb5935178..6abea5db5 100644
--- a/roles/kubernetes/node/templates/kubelet.j2
+++ b/roles/kubernetes/node/templates/kubelet.j2
@@ -61,8 +61,7 @@ KUBELET_NETWORK_PLUGIN="--network-plugin=cni --network-plugin-dir=/etc/cni/net.d
{% elif kube_network_plugin is defined and kube_network_plugin == "weave" %}
DOCKER_SOCKET="--docker-endpoint=unix:/var/run/weave/weave.sock"
{% elif kube_network_plugin is defined and kube_network_plugin == "cloud" %}
-# Please note that --reconcile-cidr is deprecated and a no-op in Kubernetes 1.5 but still required in 1.4
-KUBELET_NETWORK_PLUGIN="--hairpin-mode=promiscuous-bridge --network-plugin=kubenet --reconcile-cidr=true"
+KUBELET_NETWORK_PLUGIN="--hairpin-mode=promiscuous-bridge --network-plugin=kubenet"
{% endif %}
# Should this cluster be allowed to run privileged docker containers
KUBE_ALLOW_PRIV="--allow-privileged=true"
--
GitLab