Enable CSI migration for Azure Disk and Cinder

In 1.24, CSI migration for Azure Disk and Cinder are going to be GA in upstream Kubernetes. Once that happens, switching off the gates will not have any effect.
nitin-dhevar · Feb 4, 2022 · 3ad4150 · 3ad4150
1 parent 31ffd77
commit 3ad4150
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/config/v1/types_feature.go b/config/v1/types_feature.go
@@ -115,9 +115,7 @@ var FeatureSets = map[FeatureSet]*FeatureGateEnabledDisabled{
 		with("CSIDriverAzureFile").          // sig-storage, fbertina, OCP specific
 		with("CSIDriverVSphere").            // sig-storage, jsafrane, OCP specific
 		with("CSIMigrationAWS").             // sig-storage, jsafrane, Kubernetes feature gate
-		with("CSIMigrationOpenStack").       // sig-storage, jsafrane, Kubernetes feature gate
 		with("CSIMigrationGCE").             // sig-storage, fbertina, Kubernetes feature gate
-		with("CSIMigrationAzureDisk").       // sig-storage, fbertina, Kubernetes feature gate
 		with("CSIMigrationAzureFile").       // sig-storage, fbertina, Kubernetes feature gate
 		with("CSIMigrationvSphere").         // sig-storage, fbertina, Kubernetes feature gate
 		with("ExternalCloudProvider").       // sig-cloud-provider, jspeed, OCP specific
@@ -147,9 +145,7 @@ var defaultFeatures = &FeatureGateEnabledDisabled{
 	},
 	Disabled: []string{
 		"CSIMigrationAWS",       // sig-storage, jsafrane
-		"CSIMigrationOpenStack", // sig-storage, jsafrane
 		"CSIMigrationGCE",       // sig-storage, jsafrane
-		"CSIMigrationAzureDisk", // sig-storage, jsafrane
 		"CSIMigrationAzureFile", // sig-storage, jsafrane
 		"CSIMigrationvSphere",   // sig-storage, jsafrane
 	},

diff --git a/config/v1/types_features_test.go b/config/v1/types_features_test.go
@@ -27,9 +27,7 @@ func TestFeatureBuilder(t *testing.T) {
 				},
 				Disabled: []string{
 					"CSIMigrationAWS",
-					"CSIMigrationOpenStack",
 					"CSIMigrationGCE",
-					"CSIMigrationAzureDisk",
 					"CSIMigrationAzureFile",
 					"CSIMigrationvSphere",
 					"PodSecurity",
@@ -48,9 +46,7 @@ func TestFeatureBuilder(t *testing.T) {
 					"CSIMigrationAWS",
 				},
 				Disabled: []string{
-					"CSIMigrationOpenStack",
 					"CSIMigrationGCE",
-					"CSIMigrationAzureDisk",
 					"CSIMigrationAzureFile",
 					"CSIMigrationvSphere",
 				},
@@ -67,9 +63,7 @@ func TestFeatureBuilder(t *testing.T) {
 				},
 				Disabled: []string{
 					"CSIMigrationAWS",
-					"CSIMigrationOpenStack",
 					"CSIMigrationGCE",
-					"CSIMigrationAzureDisk",
 					"CSIMigrationAzureFile",
 					"CSIMigrationvSphere",
 					"PodSecurity",
@@ -90,9 +84,7 @@ func TestFeatureBuilder(t *testing.T) {
 					"other",
 				},
 				Disabled: []string{
-					"CSIMigrationOpenStack",
 					"CSIMigrationGCE",
-					"CSIMigrationAzureDisk",
 					"CSIMigrationAzureFile",
 					"CSIMigrationvSphere",
 				},