Merge pull request #62870 from…

Merge pull request #62870 from pospispa/Bring-StorageObjectInUseProtection-feature-to-GA-2nd-attempt Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Bring StorageObjectInUseProtection feature to GA **What this PR does / why we need it**: It brings `StorageObjectInUseProtection` feature to GA. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes N/A **Special notes for your reviewer**: Related features: https://github.com/kubernetes/features/issues/498 and https://github.com/kubernetes/features/issues/499 Related PR: https://github.com/kubernetes/kubernetes/pull/61324 **Release note**: ```release-note StorageObjectInUseProtection feature is GA. ```

Merge pull request #62870 from…
6abbab4b · Kubernetes Submit Queue · GitHub · 0cf37884 · c598682d · 6abbab4b
Unverified Commit 6abbab4b authored Apr 26, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 26, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

kube_features.go pkg/features/kube_features.go +2 -2

No files found.
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -199,7 +199,7 @@ const (
 	BlockVolume utilfeature.Feature = "BlockVolume"
 	// owner: @pospispa
-	// beta: v1.10
+	// GA: v1.11
 	//
 	// Postpone deletion of a PV or a PVC when they are being used
 	StorageObjectInUseProtection utilfeature.Feature = "StorageObjectInUseProtection"
@@ -315,7 +315,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
 	CSIPersistentVolume:                         {Default: true, PreRelease: utilfeature.Beta},
 	CustomPodDNS:                                {Default: true, PreRelease: utilfeature.Beta},
 	BlockVolume:                                 {Default: false, PreRelease: utilfeature.Alpha},
-	StorageObjectInUseProtection:                {Default: true, PreRelease: utilfeature.Beta},
+	StorageObjectInUseProtection:                {Default: true, PreRelease: utilfeature.GA},
 	ResourceLimitsPriorityFunction:              {Default: false, PreRelease: utilfeature.Alpha},
 	SupportIPVSProxyMode:                        {Default: true, PreRelease: utilfeature.Beta},
 	SupportPodPidsLimit:                         {Default: false, PreRelease: utilfeature.Alpha},