Merge pull request #17807 from liggitt/immortal-3.8

openshift-merge-robot · web-flow · commit 9bf3901441b1 · 2018-01-05T12:50:26.000-08:00
Automatic merge from submit-queue.

Add kube-system as an immortal namespace
diff --git a/pkg/cmd/server/origin/admission/chain_builder.go b/pkg/cmd/server/origin/admission/chain_builder.go
@@ -190,7 +190,7 @@ func newAdmissionChain(pluginNames []string, admissionConfigFilename string, opt
 		switch pluginName {
 		case lifecycle.PluginName:
 			// We need to include our infrastructure and shared resource namespaces in the immortal namespaces list
-			immortalNamespaces := sets.NewString(metav1.NamespaceDefault)
+			immortalNamespaces := sets.NewString(metav1.NamespaceDefault, metav1.NamespaceSystem)
 			if len(options.PolicyConfig.OpenShiftSharedResourcesNamespace) > 0 {
 				immortalNamespaces.Insert(options.PolicyConfig.OpenShiftSharedResourcesNamespace)
 			}

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ func newAdmissionChain(pluginNames []string, admissionConfigFilename string, opt`
`190`	`190`	`switch pluginName {`
`191`	`191`	`case lifecycle.PluginName:`
`192`	`192`	`// We need to include our infrastructure and shared resource namespaces in the immortal namespaces list`
`193`		`- immortalNamespaces := sets.NewString(metav1.NamespaceDefault)`
	`193`	`+ immortalNamespaces := sets.NewString(metav1.NamespaceDefault, metav1.NamespaceSystem)`
`194`	`194`	`if len(options.PolicyConfig.OpenShiftSharedResourcesNamespace) > 0 {`
`195`	`195`	`immortalNamespaces.Insert(options.PolicyConfig.OpenShiftSharedResourcesNamespace)`
`196`	`196`	`}`