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

Merge pull request #26006 from euank/service-cluster-ip-range
5c083029 · k8s-merge-robot · 4bb085c9 · 6fa5a13f · 5c083029
Commit 5c083029 authored May 21, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

kube-controller-manager.yaml ...er/gce/coreos/kube-manifests/kube-controller-manager.yaml +1 -0

No files found.
--- a/cluster/gce/coreos/kube-manifests/kube-controller-manager.yaml
+++ b/cluster/gce/coreos/kube-manifests/kube-controller-manager.yaml
@@ -12,6 +12,7 @@ spec:
      --master=127.0.0.1:8080
      --cluster-name=${INSTANCE_PREFIX}
      --cluster-cidr=${CLUSTER_IP_RANGE}
+      --service-cluster-ip-range="${SERVICE_CLUSTER_IP_RANGE}"
      --allocate-node-cidrs=true
      --cloud-provider=gce
      --service-account-private-key-file=/srv/kubernetes/server.key