diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 index 44d16ddf4597931c85799cbf27954649420addc4..bdef515fc2fc50c64297fea44bca2995055e6dcc 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 22422fb2e20b12e18d1fd729462d1f3300e6a9b9..c418d5aec81fb652e54d6cbd64d44e45f72e7eeb 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 193f9cc3745bcddde7e0457477cb710b064f3529..84d59c93e2254ac83b640278d49385470dead1b0 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 dcc53366727b097a59e3e6b1d4bcb65a63098600..b40963b3e0a2bb87eaeeba3d156ef6c9182af977 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 %}