mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-17 20:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e: remove enableTopologyInTemplate method

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

Signed-off-by: Praveen M <m.praveen@ibm.com>
This commit is contained in:
Praveen M 2024-06-11 21:03:22 +05:30 committed by mergify[bot]
parent 97b847fd6a
commit 202f43c82d
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
e2e/deployment.go
View File

@ -240,9 +240,6 @@ type yamlResourceNamespaced struct {
// set the number of replicas in a Deployment to 1. // set the number of replicas in a Deployment to 1.
oneReplica bool oneReplica bool
// enable topology support (for RBD)
enableTopology bool
// enable read affinity support (for RBD) // enable read affinity support (for RBD)
enableReadAffinity bool enableReadAffinity bool
} }
@ -257,10 +254,6 @@ func (yrn *yamlResourceNamespaced) Do(action kubectlAction) error {
data = oneReplicaDeployYaml(data) data = oneReplicaDeployYaml(data)
} }
if yrn.enableTopology {
data = enableTopologyInTemplate(data)
}
if yrn.domainLabel != "" { if yrn.domainLabel != "" {
data = addTopologyDomainsToDSYaml(data, yrn.domainLabel) data = addTopologyDomainsToDSYaml(data, yrn.domainLabel)
} }

7
e2e/rbd.go
View File

@ -156,10 +156,9 @@ func createORDeleteRbdResources(action kubectlAction) {
}, },
// the provisioner itself // the provisioner itself
&yamlResourceNamespaced{ &yamlResourceNamespaced{
filename: rbdDirPath + rbdProvisioner, filename: rbdDirPath + rbdProvisioner,
namespace: cephCSINamespace, namespace: cephCSINamespace,
oneReplica: true, oneReplica: true,
enableTopology: true,
}, },
// dependencies for the node-plugin // dependencies for the node-plugin
&yamlResourceNamespaced{ &yamlResourceNamespaced{

4
e2e/utils.go
View File

@ -823,10 +823,6 @@ func oneReplicaDeployYaml(template string) string {
return re.ReplaceAllString(template, `$1 1`) 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 { func enableReadAffinityInTemplate(template string) string {
return strings.ReplaceAll(template, "# - \"--enable-read-affinity=true\"", "- \"--enable-read-affinity=true\"") return strings.ReplaceAll(template, "# - \"--enable-read-affinity=true\"", "- \"--enable-read-affinity=true\"")
} }