Return a clear error when deleting an immortal namespace

pull/6/head
feihujiang 2015-10-20 19:57:10 +08:00
parent c4779fbc4f
commit c5f7278044
1 changed files with 1 additions and 1 deletions

View File

@ -53,7 +53,7 @@ func (l *lifecycle) Admit(a admission.Attributes) (err error) {
// prevent deletion of immortal namespaces // prevent deletion of immortal namespaces
if a.GetOperation() == admission.Delete && a.GetKind() == "Namespace" && l.immortalNamespaces.Has(a.GetName()) { 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()) defaultVersion, kind, err := api.RESTMapper.VersionAndKindForResource(a.GetResource())