From 9ae2eefb9a87d4cbaefffca8fc96bd497fbaae89 Mon Sep 17 00:00:00 2001
From: Danny Kulchinsky <dannyk@tuenti.com>
Date: Mon, 19 Nov 2018 03:39:29 -0500
Subject: [PATCH] Add resource-container flag to kube-proxy manifest (#3519)
* Add resource-container flag to kube-proxy manifest
* add resourceContainer: "" to kubeadm kube-proxy configs
---
.../kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 | 1 +
.../kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 | 1 +
.../kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 | 2 +-
.../kubernetes/node/templates/manifests/kube-proxy.manifest.j2 | 1 +
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
index 44d16ddf4..bdef515fc 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
@@ -39,6 +39,7 @@ kubeProxy:
{% if kube_proxy_nodeport_addresses %}
nodePortAddresses: [{{ kube_proxy_nodeport_addresses_cidr }}]
{% endif %}
+ resourceContainer: ""
authorizationModes:
{% for mode in authorization_modes %}
- {{ mode }}
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
index 22422fb2e..c418d5aec 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
@@ -31,6 +31,7 @@ kubeProxy:
{% if kube_proxy_nodeport_addresses %}
nodePortAddresses: [{{ kube_proxy_nodeport_addresses_cidr }}]
{% endif %}
+ resourceContainer: ""
authorizationModes:
{% for mode in authorization_modes %}
- {{ mode }}
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
index 193f9cc37..84d59c93e 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
@@ -197,5 +197,5 @@ nodePortAddresses: [{{ kube_proxy_nodeport_addresses_cidr }}]
{% endif %}
oomScoreAdj: -999
portRange: ""
-resourceContainer: /kube-proxy
+resourceContainer: ""
udpIdleTimeout: 250ms
diff --git a/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2 b/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
index dcc533667..b40963b3e 100644
--- a/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
+++ b/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
@@ -48,6 +48,7 @@ spec:
- --proxy-mode={{ kube_proxy_mode }}
- --oom-score-adj=-998
- --healthz-bind-address={{ kube_proxy_healthz_bind_address }}
+ - --resource-container=""
{% if kube_proxy_nodeport_addresses %}
- --nodeport-addresses={{ kube_proxy_nodeport_addresses_cidr }}
{% endif %}
--
GitLab