k3s/cluster/gce/coreos/kube-manifests
k8s-merge-robot 5c08302954 Merge pull request #26006 from euank/service-cluster-ip-range
Automatic merge from submit-queue

cluster/gce/coreos: Set service-cluster-ip-range

Broken by #19242 

See also #26002 

This is necessary to kube-up for me, but depending on how #26002 plays out, this PR might not be necessary. Happy to close this or merge or whatever depending on what's best.

cc @yifan-gu @sjpotter @mikedanese
2016-05-21 12:43:48 -07:00
..
addons cluster/gce/coreos: Update addon manifests. 2016-05-17 14:27:57 -07:00
etcd-events.yaml cluster/gce/coreos: Update addon manifests. 2016-05-17 14:27:57 -07:00
etcd.yaml cluster/gce/coreos: Update addon manifests. 2016-05-17 14:27:57 -07:00
kube-addon-manager.yaml cluster/gce/coreos: Use kube-addon manager pod to update addons. 2016-05-17 14:27:57 -07:00
kube-apiserver.yaml cluster/gce/coreos: Update addon manifests. 2016-05-17 14:27:57 -07:00
kube-controller-manager.yaml Merge pull request #26006 from euank/service-cluster-ip-range 2016-05-21 12:43:48 -07:00
kube-scheduler.yaml cluster/gce/coreos: Update addon manifests. 2016-05-17 14:27:57 -07:00
kube-system.json cluster/gce/coreos: Add manifests for addons and master components. 2016-01-21 16:32:15 -08:00
kubelet-config.yaml cluster/gce/coreos: Add manifests for addons and master components. 2016-01-21 16:32:15 -08:00
kubeproxy-config.yaml cluster/gce/coreos: Add manifests for addons and master components. 2016-01-21 16:32:15 -08:00