Merge pull request kubernetes#111784 from deads2k/fix-cleaner

Revert "enforce strict alpha handling for API serving"
openshift · Aug 10, 2022 · 518e0ac · 518e0ac
2 parents a38bb7e + 696e41a
commit 518e0ac
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/staging/src/k8s.io/apiserver/pkg/server/deleted_kinds.go b/staging/src/k8s.io/apiserver/pkg/server/deleted_kinds.go
@@ -54,10 +54,7 @@ type ResourceExpirationEvaluator interface {
 }
 
 func NewResourceExpirationEvaluator(currentVersion apimachineryversion.Info) (ResourceExpirationEvaluator, error) {
-	ret := &resourceExpirationEvaluator{
-		// TODO https://github.com/kubernetes/kubernetes/issues/109799 set this back to false after beta is tagged.
-		strictRemovedHandlingInAlpha: true,
-	}
+	ret := &resourceExpirationEvaluator{}
 	if len(currentVersion.Major) > 0 {
 		currentMajor64, err := strconv.ParseInt(currentVersion.Major, 10, 32)
 		if err != nil {