Merge pull request kubernetes#15942 from feihujiang/returnClearMessag…

…eWhenDeletingImmortalNamespace Auto commit by PR queue bot
nikhiljindal · Oct 22, 2015 · 53279bc · 53279bc
2 parents 407ff58 + c5f7278
commit 53279bc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/plugin/pkg/admission/namespace/lifecycle/admission.go b/plugin/pkg/admission/namespace/lifecycle/admission.go
@@ -53,7 +53,7 @@ func (l *lifecycle) Admit(a admission.Attributes) (err error) {
 
 	// prevent deletion of immortal namespaces
 	if a.GetOperation() == admission.Delete && a.GetKind() == "Namespace" && l.immortalNamespaces.Has(a.GetName()) {
-		return errors.NewForbidden(a.GetKind(), a.GetName(), fmt.Errorf("namespace can never be deleted"))
+		return errors.NewForbidden(a.GetKind(), a.GetName(), fmt.Errorf("this namespace may not be deleted"))
 	}
 
 	defaultVersion, kind, err := api.RESTMapper.VersionAndKindForResource(a.GetResource())