mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-22 14:20:19 +00:00
e2e: unset readAffinity cli option
Signed-off-by: Praveen M <m.praveen@ibm.com>
This commit is contained in:
parent
0df5de9d57
commit
4a34a891cf
@ -235,13 +235,9 @@ type yamlResourceNamespaced struct {
|
|||||||
filename string
|
filename string
|
||||||
namespace string
|
namespace string
|
||||||
domainLabel string
|
domainLabel string
|
||||||
crushLocationLabels string
|
|
||||||
|
|
||||||
// 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 read affinity support (for RBD)
|
|
||||||
enableReadAffinity bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (yrn *yamlResourceNamespaced) Do(action kubectlAction) error {
|
func (yrn *yamlResourceNamespaced) Do(action kubectlAction) error {
|
||||||
@ -260,14 +256,6 @@ func (yrn *yamlResourceNamespaced) Do(action kubectlAction) error {
|
|||||||
data = addTopologyDomainsToDSYaml(data, yrn.domainLabel)
|
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)
|
err = retryKubectlInput(yrn.namespace, action, data, deployTimeout)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to %s resource %q in namespace %q: %w", action, yrn.filename, yrn.namespace, err)
|
return fmt.Errorf("failed to %s resource %q in namespace %q: %w", action, yrn.filename, yrn.namespace, err)
|
||||||
|
@ -170,8 +170,6 @@ func createORDeleteRbdResources(action kubectlAction) {
|
|||||||
filename: rbdDirPath + rbdNodePlugin,
|
filename: rbdDirPath + rbdNodePlugin,
|
||||||
namespace: cephCSINamespace,
|
namespace: cephCSINamespace,
|
||||||
domainLabel: nodeRegionLabel + "," + nodeZoneLabel,
|
domainLabel: nodeRegionLabel + "," + nodeZoneLabel,
|
||||||
enableReadAffinity: true,
|
|
||||||
crushLocationLabels: crushLocationRegionLabel + "," + crushLocationZoneLabel,
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user