Skip to content

Commit

Permalink
Merge pull request #17807 from liggitt/immortal-3.8
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Add kube-system as an immortal namespace
  • Loading branch information
openshift-merge-robot authored Jan 5, 2018
2 parents b5d7b54 + 7880bbf commit 9bf3901
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/cmd/server/origin/admission/chain_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down

0 comments on commit 9bf3901

Please sign in to comment.