Merge pull request #22313 from andyzheng0831/fix

Fix a breakage of kube-proxy in Trusty
pull/6/head
Jeff Lowdermilk 2016-03-02 16:19:02 -08:00
commit 5214ae1c89
1 changed files with 1 additions and 0 deletions

View File

@ -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}