diff --git a/e2e/deployment.go b/e2e/deployment.go index 12b86acda..f70ee3cd6 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 c44a6441a..619f7d368 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, }, }