Commit Graph

6 Commits

Author SHA1 Message Date
k8s-merge-robot
a12cec52e5 Merge pull request #24172 from andyzheng0831/fix
Automatic merge from submit-queue

Trusty: Fixes for running GKE master

This PR includes two fixes for running GKE master on our image: 
(1) The kubelet command line assembly had a missing part for cbr0. We did not catch it because the code path is not covered by OSS k8s tests;

(2) Remove the "" from the variables in the cert files. It causes a parsing issue in GKE. Again, this code path is not covered by k8s tests.

This PR also refactors the code for assembling kubelet flag. I move all logic into a single function assemble_kubelet_flags in configure-helper.sh for better readability and also simplify node.yaml and master.yaml. 

@roberthbailey @dchen1107 please review it, and mark it as cherrypick-candidate. This PR is verified by @maisem. Together with his CL for GKE, we can run GKE cluster with master on our image and nodes on ContainerVM.

cc/ @maisem @fabioy @wonderfly FYI
2016-04-13 20:04:15 -07:00
Andy Zheng
b5a1595c98 Trusty: Fix master kubelet command assembly 2016-04-12 15:53:16 -07:00
Andy Zheng
988f16a1e2 Trusty: Avoid unnecessary in-memory temp files 2016-04-11 15:55:01 -07:00
Mike Danese
0a821a473d stop create secrets for dns, it uses the kube-system service account now 2016-03-29 14:27:28 -07:00
Andy Zheng
bfd68b35d8 Trusty: Update heapster manifest handling code 2016-03-24 09:22:30 -07:00
Andy Zheng
0a8e68fb49 Trusty: Avoid reaching GCE custom metadata size limit 2016-03-20 10:22:50 -07:00