diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 369b85357d3..181f9a8ae25 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -895,7 +895,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS MixedProtocolLBService: {Default: false, PreRelease: featuregate.Alpha}, VolumeCapacityPriority: {Default: false, PreRelease: featuregate.Alpha}, PreferNominatedNode: {Default: true, PreRelease: featuregate.Beta}, - ProbeTerminationGracePeriod: {Default: false, PreRelease: featuregate.Alpha}, + ProbeTerminationGracePeriod: {Default: false, PreRelease: featuregate.Beta}, // Default to false in beta 1.22, set to true in 1.24 NodeSwap: {Default: false, PreRelease: featuregate.Alpha}, PodDeletionCost: {Default: true, PreRelease: featuregate.Beta}, StatefulSetAutoDeletePVC: {Default: false, PreRelease: featuregate.Alpha}, diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container.go b/pkg/kubelet/kuberuntime/kuberuntime_container.go index 54b116e2556..44fbfee4672 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container.go @@ -675,16 +675,14 @@ func (m *kubeGenericRuntimeManager) killContainer(pod *v1.Pod, containerID kubec case pod.Spec.TerminationGracePeriodSeconds != nil: gracePeriod = *pod.Spec.TerminationGracePeriodSeconds - if utilfeature.DefaultFeatureGate.Enabled(features.ProbeTerminationGracePeriod) { - switch reason { - case reasonStartupProbe: - if containerSpec.StartupProbe != nil && containerSpec.StartupProbe.TerminationGracePeriodSeconds != nil { - gracePeriod = *containerSpec.StartupProbe.TerminationGracePeriodSeconds - } - case reasonLivenessProbe: - if containerSpec.LivenessProbe != nil && containerSpec.LivenessProbe.TerminationGracePeriodSeconds != nil { - gracePeriod = *containerSpec.LivenessProbe.TerminationGracePeriodSeconds - } + switch reason { + case reasonStartupProbe: + if containerSpec.StartupProbe != nil && containerSpec.StartupProbe.TerminationGracePeriodSeconds != nil { + gracePeriod = *containerSpec.StartupProbe.TerminationGracePeriodSeconds + } + case reasonLivenessProbe: + if containerSpec.LivenessProbe != nil && containerSpec.LivenessProbe.TerminationGracePeriodSeconds != nil { + gracePeriod = *containerSpec.LivenessProbe.TerminationGracePeriodSeconds } } }