From 6ebafb37ddba0a16781c5d9212bca49d67fda87c Mon Sep 17 00:00:00 2001 From: Abdullah Gharaibeh Date: Tue, 13 Apr 2021 14:49:09 -0400 Subject: [PATCH] Graduate PodDeletionCost to Beta --- pkg/apis/core/annotation_key_constants.go | 2 +- pkg/features/kube_features.go | 3 ++- staging/src/k8s.io/api/core/v1/annotation_key_constants.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/apis/core/annotation_key_constants.go b/pkg/apis/core/annotation_key_constants.go index db68d290dc6..b492e558453 100644 --- a/pkg/apis/core/annotation_key_constants.go +++ b/pkg/apis/core/annotation_key_constants.go @@ -122,7 +122,7 @@ const ( // pod deletion order. // The implicit deletion cost for pods that don't set the annotation is 0, negative values are permitted. // - // This annotation is alpha-level and is only honored when PodDeletionCost feature is enabled. + // This annotation is beta-level and is only honored when PodDeletionCost feature is enabled. PodDeletionCost = "controller.kubernetes.io/pod-deletion-cost" // AnnotationTopologyAwareHints can be used to enable or disable Topology diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 960775916c4..872a0dfa736 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -686,6 +686,7 @@ const ( // owner: @ahg-g // alpha: v1.21 + // beta: v1.22 // // Enables controlling pod ranking on replicaset scale-down. PodDeletionCost featuregate.Feature = "PodDeletionCost" @@ -858,7 +859,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS PreferNominatedNode: {Default: false, PreRelease: featuregate.Alpha}, ProbeTerminationGracePeriod: {Default: false, PreRelease: featuregate.Alpha}, RunAsGroup: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.22 - PodDeletionCost: {Default: false, PreRelease: featuregate.Alpha}, + PodDeletionCost: {Default: true, PreRelease: featuregate.Beta}, TopologyAwareHints: {Default: false, PreRelease: featuregate.Alpha}, PodAffinityNamespaceSelector: {Default: false, PreRelease: featuregate.Alpha}, ServiceLoadBalancerClass: {Default: false, PreRelease: featuregate.Alpha}, diff --git a/staging/src/k8s.io/api/core/v1/annotation_key_constants.go b/staging/src/k8s.io/api/core/v1/annotation_key_constants.go index 22476b2bd92..a3802f0c363 100644 --- a/staging/src/k8s.io/api/core/v1/annotation_key_constants.go +++ b/staging/src/k8s.io/api/core/v1/annotation_key_constants.go @@ -144,7 +144,7 @@ const ( // pod deletion order. // The implicit deletion cost for pods that don't set the annotation is 0, negative values are permitted. // - // This annotation is alpha-level and is only honored when PodDeletionCost feature is enabled. + // This annotation is beta-level and is only honored when PodDeletionCost feature is enabled. PodDeletionCost = "controller.kubernetes.io/pod-deletion-cost" // AnnotationTopologyAwareHints can be used to enable or disable Topology