From de46c7e37bca8d599885fc1f53119060174d6c28 Mon Sep 17 00:00:00 2001 From: Mikhail Abramov Date: Thu, 8 Aug 2024 09:10:02 +0200 Subject: [PATCH] OSSM-6818: Update TestMustGather image repo (#724) --- pkg/util/env/env.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkg/util/env/env.go b/pkg/util/env/env.go index 2af48cbb..0307798e 100644 --- a/pkg/util/env/env.go +++ b/pkg/util/env/env.go @@ -66,14 +66,7 @@ func GetTestGroup() string { } func GetMustGatherImage() string { - operatorVersion := GetOperatorVersion() - if operatorVersion.LessThan(version.OPERATOR_2_6_0) { - return "registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel8:" + GetMustGatherTag() - } else { - // https://issues.redhat.com/browse/OSSM-6818 - // TODO: Else conditional should be errased after 2.6.0 release - return "brew.registry.redhat.io/rh-osbs/openshift-service-mesh-istio-must-gather-rhel8:2.6.0" - } + return getenv("MUST_GATHER_IMAGE", "registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel8:"+GetMustGatherTag()) } func GetMustGatherTag() string {