Skip to content

Commit

Permalink
e2e: remove enableTopologyInTemplate method
Browse files Browse the repository at this point in the history
This commit removes `enableTopologyInTemplate` method as this is not
needed anymore.

Signed-off-by: Praveen M <[email protected]>
  • Loading branch information
iPraveenParihar authored and mergify[bot] committed Jun 13, 2024
1 parent 97b847f commit 202f43c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
7 changes: 0 additions & 7 deletions e2e/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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)
}
Expand Down
7 changes: 3 additions & 4 deletions e2e/rbd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 0 additions & 4 deletions e2e/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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\"")
}
Expand Down

0 comments on commit 202f43c

Please sign in to comment.