• k8s-merge-robot's avatar
    Merge pull request #24172 from andyzheng0831/fix · a12cec52
    k8s-merge-robot authored
    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
    a12cec52
Name
Last commit
Last update
..
addons Loading commit data...
aws Loading commit data...
azure Loading commit data...
centos Loading commit data...
cloudimages Loading commit data...
gce Loading commit data...
gke Loading commit data...
images Loading commit data...
juju Loading commit data...
kubemark Loading commit data...
lib Loading commit data...
libvirt-coreos Loading commit data...
mesos/docker Loading commit data...
ovirt Loading commit data...
rackspace Loading commit data...
saltbase Loading commit data...
ubuntu Loading commit data...
vagrant Loading commit data...
vsphere Loading commit data...
OWNERS Loading commit data...
README.md Loading commit data...
common.sh Loading commit data...
get-kube-local.sh Loading commit data...
get-kube.sh Loading commit data...
kube-down.sh Loading commit data...
kube-push.sh Loading commit data...
kube-up.sh Loading commit data...
kube-util.sh Loading commit data...
kubectl.sh Loading commit data...
log-dump.sh Loading commit data...
options.md Loading commit data...
test-e2e.sh Loading commit data...
test-network.sh Loading commit data...
test-smoke.sh Loading commit data...
update-storage-objects.sh Loading commit data...
validate-cluster.sh Loading commit data...