Merge pull request #39405 from gnufied/fix-kubefed-cluster-ip-bug

Automatic merge from submit-queue (batch tested with PRs 36087, 39405) federation-apiserver doesn't needs cluster-ip range This option has been removed from genericserver options and it is not being used by federation-apiserver anyways. Fixes - #39388

Merge pull request #39405 from gnufied/fix-kubefed-cluster-ip-bug
7d8f29b6 · Kubernetes Submit Queue · GitHub · 016133cf · b09c740f · 7d8f29b6
Commit 7d8f29b6 authored Jan 04, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 04, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

init.go federation/pkg/kubefed/init/init.go +0 -1

init_test.go federation/pkg/kubefed/init/init_test.go +0 -1

No files found.
--- a/federation/pkg/kubefed/init/init.go
+++ b/federation/pkg/kubefed/init/init.go
@@ -412,7 +412,6 @@ func createAPIServer(clientset *client.Clientset, namespace, name, image, creden
 		"federation-apiserver",
 		"--bind-address=0.0.0.0",
 		"--etcd-servers=http://localhost:2379",
-		"--service-cluster-ip-range=10.0.0.0/16",
 		"--secure-port=443",
 		"--client-ca-file=/etc/federation/apiserver/ca.crt",
 		"--tls-cert-file=/etc/federation/apiserver/server.crt",

--- a/federation/pkg/kubefed/init/init_test.go
+++ b/federation/pkg/kubefed/init/init_test.go
@@ -562,7 +562,6 @@ func fakeInitHostFactory(federationName, namespaceName, ip, dnsZoneName, image, 
 								"federation-apiserver",
 								"--bind-address=0.0.0.0",
 								"--etcd-servers=http://localhost:2379",
-								"--service-cluster-ip-range=10.0.0.0/16",
 								"--secure-port=443",
 								"--client-ca-file=/etc/federation/apiserver/ca.crt",
 								"--tls-cert-file=/etc/federation/apiserver/server.crt",