Merge pull request kubernetes#17914 from deads2k/admission-03-lifecycle

k8s-publishing-bot · k8s-publishing-bot · commit 7e4144291bb5 · 2018-01-25T13:28:23.000Z
Automatic merge from submit-queue (batch tested with PRs 17914, 18021, 18022, 17862, 18043). stop special casing creation for ns lifecycle admission alternative to openshift/origin#17808 When running an openshift server, the admission plugin will always want to protect the openshift namespace. This simplifies the admission chain creation path. Only three left. Origin-commit: f39d2243f75911085ea4b2c379adfae82c0c2011
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go
@@ -53,7 +53,7 @@ const (
 // Register registers a plugin
 func Register(plugins *admission.Plugins) {
 	plugins.Register(PluginName, func(config io.Reader) (admission.Interface, error) {
-		return NewLifecycle(sets.NewString(metav1.NamespaceDefault, metav1.NamespaceSystem, metav1.NamespacePublic))
+		return NewLifecycle(sets.NewString(metav1.NamespaceDefault, metav1.NamespaceSystem, metav1.NamespacePublic, "openshift", "openshift-infra"))
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ const (`
`53`	`53`	`// Register registers a plugin`
`54`	`54`	`func Register(plugins *admission.Plugins) {`
`55`	`55`	`plugins.Register(PluginName, func(config io.Reader) (admission.Interface, error) {`
`56`		`- return NewLifecycle(sets.NewString(metav1.NamespaceDefault, metav1.NamespaceSystem, metav1.NamespacePublic))`
	`56`	`+ return NewLifecycle(sets.NewString(metav1.NamespaceDefault, metav1.NamespaceSystem, metav1.NamespacePublic, "openshift", "openshift-infra"))`
`57`	`57`	`})`
`58`	`58`	`}`
`59`	`59`