From 1bfbc5bbc483c94d2bc4a2cd5864e7a9db9c3b51 Mon Sep 17 00:00:00 2001
From: Zou Nengren <zounengren@cmss.chinamobile.com>
Date: Thu, 15 Aug 2019 20:30:33 +0800
Subject: [PATCH] remove resource-container default value for kube-proxy
(#4994)
---
roles/kubernetes/master/defaults/main/kube-proxy.yml | 4 ----
.../master/templates/kubeadm-config.v1beta1.yaml.j2 | 1 -
.../master/templates/kubeadm-config.v1beta2.yaml.j2 | 1 -
3 files changed, 6 deletions(-)
diff --git a/roles/kubernetes/master/defaults/main/kube-proxy.yml b/roles/kubernetes/master/defaults/main/kube-proxy.yml
index 0452b2277..d0725ba19 100644
--- a/roles/kubernetes/master/defaults/main/kube-proxy.yml
+++ b/roles/kubernetes/master/defaults/main/kube-proxy.yml
@@ -101,10 +101,6 @@ kube_proxy_oom_score_adj: -999
# in order to proxy service traffic. If unspecified, 0, or (0-0) then ports will be randomly chosen.
kube_proxy_port_range: ''
-# resourceContainer is the absolute name of the resource-only container to create and run
-# the Kube-proxy in (Default: /kube-proxy).
-kube_proxy_resource_container: /kube-proxy
-
# udpIdleTimeout is how long an idle UDP connection will be kept open (e.g. '250ms', '2s').
# Must be greater than 0. Only applicable for proxyMode=userspace.
kube_proxy_udp_idle_timeout: 250ms
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
index 1c177ba9c..d79843204 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
@@ -327,5 +327,4 @@ mode: {{ kube_proxy_mode }}
nodePortAddresses: {{ kube_proxy_nodeport_addresses }}
oomScoreAdj: {{ kube_proxy_oom_score_adj }}
portRange: {{ kube_proxy_port_range }}
-resourceContainer: {{ kube_proxy_resource_container }}
udpIdleTimeout: {{ kube_proxy_udp_idle_timeout }}
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2
index f92edb508..645a0ec1a 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2
@@ -329,5 +329,4 @@ mode: {{ kube_proxy_mode }}
nodePortAddresses: {{ kube_proxy_nodeport_addresses }}
oomScoreAdj: {{ kube_proxy_oom_score_adj }}
portRange: {{ kube_proxy_port_range }}
-resourceContainer: {{ kube_proxy_resource_container }}
udpIdleTimeout: {{ kube_proxy_udp_idle_timeout }}
--
GitLab