Fix passing of custom images to upstream operator

rh-messaging-qe · Oct 23, 2023 · 9dc0fd8 · 9dc0fd8
1 parent 2b12d4f
commit 9dc0fd8
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/operator-suite/src/main/java/io/brokerqe/claire/EnvironmentOperator.java b/operator-suite/src/main/java/io/brokerqe/claire/EnvironmentOperator.java
@@ -89,7 +89,6 @@ public EnvironmentOperator() {
         keycloakVersion = System.getProperty(Constants.EV_KEYCLOAK_VERSION, getDefaultKeycloakVersion());
 
         printAllUsedTestVariables();
-        checkSetProvidedImages();
     }
 
     @SuppressWarnings("checkstyle:NPathComplexity")
@@ -198,7 +197,7 @@ public Database getDatabase() {
         return null;
     }
 
-    private void checkSetProvidedImages() {
+    public void checkSetProvidedImages() {
         Path operatorFile = ArtemisFileProvider.getOperatorInstallFile();
 
         if (brokerImage != null && !brokerImage.equals("")) {

diff --git a/operator-suite/src/main/java/io/brokerqe/claire/junit/OperatorExecutionListener.java b/operator-suite/src/main/java/io/brokerqe/claire/junit/OperatorExecutionListener.java
@@ -21,6 +21,7 @@ protected void setupEnvironment() {
         if (!setupPerformed) {
             testEnvironmentOperator = ResourceManager.getEnvironment();
             setupLoggingLevel();
+            testEnvironmentOperator.checkSetProvidedImages();
             ResourceManager.getInstance(testEnvironmentOperator);
             // Following log is added for debugging purposes, when OkHttpClient leaks connection
             java.util.logging.Logger.getLogger(OkHttpClient.class.getName()).setLevel(java.util.logging.Level.FINE);

diff --git a/...ator-suite/src/main/java/io/brokerqe/claire/operator/ArtemisCloudClusterOperatorFile.java b/...ator-suite/src/main/java/io/brokerqe/claire/operator/ArtemisCloudClusterOperatorFile.java
@@ -48,11 +48,6 @@ public class ArtemisCloudClusterOperatorFile extends ArtemisCloudClusterOperator
     private Path operatorUpdatedFile;
     private Path clusterRoleBindingUpdatedFile;
 
-
-//    public FileInstallation(String deploymentNamespace, boolean isNamespaced, List<String> watchedNamespaces) {
-//        this(deploymentNamespace, isNamespaced, watchedNamespaces);
-//    }
-
     public ArtemisCloudClusterOperatorFile(String deploymentNamespace, boolean isNamespaced, List<String> watchedNamespaces) {
         super(deploymentNamespace, isNamespaced, watchedNamespaces);
 
@@ -65,7 +60,6 @@ public ArtemisCloudClusterOperatorFile(String deploymentNamespace, boolean isNam
         }
     }
 
-
     public static void deployOperatorCRDs() {
         DEFAULT_OPERATOR_INSTALL_CRD_FILES.forEach(fileName -> {
             try {
@@ -113,7 +107,6 @@ public void deployOperator(boolean waitForDeployment) {
         LOGGER.info("[{}] Cluster operator {} successfully deployed!", deploymentNamespace, operatorName);
     }
 
-
     @Override
     public void undeployOperator(boolean waitForUndeployment) {
         getUsedOperatorInstallFilesReversed().forEach(fileName -> {
@@ -145,7 +138,6 @@ public void updateClusterRoleBinding(String namespace) {
             filesToDeploy.remove(clusterRoleBindingFile);
             filesToDeploy.add(updatedClusterRoleBindingFile);
             setArtemisClusterRoleBindingFile(updatedClusterRoleBindingFile);
-
         } else {
             LOGGER.error("[{}] Namespaced operator does not use ClusterRoleBinding!", namespace);
             throw new RuntimeException("Incorrect ClusterOperator operation!");
@@ -228,20 +220,27 @@ public void setArtemisClusterRoleBindingFile(Path clusterRoleBindingFile) {
     public static void updateImagesInOperatorFile(Path operatorFile, String imageType, String imageUrl, String version) {
         List<EnvVar> envVars;
         String imageTypeVersion = null;
+        Deployment operator = TestUtils.configFromYaml(operatorFile.toFile(), Deployment.class);
+
         if (version != null) {
-            imageTypeVersion = imageType + version.replace(".", "");
+            if (version.equals("main")) {
+                imageTypeVersion = imageType + getLastVersionFromOperatorFile(imageType, operator);
+            } else {
+                imageTypeVersion = imageType + version.replace(".", "");
+            }
         }
-        Deployment operator = TestUtils.configFromYaml(operatorFile.toFile(), Deployment.class);
 
         if (imageType.equals(ArtemisConstants.OPERATOR_IMAGE_OPERATOR_PREFIX)) {
             operator.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(imageUrl);
+            LOGGER.info("[Operator] Updating OperatorImage -> {}", imageUrl);
         }
 
         if (imageType.equals(ArtemisConstants.BROKER_IMAGE_OPERATOR_PREFIX) || imageType.equals(ArtemisConstants.BROKER_INIT_IMAGE_OPERATOR_PREFIX)) {
             envVars = operator.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv();
             String finalImageTypeVersion = imageTypeVersion;
             EnvVar brokerImageEV = envVars.stream().filter(envVar -> envVar.getName().equals(finalImageTypeVersion)).findFirst().get();
             brokerImageEV.setValue(imageUrl);
+            LOGGER.info("[Operator] Updating {} -> {}", finalImageTypeVersion, imageUrl);
         }
 
         TestUtils.configToYaml(operatorFile.toFile(), operator);
@@ -282,4 +281,18 @@ public static String getOperatorControllerManagerName(Path yamlFile) {
         return operatorCODeployment.getMetadata().getName();
     }
 
+    public static String getLastVersionFromOperatorFile(String imageType, Deployment operator) {
+        List<EnvVar> envVars1 = operator.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv();
+        List<Integer> versions = new ArrayList<>();
+
+        for (EnvVar var : envVars1) {
+            if (var.getName().startsWith(imageType)) {
+                versions.add(Integer.valueOf(var.getName().substring(imageType.length())));
+            }
+        }
+        Collections.sort(versions);
+        LOGGER.trace("[Operator] Discovered latest version: {}{}", imageType, versions.get(versions.size() - 1));
+        return String.valueOf(versions.get(versions.size() - 1));
+    }
+
 }