Merge pull request #236 from Madhu-1/fix-topology-bug

fix: set topology flag if csi driver advertize it

Author: Madhu-1

internal/controller/driver_controller.go

@@ -553,6 +553,10 @@ func (r *driverReconcile) reconcileControllerPluginDeployment() error {
 			utils.LeaderElectionRetryPeriodContainerArg(leaderElectionSpec.RetryPeriod),
 		}
 
+		// TODO: Move the Topology field from NodePlugin to Driver.Spec
+		nodePluginSpec := cmp.Or(r.driver.Spec.NodePlugin, &csiv1a1.NodePluginSpec{})
+		topology := r.isRdbDriver() && nodePluginSpec.Topology != nil
+
 		deploy.Spec = appsv1.DeploymentSpec{
 			Replicas: pluginSpec.Replicas,
 			Selector: &appSelector,
@@ -662,7 +666,7 @@ func (r *driverReconcile) reconcileControllerPluginDeployment() error {
 										utils.PreventVolumeModeConversionContainerArg,
 										utils.HonorPVReclaimPolicyContainerArg,
 										utils.If(r.isRdbDriver(), utils.DefaultFsTypeContainerArg, ""),
-										utils.If(r.isRdbDriver(), utils.ImmediateTopologyContainerArg, ""),
+										utils.TopologyContainerArg(topology),
 										utils.If(!r.isNfsDriver(), utils.ExtraCreateMetadataContainerArg, ""),
 									),
 								),

internal/utils/csi.go

@@ -395,7 +395,6 @@ var PoolTimeContainerArg = "--polltime=60s"
 var ExtraCreateMetadataContainerArg = "--extra-create-metadata=true"
 var PreventVolumeModeConversionContainerArg = "--prevent-volume-mode-conversion=true"
 var HonorPVReclaimPolicyContainerArg = "--feature-gates=HonorPVReclaimPolicy=true"
-var ImmediateTopologyContainerArg = "--immediate-topology=false"
 var RecoverVolumeExpansionFailureContainerArg = "--feature-gates=RecoverVolumeExpansionFailure=true"
 var EnableVolumeGroupSnapshotsContainerArg = "--feature-gates=CSIVolumeGroupSnapshot=true"
 var ForceCephKernelClientContainerArg = "--forcecephkernelclient=true"
@@ -473,3 +472,6 @@ func DomainLabelsContainerArg(options []string) string {
 		"",
 	)
 }
+func TopologyContainerArg(topology bool) string {
+	return fmt.Sprintf("--feature-gates=Topology=%t", topology)
+}