github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #111301 from mattcary/migration-feature

Browse Source 
Upgrade CSIMigrationGCE feature gate to GA
This commit is contained in:
Kubernetes Prow Robot
2022-08-02 13:58:57 -07:00
committed by GitHub
parent 9fb1f67af7 e5d387c5d6
commit 369a465fae
11 changed files with 191 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
pkg/volume/csimigration/plugin_manager_test.go
View File

@@ -39,8 +39,8 @@ func TestIsMigratable(t *testing.T) {
spec *volume.Spec
}{
{
name: "GCE PD PV source with CSIMigrationGCE enabled",
pluginFeature: features.CSIMigrationGCE,
name: "RBD PV source with CSIMigrationGCE enabled",
pluginFeature: features.CSIMigrationRBD,
pluginFeatureEnabled: true,
isMigratable: true,
csiMigrationEnabled: true,
@@ -48,11 +48,8 @@ func TestIsMigratable(t *testing.T) {
PersistentVolume: &v1.PersistentVolume{
Spec: v1.PersistentVolumeSpec{
PersistentVolumeSource: v1.PersistentVolumeSource{
GCEPersistentDisk: &v1.GCEPersistentDiskVolumeSource{
PDName: "test-disk",
FSType: "ext4",
Partition: 0,
ReadOnly: false,
RBD: &v1.RBDPersistentVolumeSource{
RBDImage: "test-disk",
},
},
},
@@ -60,8 +57,8 @@ func TestIsMigratable(t *testing.T) {
},
},
{
name: "GCE PD PV Source with CSIMigrationGCE disabled",
pluginFeature: features.CSIMigrationGCE,
name: "RBD PD PV Source with CSIMigrationGCE disabled",
pluginFeature: features.CSIMigrationRBD,
pluginFeatureEnabled: false,
isMigratable: false,
csiMigrationEnabled: true,
@@ -69,11 +66,8 @@ func TestIsMigratable(t *testing.T) {
PersistentVolume: &v1.PersistentVolume{
Spec: v1.PersistentVolumeSpec{
PersistentVolumeSource: v1.PersistentVolumeSource{
GCEPersistentDisk: &v1.GCEPersistentDiskVolumeSource{
PDName: "test-disk",
FSType: "ext4",
Partition: 0,
ReadOnly: false,
RBD: &v1.RBDPersistentVolumeSource{
RBDImage: "test-disk",
},
},
},
@@ -186,28 +180,6 @@ func TestMigrationFeatureFlagStatus(t *testing.T) {
csiMigrationResult bool
csiMigrationCompleteResult bool
}{
{
name: "gce-pd migration flag disabled and migration-complete flag disabled with CSI migration flag disabled",
pluginName: "kubernetes.io/gce-pd",
pluginFeature: features.CSIMigrationGCE,
pluginFeatureEnabled: false,
csiMigrationEnabled: false,
inTreePluginUnregister: features.InTreePluginGCEUnregister,
inTreePluginUnregisterEnabled: false,
csiMigrationResult: false,
csiMigrationCompleteResult: false,
},
{
name: "gce-pd migration flag disabled and migration-complete flag disabled with CSI migration flag enabled",
pluginName: "kubernetes.io/gce-pd",
pluginFeature: features.CSIMigrationGCE,
pluginFeatureEnabled: false,
csiMigrationEnabled: true,
inTreePluginUnregister: features.InTreePluginGCEUnregister,
inTreePluginUnregisterEnabled: false,
csiMigrationResult: false,
csiMigrationCompleteResult: false,
},
{
name: "gce-pd migration flag enabled and migration-complete flag disabled with CSI migration flag enabled",
pluginName: "kubernetes.io/gce-pd",
@@ -257,7 +229,12 @@ func TestMigrationFeatureFlagStatus(t *testing.T) {
for _, test := range testCases {
pm := NewPluginManager(csiTranslator, utilfeature.DefaultFeatureGate)
t.Run(fmt.Sprintf("Testing %v", test.name), func(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, test.pluginFeature, test.pluginFeatureEnabled)()
// CSIMigrationGCE is locked to on, so it cannot be enabled or disabled. There are a couple
// of test cases that check correct behavior when CSIMigrationGCE is enabled, but there are
// no longer any tests cases for CSIMigrationGCE being disabled as that is not possible.
if test.pluginFeature != features.CSIMigrationGCE {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, test.pluginFeature, test.pluginFeatureEnabled)()
}
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, test.inTreePluginUnregister, test.inTreePluginUnregisterEnabled)()
csiMigrationResult := pm.IsMigrationEnabledForPlugin(test.pluginName)