Merge pull request #40866 from shashidharatd/fed-e2e-1

Automatic merge from submit-queue (batch tested with PRs 40884, 40809, 40845, 40866, 40875) [Federation][e2e] Fix federation admission control e2e test case Fixes federation admission control e2e test case. @kubernetes/sig-federation-bugs @madhusudancs

Merge pull request #40866 from shashidharatd/fed-e2e-1
fc4d71b1 · Kubernetes Submit Queue · GitHub · 612d014a · 450040c6 · fc4d71b1
Commit fc4d71b1 authored Feb 02, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

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

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

No files found.
--- a/federation/pkg/kubefed/init/init.go
+++ b/federation/pkg/kubefed/init/init.go
@@ -455,6 +455,7 @@ func createAPIServer(clientset *client.Clientset, namespace, name, image, creden
 		"--client-ca-file=/etc/federation/apiserver/ca.crt",
 		"--tls-cert-file=/etc/federation/apiserver/server.crt",
 		"--tls-private-key-file=/etc/federation/apiserver/server.key",
+		"--admission-control=NamespaceLifecycle",
 		fmt.Sprintf("--storage-backend=%s", storageBackend),
 	}


--- a/federation/pkg/kubefed/init/init_test.go
+++ b/federation/pkg/kubefed/init/init_test.go
@@ -644,6 +644,7 @@ func fakeInitHostFactory(federationName, namespaceName, ip, dnsZoneName, image, 
 								"--client-ca-file=/etc/federation/apiserver/ca.crt",
 								"--tls-cert-file=/etc/federation/apiserver/server.crt",
 								"--tls-private-key-file=/etc/federation/apiserver/server.key",
+								"--admission-control=NamespaceLifecycle",
 								fmt.Sprintf("--storage-backend=%s", storageProvider),
 								"--advertise-address=" + ip,
 							},