diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 8a9412c5863..f898b2217ea 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -390,6 +390,24 @@ const ( // // Enables the kubelet's pod resources grpc endpoint KubeletPodResources utilfeature.Feature = "KubeletPodResources" + + // owner: @davidz627 + // alpha: v1.14 + // + // Enables the in-tree storage to CSI Plugin migration feature. + CSIMigration utilfeature.Feature = "CSIMigration" + + // owner: @davidz627 + // alpha: v1.14 + // + // Enables the GCE PD in-tree driver to GCE CSI Driver migration feature. + CSIMigrationGCE utilfeature.Feature = "CSIMigrationGCE" + + // owner: @leakingtapan + // alpha: v1.14 + // + // Enables the AWS EBS in-tree driver to AWS EBS CSI Driver migration feature. + CSIMigrationAWS utilfeature.Feature = "CSIMigrationAWS" ) func init() { @@ -442,6 +460,9 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS BoundServiceAccountTokenVolume: {Default: false, PreRelease: utilfeature.Alpha}, CRIContainerLogRotation: {Default: true, PreRelease: utilfeature.Beta}, GCERegionalPersistentDisk: {Default: true, PreRelease: utilfeature.GA}, + CSIMigration: {Default: false, PreRelease: utilfeature.Alpha}, + CSIMigrationGCE: {Default: false, PreRelease: utilfeature.Alpha}, + CSIMigrationAWS: {Default: false, PreRelease: utilfeature.Alpha}, RunAsGroup: {Default: false, PreRelease: utilfeature.Alpha}, VolumeSubpath: {Default: true, PreRelease: utilfeature.GA}, BalanceAttachedNodeVolumes: {Default: false, PreRelease: utilfeature.Alpha}, diff --git a/pkg/volume/util/operationexecutor/operation_generator.go b/pkg/volume/util/operationexecutor/operation_generator.go index 9288f63519d..9fec3f9f3f6 100644 --- a/pkg/volume/util/operationexecutor/operation_generator.go +++ b/pkg/volume/util/operationexecutor/operation_generator.go @@ -76,11 +76,11 @@ func NewOperationGenerator(kubeClient clientset.Interface, blkUtil volumepathhandler.BlockVolumePathHandler) OperationGenerator { return &operationGenerator{ - kubeClient: kubeClient, - volumePluginMgr: volumePluginMgr, - recorder: recorder, + kubeClient: kubeClient, + volumePluginMgr: volumePluginMgr, + recorder: recorder, checkNodeCapabilitiesBeforeMount: checkNodeCapabilitiesBeforeMount, - blkUtil: blkUtil, + blkUtil: blkUtil, } }