mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-12-18 02:50:30 +00:00
e2e: remove enableTopologyInTemplate method
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:
parent
97b847fd6a
commit
202f43c82d
@ -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)
|
||||
}
|
||||
|
@ -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{
|
||||
|
@ -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\"")
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user