github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2017-02-02 18:53:51 -08:00 committed by GitHub
commit fc4d71b142
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
federation/pkg/kubefed/init/init.go
View File

@ -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),
}

1
federation/pkg/kubefed/init/init_test.go
View File

@ -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,
},