From 21e9acee7854701554dc2534f4b8023e380d4f6c Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Mon, 16 Dec 2024 10:28:04 +0100 Subject: [PATCH] e2e: remove vsg flag present in older snapshotter Remove the vsg flag present in the older snapshotter which is meant only for the Alpha Release and we are no longer installing Alpha CRD. Signed-off-by: Madhu Rajanna (cherry picked from commit a88f86e9a43a82aa5132bf5b2839f8aa9303a15e) --- e2e/deployment.go | 3 +++ e2e/utils.go | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/e2e/deployment.go b/e2e/deployment.go index 12b86acda..bce180538 100644 --- a/e2e/deployment.go +++ b/e2e/deployment.go @@ -252,6 +252,9 @@ func (yrn *yamlResourceNamespaced) Do(action kubectlAction) error { data = replaceLogLevelInTemplate(data) + // disable VGS alpha feature, TODO: remove this in next release (3.14.0) + data = disableVGSAlphaCLIArg(data) + if yrn.oneReplica { data = oneReplicaDeployYaml(data) } diff --git a/e2e/utils.go b/e2e/utils.go index 7e0f94d61..c02fc9d1c 100644 --- a/e2e/utils.go +++ b/e2e/utils.go @@ -820,6 +820,10 @@ func checkMountOptions(pvcPath, appPath string, f *framework.Framework, mountFla return err } +func disableVGSAlphaCLIArg(template string) string { + return strings.ReplaceAll(template, "- \"--enable-volume-group-snapshots=true\"", "") +} + func addTopologyDomainsToDSYaml(template, labels string) string { return strings.ReplaceAll(template, "# - \"--domainlabels=failure-domain/region,failure-domain/zone\"", "- \"--domainlabels="+labels+"\"")