From 14936a7f582be696ede9d85d5099ba43d39afa90 Mon Sep 17 00:00:00 2001
From: Ankit Gohil <agohil@purestorage.com>
Date: Wed, 18 Dec 2024 22:01:04 +0000
Subject: [PATCH] Promote Portworx CSI migration to GA

---
 pkg/features/versioned_kube_features.go                       | 3 ++-
 .../featuregates_linter/test_data/versioned_feature_list.yaml | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/features/versioned_kube_features.go b/pkg/features/versioned_kube_features.go
index 5f49f6b3f47..37ead063796 100644
--- a/pkg/features/versioned_kube_features.go
+++ b/pkg/features/versioned_kube_features.go
@@ -136,7 +136,8 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
 	CSIMigrationPortworx: {
 		{Version: version.MustParse("1.23"), Default: false, PreRelease: featuregate.Alpha},
 		{Version: version.MustParse("1.25"), Default: false, PreRelease: featuregate.Beta},
-		{Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.Beta}, // On by default (requires Portworx CSI driver)
+		{Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.Beta},                    // On by default (requires Portworx CSI driver)
+		{Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.36
 	},
 
 	CSIVolumeHealth: {
diff --git a/test/featuregates_linter/test_data/versioned_feature_list.yaml b/test/featuregates_linter/test_data/versioned_feature_list.yaml
index 33f350f70d6..e5add626946 100644
--- a/test/featuregates_linter/test_data/versioned_feature_list.yaml
+++ b/test/featuregates_linter/test_data/versioned_feature_list.yaml
@@ -362,6 +362,10 @@
     lockToDefault: false
     preRelease: Beta
     version: "1.31"
+  - default: true
+    lockToDefault: true
+    preRelease: GA
+    version: "1.33"
 - name: CSIVolumeHealth
   versionedSpecs:
   - default: false