From fb5b966a88a4f32563cb8963a5cb0752bdef25d9 Mon Sep 17 00:00:00 2001 From: Matthew Cary Date: Thu, 15 Jul 2021 17:03:53 -0700 Subject: [PATCH] Revert "Add StatefulSetAutoDeletePVC feature gate" This reverts commit 0feba0c4eec86a65500ef2c0043f2c3b148f4685. --- pkg/features/kube_features.go | 7 ------- pkg/registry/apps/statefulset/strategy.go | 2 -- 2 files changed, 9 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 181f9a8ae25..c628e3eb13a 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -637,12 +637,6 @@ const ( // alpha: v1.21 VolumeCapacityPriority featuregate.Feature = "VolumeCapacityPriority" - // owner: @mattcary - // alpha: v1.22 - // - // Enables policies controlling deletion of PVCs created by a StatefulSet. - StatefulSetAutoDeletePVC featuregate.Feature = "StatefulSetAutoDeletePVC" - // owner: @ahg-g // alpha: v1.21 // beta: v1.22 @@ -898,7 +892,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS 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}, TopologyAwareHints: {Default: false, PreRelease: featuregate.Alpha}, PodAffinityNamespaceSelector: {Default: true, PreRelease: featuregate.Beta}, ServiceLoadBalancerClass: {Default: true, PreRelease: featuregate.Beta}, diff --git a/pkg/registry/apps/statefulset/strategy.go b/pkg/registry/apps/statefulset/strategy.go index e00f732a7c0..c8d39bc670c 100644 --- a/pkg/registry/apps/statefulset/strategy.go +++ b/pkg/registry/apps/statefulset/strategy.go @@ -28,12 +28,10 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/storage/names" - utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/pod" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps/validation" - "k8s.io/kubernetes/pkg/features" "sigs.k8s.io/structured-merge-diff/v4/fieldpath" )