k8s-merge-robot b91af0fab9 Merge pull request #26785 from a-robinson/es-master ...

Automatic merge from submit-queue

Don't run fluentd-es on GCI masters

It isn't run on containervm masters. It can't do anything on the master because the master doesn't have kube-proxy running to enable fluentd to talk to the elasticsearch service.

@andyzheng0831

2016-06-04 08:22:18 -07:00

..

coreos

Set Dashboard UI version to v1.1.0-beta1

2016-06-03 15:34:42 +02:00

debian

Make bigger master root disks in GCE for large clusters

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

gci

Don't run fluentd-es on GCI masters

2016-06-03 11:54:01 -04:00

trusty

Merge pull request #26745 from andyzheng0831/docker-reg

2016-06-03 07:31:10 -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

Move the defaults setting of GCI to util.sh

2016-06-01 15:37:02 -07:00

config-test.sh

Move the defaults setting of GCI to util.sh

2016-06-01 15:37:02 -07:00

configure-vm.sh

Merge pull request #26156 from gmarek/base64

2016-05-29 09:45:49 -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

pin GCI version to milestone 52

2016-06-02 13:52:38 -07:00