Skip to content

UPSTREAM: <carry>: add CSI migration feature gates for GCE PD and Azure Disk #831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jul 2, 2021
Merged

UPSTREAM: <carry>: add CSI migration feature gates for GCE PD and Azure Disk #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions pkg/features/patch_kube_features.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,35 @@ import (

var (
// owner: @jsafrane
// alpha: v1.21
// beta: v1.21
//
// Enables the AWS EBS CSI migration for the Attach/Detach controller (ADC) only.
ADCCSIMigrationAWS featuregate.Feature = "ADC_CSIMigrationAWS"

// owner: @fbertina
// beta: v1.22
//
// Enables the Azure Disk CSI migration for the Attach/Detach controller (ADC) only.
ADCCSIMigrationAzureDisk featuregate.Feature = "ADC_CSIMigrationAzureDisk"

// owner: @jsafrane
// alpha: v1.21
// beta: v1.21
//
// Enables the Cinder CSI migration for the Attach/Detach controller (ADC) only.
ADCCSIMigrationCinder featuregate.Feature = "ADC_CSIMigrationCinder"

// owner: @fbertina
// beta: v1.22
//
// Enables the GCE CSI migration for the Attach/Detach controller (ADC) only.
ADCCSIMigrationGCEPD featuregate.Feature = "ADC_CSIMigrationGCEPD"
)

var ocpDefaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
ADCCSIMigrationAWS: {Default: true, PreRelease: featuregate.Beta},
ADCCSIMigrationCinder: {Default: true, PreRelease: featuregate.Beta},
ADCCSIMigrationAWS: {Default: true, PreRelease: featuregate.Beta},
ADCCSIMigrationAzureDisk: {Default: true, PreRelease: featuregate.Beta},
ADCCSIMigrationCinder: {Default: true, PreRelease: featuregate.Beta},
ADCCSIMigrationGCEPD: {Default: true, PreRelease: featuregate.Beta},
}

func init() {
Expand Down
4 changes: 4 additions & 0 deletions pkg/volume/csimigration/patch_adc_plugin_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@ func (pm PluginManager) adcIsMigrationEnabledForPlugin(pluginName string) bool {
switch pluginName {
case csilibplugins.AWSEBSInTreePluginName:
return pm.featureGate.Enabled(features.ADCCSIMigrationAWS)
case csilibplugins.AzureDiskInTreePluginName:
return pm.featureGate.Enabled(features.ADCCSIMigrationAzureDisk)
case csilibplugins.CinderInTreePluginName:
return pm.featureGate.Enabled(features.ADCCSIMigrationCinder)
case csilibplugins.GCEPDInTreePluginName:
return pm.featureGate.Enabled(features.ADCCSIMigrationGCEPD)
default:
return pm.isMigrationEnabledForPlugin(pluginName)
}
Expand Down