k8s-merge-robot 51203dad7a Merge pull request #25763 from andyzheng0831/gci-image ...

Automatic merge from submit-queue

GCI: Fix the condition for using the default image

This PR revises the condition for using the default GCI image. The old logic is not convenient for manually run e2e tests in some cases (mainly for GCI team to test custom images). The new logic by this PR is very similar to the logic in using ContainerVM. When setting distro to "gci", if master or node image is unset, we use gci-dev for it. If either is set, we respect it.

@roberthbailey @zmerlynn @dchen1107 please review it, and we should cherry pick it in release-1.2 branch. Thanks!

cc/ @kubernetes/goog-image @adityakali FYI

2016-05-17 22:55:41 -07:00

..

coreos

Make bigger master root disks in GCE for large clusters

2016-05-16 15:57:56 +02:00

debian

Make bigger master root disks in GCE for large clusters

2016-05-16 15:57:56 +02:00

trusty

Merge pull request #25706 from andyzheng0831/find-cmd

2016-05-17 00:42:11 -07:00

config-common.sh

kube-up for GCE chooses master size based on number of nodes

2016-03-02 12:27:54 +01:00

config-default.sh

Merge pull request #25357 from mwielgus/ca-salt

2016-05-15 11:35:19 -07:00

config-test.sh

Change default clusterCIDRs to /14

2016-05-10 12:44:49 +02:00

configure-vm.sh

Merge pull request #25357 from mwielgus/ca-salt

2016-05-15 11:35:19 -07:00

delete-stranded-load-balancers.sh

Replace awkward bash pipelines with gcloud's --format='value()'

2016-05-06 15:49:57 -07:00

list-resources.sh

Fix list-resources grep

2016-04-08 12:19:24 -07:00

upgrade.sh

Move KUBERNETES_PROVIDER setting into cluster/kube-util.sh.

2016-03-08 16:51:20 -08:00

util.sh

Merge pull request #25763 from andyzheng0831/gci-image

2016-05-17 22:55:41 -07:00