From 0ee1bd6160ab2c7240bdb19efc9c83dd55a72587 Mon Sep 17 00:00:00 2001 From: Andy Zheng Date: Tue, 1 Mar 2016 14:57:37 -0800 Subject: [PATCH] Fix a breakage of kube-proxy in Trusty PR #22022 added a new variable "cpurequest" in kube-proxy.manifest. This makes kubelet in Trusty fail to start the kube-proxy pod as this variable value is not set. --- cluster/gce/trusty/node.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cluster/gce/trusty/node.yaml b/cluster/gce/trusty/node.yaml index 6a95fb18295..364b2e1cbc4 100644 --- a/cluster/gce/trusty/node.yaml +++ b/cluster/gce/trusty/node.yaml @@ -223,6 +223,7 @@ script sed -i -e "s/{{pillar\['kube_docker_registry'\]}}/${kube_docker_registry}/g" ${tmp_file} sed -i -e "s/{{pillar\['kube-proxy_docker_tag'\]}}/${kube_proxy_docker_tag}/g" ${tmp_file} sed -i -e "s/{{test_args}}/${test_args}/g" ${tmp_file} + sed -i -e "s/{{ cpurequest }}/200m/g" ${tmp_file} sed -i -e "s/{{log_level}}/${log_level}/g" ${tmp_file} sed -i -e "s/{{api_servers_with_port}}/${api_servers}/g" ${tmp_file}