From eca25d9e1286da7e1366740fe2596c3e6ebe4ef0 Mon Sep 17 00:00:00 2001 From: Divyen Patel Date: Tue, 14 Mar 2023 19:57:57 +0530 Subject: [PATCH 1/2] lock CSIMigrationvSphere feature gate --- pkg/features/kube_features.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 2a71f42928e..23116e4b44e 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -908,7 +908,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS CSIMigrationRBD: {Default: false, PreRelease: featuregate.Alpha}, // Off by default (requires RBD CSI driver) - CSIMigrationvSphere: {Default: true, PreRelease: featuregate.GA}, // LockToDefault when CSI driver with GA support for Windows, raw block and xfs features are available + CSIMigrationvSphere: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.29 CSINodeExpandSecret: {Default: true, PreRelease: featuregate.Beta}, From 223a7c5506089ce71855634661ceb6bc098062e6 Mon Sep 17 00:00:00 2001 From: xing-yang Date: Tue, 14 Mar 2023 19:32:21 +0000 Subject: [PATCH 2/2] Remove the unit test to enable the feature gate vSphere CSI Migration feature gate is locked now. --- .../csimigration/plugin_manager_test.go | 56 ------------------- 1 file changed, 56 deletions(-) diff --git a/pkg/volume/csimigration/plugin_manager_test.go b/pkg/volume/csimigration/plugin_manager_test.go index 4c06c224fe7..b4d2d8b20c1 100644 --- a/pkg/volume/csimigration/plugin_manager_test.go +++ b/pkg/volume/csimigration/plugin_manager_test.go @@ -91,62 +91,6 @@ func TestIsMigratable(t *testing.T) { } } -func TestCheckMigrationFeatureFlags(t *testing.T) { - testCases := []struct { - name string - pluginFeature featuregate.Feature - pluginFeatureEnabled bool - pluginUnregsiterFeature featuregate.Feature - pluginUnregsiterEnabled bool - expectMigrationComplete bool - expectErr bool - }{ - { - name: "plugin specific migration feature enabled with plugin unregister disabled", - pluginFeature: features.CSIMigrationvSphere, - pluginFeatureEnabled: true, - pluginUnregsiterFeature: features.InTreePluginvSphereUnregister, - pluginUnregsiterEnabled: false, - expectMigrationComplete: false, - expectErr: false, - }, - { - name: "plugin specific migration feature and plugin unregister disabled", - pluginFeature: features.CSIMigrationvSphere, - pluginFeatureEnabled: false, - pluginUnregsiterFeature: features.InTreePluginvSphereUnregister, - pluginUnregsiterEnabled: false, - expectMigrationComplete: false, - expectErr: false, - }, - { - name: "all features enabled", - pluginFeature: features.CSIMigrationvSphere, - pluginFeatureEnabled: true, - pluginUnregsiterFeature: features.InTreePluginvSphereUnregister, - pluginUnregsiterEnabled: true, - expectMigrationComplete: true, - expectErr: false, - }, - } - for _, test := range testCases { - t.Run(fmt.Sprintf("Testing %v", test.name), func(t *testing.T) { - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, test.pluginFeature, test.pluginFeatureEnabled)() - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, test.pluginUnregsiterFeature, test.pluginUnregsiterEnabled)() - migrationComplete, err := CheckMigrationFeatureFlags(utilfeature.DefaultFeatureGate, test.pluginFeature, test.pluginUnregsiterFeature) - if err != nil && test.expectErr == false { - t.Errorf("Unexpected error: %v", err) - } - if err == nil && test.expectErr == true { - t.Errorf("Unexpected validation pass") - } - if migrationComplete != test.expectMigrationComplete { - t.Errorf("Unexpected migrationComplete result. Exp: %v, got %v", test.expectMigrationComplete, migrationComplete) - } - }) - } -} - func TestMigrationFeatureFlagStatus(t *testing.T) { testCases := []struct { name string