[camel-k] branch main updated: Test operator image installed by the OLM

[pcongiusti]

This is an automated email from the ASF dual-hosted git repository.

pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git


The following commit(s) were added to refs/heads/main by this push:
     new d84d090b1 Test operator image installed by the OLM
d84d090b1 is described below

commit d84d090b171f2b479bfdcfc69dc6d214b5e21332
Author: Jan Bouska <jbou...@redhat.com>
AuthorDate: Wed Aug 10 08:38:20 2022 +0200

    Test operator image installed by the OLM
---
 e2e/namespace/upgrade/olm_upgrade_test.go | 1 +
 pkg/util/defaults/defaults_support.go     | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/e2e/namespace/upgrade/olm_upgrade_test.go 
b/e2e/namespace/upgrade/olm_upgrade_test.go
index b6037a4f5..1a27c7c60 100644
--- a/e2e/namespace/upgrade/olm_upgrade_test.go
+++ b/e2e/namespace/upgrade/olm_upgrade_test.go
@@ -153,6 +153,7 @@ func TestOLMAutomaticUpgrade(t *testing.T) {
                        
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))
diff --git a/pkg/util/defaults/defaults_support.go 
b/pkg/util/defaults/defaults_support.go
index 3eab69a58..71b890bb9 100644
--- a/pkg/util/defaults/defaults_support.go
+++ b/pkg/util/defaults/defaults_support.go
@@ -18,6 +18,7 @@ limitations under the License.
 package defaults
 
 import (
+       "fmt"
        "os"
        "strconv"
 
@@ -28,6 +29,10 @@ func BaseImage() string {
        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")
 }