From 202f43c82d63d37bd765dea7ecf8de4037eca7b6 Mon Sep 17 00:00:00 2001
From: Praveen M <m.praveen@ibm.com>
Date: Tue, 11 Jun 2024 21:03:22 +0530
Subject: [PATCH] e2e: remove enableTopologyInTemplate method

This commit removes `enableTopologyInTemplate` method as this is not
needed anymore.

Signed-off-by: Praveen M <m.praveen@ibm.com>
---
 e2e/deployment.go | 7 -------
 e2e/rbd.go        | 7 +++----
 e2e/utils.go      | 4 ----
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/e2e/deployment.go b/e2e/deployment.go
index 1e7de8f7be8..15e6ce885a4 100644
--- a/e2e/deployment.go
+++ b/e2e/deployment.go
@@ -240,9 +240,6 @@ type yamlResourceNamespaced struct {
 	// set the number of replicas in a Deployment to 1.
 	oneReplica bool
 
-	// enable topology support (for RBD)
-	enableTopology bool
-
 	// enable read affinity support (for RBD)
 	enableReadAffinity bool
 }
@@ -257,10 +254,6 @@ func (yrn *yamlResourceNamespaced) Do(action kubectlAction) error {
 		data = oneReplicaDeployYaml(data)
 	}
 
-	if yrn.enableTopology {
-		data = enableTopologyInTemplate(data)
-	}
-
 	if yrn.domainLabel != "" {
 		data = addTopologyDomainsToDSYaml(data, yrn.domainLabel)
 	}
diff --git a/e2e/rbd.go b/e2e/rbd.go
index 5b73dbadc0c..c44a6441afa 100644
--- a/e2e/rbd.go
+++ b/e2e/rbd.go
@@ -156,10 +156,9 @@ func createORDeleteRbdResources(action kubectlAction) {
 		},
 		// the provisioner itself
 		&yamlResourceNamespaced{
-			filename:       rbdDirPath + rbdProvisioner,
-			namespace:      cephCSINamespace,
-			oneReplica:     true,
-			enableTopology: true,
+			filename:   rbdDirPath + rbdProvisioner,
+			namespace:  cephCSINamespace,
+			oneReplica: true,
 		},
 		// dependencies for the node-plugin
 		&yamlResourceNamespaced{
diff --git a/e2e/utils.go b/e2e/utils.go
index e316363f868..f2cbcfc3a91 100644
--- a/e2e/utils.go
+++ b/e2e/utils.go
@@ -823,10 +823,6 @@ func oneReplicaDeployYaml(template string) string {
 	return re.ReplaceAllString(template, `$1 1`)
 }
 
-func enableTopologyInTemplate(data string) string {
-	return strings.ReplaceAll(data, "--feature-gates=Topology=false", "--feature-gates=Topology=true")
-}
-
 func enableReadAffinityInTemplate(template string) string {
 	return strings.ReplaceAll(template, "# - \"--enable-read-affinity=true\"", "- \"--enable-read-affinity=true\"")
 }