Merge pull request Intersmash#45 from tommaso-borgato/issues-32

tommaso-borgato · May 5, 2023 · fdd4422 · fdd4422
2 parents c8c99b8 + 0c3a6ad
commit fdd4422
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 3,265 deletions.
diff --git a/README.md b/README.md
@@ -277,12 +277,13 @@ a given service on cloud environments via APIs that leverage the
 Intersmash makes this feature available for currently supported products (see the table below), but that can be 
 extended easily, since Intersmash _provisioners_ are pluggable components.
 
-| Product                   | Supported Operator version | Channel name   | Supported product version | Repository                                        | Notes                                                                               |
-|:--------------------------|:---------------------------|:---------------|:--------------------------|:--------------------------------------------------|:------------------------------------------------------------------------------------|
-| Hyperfoil                 | 0.21.0                     | alpha          | 0.23                      | https://github.com/Hyperfoil/hyperfoil-operator   |                                                                                     |
-| Infinispan                | 2.3.1                      | 2.3.x          | 14.0.6.Final              | https://github.com/infinispan/infinispan-operator |                                                                                     |
-| WildFly                   | 0.5.6                      | alpha          | 27.0.1.Final              | https://github.com/wildfly/wildfly-operator       | As available on https://operatorhub.io/operator/wildfly                             |
-| Kafka provided by Strimzi | 0.29.0                     | strimzi-0.29.x | 3.2.0                     | https://github.com/strimzi/strimzi-kafka-operator | Latest Kafka provided by Strimzi Operator version seems to require some adjustments |
+| Product                   | Supported Operator version | Channel name   | Supported product version | Repository                                                | Notes                                                                               |
+|:--------------------------|:---------------------------|:---------------|:--------------------------|:----------------------------------------------------------|:------------------------------------------------------------------------------------|
+| Hyperfoil                 | 0.21.0                     | alpha          | 0.23                      | https://github.com/Hyperfoil/hyperfoil-operator           |                                                                                     |
+| Infinispan                | 2.3.1                      | 2.3.x          | 14.0.6.Final              | https://github.com/infinispan/infinispan-operator         |                                                                                     |
+| WildFly                   | 0.5.6                      | alpha          | 27.0.1.Final              | https://github.com/wildfly/wildfly-operator               | As available on https://operatorhub.io/operator/wildfly                             |
+| Kafka provided by Strimzi | 0.29.0                     | strimzi-0.29.x | 3.2.0                     | https://github.com/strimzi/strimzi-kafka-operator         | Latest Kafka provided by Strimzi Operator version seems to require some adjustments |
+| ActiveMQ                  | 1.0.11                     | upstream       | 1.0.15                    | https://github.com/artemiscloud/activemq-artemis-operator | We are using a custom index image <b>quay.io/jbossqe-eap/intersmash-activemq-operator-catalog:v1.0.11</b> built as described in https://github.com/Intersmash/intersmash/issues/32
 
 
 Intersmash operator-based provisioners implement a common contract and high level behavior which is defined by the 

diff --git a/global-test.properties b/global-test.properties
@@ -22,7 +22,15 @@ intersmash.wildfly.operators.channel=alpha
 intersmash.wildfly.image=quay.io/wildfly/wildfly-s2i-jdk17
 intersmash.wildfly.runtime.image=quay.io/wildfly/wildfly-runtime-jdk17
 
-# Kafka operator settings
+# ActiveMQ operator settings
+# NOTE: we are using http://quay.io/jbossqe-eap for hosting our custom operator-catalog and operator-bundle images
+#       see https://github.com/Intersmash/intersmash/issues/32 for context
+intersmash.activemq.operators.catalog_source=intersmash-activemq-operator-index
+intersmash.activemq.operators.index_image=quay.io/jbossqe-eap/intersmash-activemq-operator-catalog:v1.0.11
+intersmash.activemq.operators.package_manifest=activemq-artemis-operator
+intersmash.activemq.operators.channel=upstream
+
+# Kafka community operator settings
 intersmash.kafka.operators.channel=strimzi-0.29.x
 
 # DB

diff --git a/pom.xml b/pom.xml
@@ -36,6 +36,13 @@
         <version.ide-config>1.1</version.ide-config>
         <version.io.strimzi-api>0.28.0</version.io.strimzi-api>
         <version.com.fasterxml.jackson>2.13.1</version.com.fasterxml.jackson>
+        <version.io.fabric8>6.6.0</version.io.fabric8>
+
+        <!--
+            Version used for the activemq-artemis-operator;
+            Note: we are using a custom index image built as described in https://github.com/Intersmash/intersmash/issues/32
+        -->
+        <version.intersmash.activemq.operators>v1.0.11</version.intersmash.activemq.operators>
 
         <version.impsort-maven-plugin>1.8.0</version.impsort-maven-plugin>
         <version.formatter-maven-plugin>2.21.0</version.formatter-maven-plugin>
@@ -327,6 +334,11 @@
                 <artifactId>system-stubs-jupiter</artifactId>
                 <version>${version.junit5.jupiter.system.stubs}</version>
             </dependency>
+            <dependency>
+                <groupId>io.fabric8</groupId>
+                <artifactId>generator-annotations</artifactId>
+                <version>${version.io.fabric8}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -436,6 +448,11 @@
                     <artifactId>spotless-maven-plugin</artifactId>
                     <version>${version.spotless-maven-plugin}</version>
                 </plugin>
+                <plugin>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>java-generator-maven-plugin</artifactId>
+                    <version>${version.io.fabric8}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
 

diff --git a/...a/org/jboss/intersmash/testsuite/provision/openshift/ActiveMQOperatorProvisionerTest.java b/...a/org/jboss/intersmash/testsuite/provision/openshift/ActiveMQOperatorProvisionerTest.java
@@ -30,7 +30,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import cz.xtf.core.openshift.OpenShifts;
@@ -43,7 +42,6 @@
 
 @Slf4j
 @CleanBeforeAll
-@Disabled("WIP - Disabled until global-test.properties is configured with the required property")
 public class ActiveMQOperatorProvisionerTest {
 	private static final ActiveMQOperatorProvisioner activeMQOperatorProvisioner = initializeOperatorProvisioner();
 
@@ -159,7 +157,7 @@ public void basicBrokerTest() {
 			// scaling down to 0 (graceful shutdown)
 			amq.getSpec().getDeploymentPlan().setSize(0);
 			activeMQOperatorProvisioner.activeMQArtemisesClient().replace(amq);
-			new SimpleWaiter(() -> OpenShifts.master().getPods().size() == 1).waitFor();
+			new SimpleWaiter(() -> OpenShifts.master().getLabeledPods("application", name + "-app").size() == 0).waitFor();
 
 			// delete and verify that object was removed
 			activeMQOperatorProvisioner.activeMQArtemisesClient().withName(name)

diff --git a/tools/intersmash-tools-provisioners/pom.xml b/tools/intersmash-tools-provisioners/pom.xml
@@ -142,6 +142,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>generator-annotations</artifactId>
+            <version>6.6.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -173,7 +179,6 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>java-generator-maven-plugin</artifactId>
-                <version>6.0.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -182,8 +187,12 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <source>src/main/resources/crds</source>
                     <target>target/generated-sources</target>
+                    <urls>
+                        <url>https://raw.githubusercontent.com/artemiscloud/activemq-artemis-operator/${version.intersmash.activemq.operators}/bundle/manifests/broker.amq.io_activemqartemises.yaml</url>
+                        <url>https://raw.githubusercontent.com/artemiscloud/activemq-artemis-operator/${version.intersmash.activemq.operators}/bundle/manifests/broker.amq.io_activemqartemisaddresses.yaml</url>
+                        <url>https://raw.githubusercontent.com/artemiscloud/activemq-artemis-operator/${version.intersmash.activemq.operators}/bundle/manifests/broker.amq.io_activemqartemisscaledowns.yaml</url>
+                    </urls>
                 </configuration>
             </plugin>