Merge pull request #56849 from hzxuzhonghu/lifecycle-admission
Automatic merge from submit-queue (batch tested with PRs 56828, 55184, 56849, 57081, 56654). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. remove dead code in lifecycle admission **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
This commit is contained in:
		| @@ -69,22 +69,9 @@ type Lifecycle struct { | ||||
| 	forceLiveLookupCache *utilcache.LRUExpireCache | ||||
| } | ||||
|  | ||||
| type forceLiveLookupEntry struct { | ||||
| 	expiry time.Time | ||||
| } | ||||
|  | ||||
| var _ = initializer.WantsExternalKubeInformerFactory(&Lifecycle{}) | ||||
| var _ = initializer.WantsExternalKubeClientSet(&Lifecycle{}) | ||||
|  | ||||
| func makeNamespaceKey(namespace string) *v1.Namespace { | ||||
| 	return &v1.Namespace{ | ||||
| 		ObjectMeta: metav1.ObjectMeta{ | ||||
| 			Name:      namespace, | ||||
| 			Namespace: "", | ||||
| 		}, | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func (l *Lifecycle) Admit(a admission.Attributes) error { | ||||
| 	// prevent deletion of immortal namespaces | ||||
| 	if a.GetOperation() == admission.Delete && a.GetKind().GroupKind() == v1.SchemeGroupVersion.WithKind("Namespace").GroupKind() && l.immortalNamespaces.Has(a.GetName()) { | ||||
| @@ -182,7 +169,7 @@ func (l *Lifecycle) Admit(a admission.Attributes) error { | ||||
| 		} | ||||
|  | ||||
| 		// TODO: This should probably not be a 403 | ||||
| 		return admission.NewForbidden(a, fmt.Errorf("unable to create new content in namespace %s because it is being terminated.", a.GetNamespace())) | ||||
| 		return admission.NewForbidden(a, fmt.Errorf("unable to create new content in namespace %s because it is being terminated", a.GetNamespace())) | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Kubernetes Submit Queue
					Kubernetes Submit Queue