diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 3fe474b87ab..5945765f4e7 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -540,13 +540,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 // @@ -1560,12 +1553,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 59172d34bfb..2a0964cc46d 100644 --- a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml +++ b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml @@ -997,20 +997,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