From 3090b63414dba76f1c2e89b2b952c10aa99910db Mon Sep 17 00:00:00 2001
From: adisky <aditi.s@india.nec.com>
Date: Thu, 7 Feb 2019 07:15:39 +0000
Subject: [PATCH] Add CSI Migration feature flags for Cinder In tree Driver

---
 pkg/features/kube_features.go | 7 +++++++
 pkg/volume/cinder/cinder.go   | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go
index 1eea44a582..c98d3f8006 100644
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -412,6 +412,12 @@ const (
 	//
 	// Enables GMSA support for Windows workloads.
 	WindowsGMSA utilfeature.Feature = "WindowsGMSA"
+
+	// owner: @adisky
+	// alpha: v1.14
+	//
+	// Enables the OpenStack Cinder in-tree driver to OpenStack Cinder CSI Driver migration feature.
+	CSIMigrationOpenStack utilfeature.Feature = "CSIMigrationOpenStack"
 )
 
 func init() {
@@ -468,6 +474,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
 	CSIMigrationGCE:                             {Default: false, PreRelease: utilfeature.Alpha},
 	CSIMigrationAWS:                             {Default: false, PreRelease: utilfeature.Alpha},
 	RunAsGroup:                                  {Default: true, PreRelease: utilfeature.Beta},
+	CSIMigrationOpenStack:                       {Default: false, PreRelease: utilfeature.Alpha},
 	VolumeSubpath:                               {Default: true, PreRelease: utilfeature.GA},
 	BalanceAttachedNodeVolumes:                  {Default: false, PreRelease: utilfeature.Alpha},
 	PodReadinessGates:                           {Default: true, PreRelease: utilfeature.Beta},
diff --git a/pkg/volume/cinder/cinder.go b/pkg/volume/cinder/cinder.go
index 6d155e5b35..7240614c78 100644
--- a/pkg/volume/cinder/cinder.go
+++ b/pkg/volume/cinder/cinder.go
@@ -109,7 +109,8 @@ func (plugin *cinderPlugin) CanSupport(spec *volume.Spec) bool {
 }
 
 func (plugin *cinderPlugin) IsMigratedToCSI() bool {
-	return false
+	return utilfeature.DefaultFeatureGate.Enabled(features.CSIMigration) &&
+		utilfeature.DefaultFeatureGate.Enabled(features.CSIMigrationOpenStack)
 }
 
 func (plugin *cinderPlugin) RequiresRemount() bool {