From 0ff1e3778f1ff51e82b88f4a1ef7adff6baf24c3 Mon Sep 17 00:00:00 2001
From: carlory <baofa.fan@daocloud.io>
Date: Tue, 7 Jan 2025 15:32:46 +0800
Subject: [PATCH] Remove general available feature-gate PodDisruptionConditions

---
 pkg/features/kube_features.go                      | 13 -------------
 .../reference/versioned_feature_list.yaml          | 14 --------------
 2 files changed, 27 deletions(-)

diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go
index e0b09608030..179b1257515 100644
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -517,13 +517,6 @@ const (
 	// Enables controlling pod ranking on replicaset scale-down.
 	PodDeletionCost featuregate.Feature = "PodDeletionCost"
 
-	// owner: @mimowo
-	// kep: https://kep.k8s.io/3329
-	//
-	// Enables support for appending a dedicated pod condition indicating that
-	// the pod is being deleted due to a disruption.
-	PodDisruptionConditions featuregate.Feature = "PodDisruptionConditions"
-
 	// owner: @danielvegamyhre
 	// kep: https://kep.k8s.io/4017
 	//
@@ -1534,12 +1527,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
 		{Version: version.MustParse("1.22"), Default: true, PreRelease: featuregate.Beta},
 	},
 
-	PodDisruptionConditions: {
-		{Version: version.MustParse("1.25"), Default: false, PreRelease: featuregate.Alpha},
-		{Version: version.MustParse("1.26"), Default: true, PreRelease: featuregate.Beta},
-		{Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.33
-	},
-
 	PodIndexLabel: {
 		{Version: version.MustParse("1.28"), Default: true, PreRelease: featuregate.Beta},
 		{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.35
diff --git a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml
index 1b748bcc5fd..c57a3e4b223 100644
--- a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml
+++ b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml
@@ -975,20 +975,6 @@
     lockToDefault: false
     preRelease: Beta
     version: "1.22"
-- name: PodDisruptionConditions
-  versionedSpecs:
-  - default: false
-    lockToDefault: false
-    preRelease: Alpha
-    version: "1.25"
-  - default: true
-    lockToDefault: false
-    preRelease: Beta
-    version: "1.26"
-  - default: true
-    lockToDefault: true
-    preRelease: GA
-    version: "1.31"
 - name: PodIndexLabel
   versionedSpecs:
   - default: true