From c4a1e3a958002a13b1c8a15ad56c6f5195a3eaa7 Mon Sep 17 00:00:00 2001
From: Praveen M <m.praveen@ibm.com>
Date: Wed, 23 Oct 2024 13:44:50 +0530
Subject: [PATCH] e2e: unset readAffinity cli option

Signed-off-by: Praveen M <m.praveen@ibm.com>
---
 e2e/deployment.go | 12 ------------
 e2e/rbd.go        |  2 --
 2 files changed, 14 deletions(-)

diff --git a/e2e/deployment.go b/e2e/deployment.go
index 12b86acdacc..f70ee3cd6a8 100644
--- a/e2e/deployment.go
+++ b/e2e/deployment.go
@@ -235,13 +235,9 @@ type yamlResourceNamespaced struct {
 	filename            string
 	namespace           string
 	domainLabel         string
-	crushLocationLabels string
 
 	// set the number of replicas in a Deployment to 1.
 	oneReplica bool
-
-	// enable read affinity support (for RBD)
-	enableReadAffinity bool
 }
 
 func (yrn *yamlResourceNamespaced) Do(action kubectlAction) error {
@@ -260,14 +256,6 @@ func (yrn *yamlResourceNamespaced) Do(action kubectlAction) error {
 		data = addTopologyDomainsToDSYaml(data, yrn.domainLabel)
 	}
 
-	if yrn.enableReadAffinity {
-		data = enableReadAffinityInTemplate(data)
-	}
-
-	if yrn.crushLocationLabels != "" {
-		data = addCrsuhLocationLabels(data, yrn.crushLocationLabels)
-	}
-
 	err = retryKubectlInput(yrn.namespace, action, data, deployTimeout)
 	if err != nil {
 		return fmt.Errorf("failed to %s resource %q in namespace %q: %w", action, yrn.filename, yrn.namespace, err)
diff --git a/e2e/rbd.go b/e2e/rbd.go
index c44a6441afa..619f7d36856 100644
--- a/e2e/rbd.go
+++ b/e2e/rbd.go
@@ -170,8 +170,6 @@ func createORDeleteRbdResources(action kubectlAction) {
 			filename:            rbdDirPath + rbdNodePlugin,
 			namespace:           cephCSINamespace,
 			domainLabel:         nodeRegionLabel + "," + nodeZoneLabel,
-			enableReadAffinity:  true,
-			crushLocationLabels: crushLocationRegionLabel + "," + crushLocationZoneLabel,
 		},
 	}