k8s-merge-robot 1f18eee335 Merge pull request #27092 from euank/monitoring-api-version ...

Automatic merge from submit-queue

cluster/gce/coreos: Update heapster apiVersion

This fixes an inadvertant search-replace error in #26617.
The error was missed then because the search-replace issue wasn't
present in the standalone controllers, but was in all the others.

I verified that with this change heapster comes up under the default influxdb monitoring and without this change addon manager spits out validation failure errors for the heapster yaml.

cc @yifan-gu

2016-06-10 01:01:44 -07:00

..

coreos

cluster/gce/coreos: Update heapster apiVersion

2016-06-08 16:55:18 -07:00

debian

Make bigger master root disks in GCE for large clusters

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

gci

Accept ICMP in INPUT/FORWARD chain of filter table

2016-06-08 17:34:11 -07:00

trusty

Rename ENABLE_NODE_AUTOSCALER to ENABLE_CLUSTER_AUTOSCALER - part 1

2016-06-08 13:35:38 +02: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

Rename ENABLE_NODE_AUTOSCALER to ENABLE_CLUSTER_AUTOSCALER - part 1

2016-06-08 13:35:38 +02:00

config-test.sh

Rename ENABLE_NODE_AUTOSCALER to ENABLE_CLUSTER_AUTOSCALER - part 1

2016-06-08 13:35:38 +02:00

configure-vm.sh

Rename ENABLE_NODE_AUTOSCALER to ENABLE_CLUSTER_AUTOSCALER - part 1

2016-06-08 13:35:38 +02: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

Rename ENABLE_NODE_AUTOSCALER to ENABLE_CLUSTER_AUTOSCALER - part 1

2016-06-08 13:35:38 +02:00