commit d84d090b171f2b479bfdcfc69dc6d214b5e21332
author Jan Bouska <jbouska@redhat.com> Wed Aug 10 08:38:20 2022 +0200
committer Pasquale Congiusti <pasquale.congiusti@gmail.com> Thu Aug 11 14:55:34 2022 +0200
tree e08729c43a3e5bf58ee2a442a14dc147cec3c534
parent 7eb48e864d3e874a8f00c47cf48aae929d12e898

Test operator image installed by the OLM

e2e/namespace/upgrade/olm_upgrade_test.go

diff --git a/e2e/namespace/upgrade/olm_upgrade_test.go b/e2e/namespace/upgrade/olm_upgrade_test.go
index b6037a4..1a27c7c 100644
--- a/e2e/namespace/upgrade/olm_upgrade_test.go
+++ b/e2e/namespace/upgrade/olm_upgrade_test.go
@@ -153,6 +153,7 @@
 			Expect(prevCSVVersion.Version.String()).NotTo(Equal(newCSVVersion.Version.String()))
 
 			Eventually(OperatorPodPhase(ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+			Eventually(OperatorImage(ns), TestTimeoutShort).Should(Equal(defaults.OperatorImage()))
 
 			// Check the IntegrationPlatform has been reconciled
 			Eventually(PlatformVersion(ns)).Should(ContainSubstring(newIPVersionPrefix))

pkg/util/defaults/defaults_support.go

diff --git a/pkg/util/defaults/defaults_support.go b/pkg/util/defaults/defaults_support.go
index 3eab69a..71b890b 100644
--- a/pkg/util/defaults/defaults_support.go
+++ b/pkg/util/defaults/defaults_support.go
@@ -18,6 +18,7 @@
 package defaults
 
 import (
+	"fmt"
 	"os"
 	"strconv"
 
@@ -28,6 +29,10 @@
 	return envOrDefault(baseImage, "KAMEL_BASE_IMAGE", "RELATED_IMAGE_BASE")
 }
 
+func OperatorImage() string {
+	return envOrDefault(fmt.Sprintf("%s:%s", ImageName, Version), "KAMEL_OPERATOR_IMAGE", "KAMEL_K_TEST_OPERATOR_CURRENT_IMAGE")
+}
+
 func InstallDefaultKamelets() bool {
 	return boolEnvOrDefault(installDefaultKamelets, "KAMEL_INSTALL_DEFAULT_KAMELETS")
 }