From 27abf99148b8dc7ed90c35b9aa91f52f55868108 Mon Sep 17 00:00:00 2001 From: bzsuni Date: Mon, 16 Oct 2023 18:34:10 +0800 Subject: [PATCH] Remove GA featuregate about ProbeTerminationGracePeriod in 1.29 Signed-off-by: bzsuni --- pkg/features/kube_features.go | 10 ---------- test/e2e/feature/feature.go | 1 - 2 files changed, 11 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 26e7024d542..cf9e149094a 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -644,14 +644,6 @@ const ( // Enable users to specify when a Pod is ready for scheduling. PodSchedulingReadiness featuregate.Feature = "PodSchedulingReadiness" - // owner: @rphillips - // alpha: v1.21 - // beta: v1.22 - // ga: v1.28 - // - // Allows user to override pod-level terminationGracePeriod for probes - ProbeTerminationGracePeriod featuregate.Feature = "ProbeTerminationGracePeriod" - // owner: @jessfraz // alpha: v1.12 // @@ -1065,8 +1057,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS PodSchedulingReadiness: {Default: true, PreRelease: featuregate.Beta}, - ProbeTerminationGracePeriod: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.29 - ProcMountType: {Default: false, PreRelease: featuregate.Alpha}, ProxyTerminatingEndpoints: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.30 diff --git a/test/e2e/feature/feature.go b/test/e2e/feature/feature.go index 09ebab6b14f..d74d4499d80 100644 --- a/test/e2e/feature/feature.go +++ b/test/e2e/feature/feature.go @@ -89,7 +89,6 @@ var ( PodPriority = framework.WithFeature(framework.ValidFeatures.Add("PodPriority")) PodReadyToStartContainersCondition = framework.WithFeature(framework.ValidFeatures.Add("PodReadyToStartContainersCondition")) PodResources = framework.WithFeature(framework.ValidFeatures.Add("PodResources")) - ProbeTerminationGracePeriod = framework.WithFeature(framework.ValidFeatures.Add("ProbeTerminationGracePeriod")) Reboot = framework.WithFeature(framework.ValidFeatures.Add("Reboot")) ReclaimPolicy = framework.WithFeature(framework.ValidFeatures.Add("ReclaimPolicy")) RecoverVolumeExpansionFailure = framework.WithFeature(framework.ValidFeatures.Add("RecoverVolumeExpansionFailure"))