Merge pull request #116 from fabiobrz/bump.kafka-op-prov.2.6

[issue 117] Bumping Kafka Operator provisioning support to Kafka 3.6.0/AMQ Streams 2.6.z, Strimzi 0.38.0
Intersmash · Dec 11, 2023 · 4b0d711 · 4b0d711
2 parents bcb61f7 + e573fba
commit 4b0d711
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
             Using XTF snapshot in order to include fixes in:
             https://github.com/xtf-cz/xtf/pull/532
         -->
-        <xtf.version>0.31-update_kn_client-SNAPSHOT</xtf.version>
+        <xtf.version>0.31</xtf.version>
 
         <version.junit.jupiter>5.7.0</version.junit.jupiter>
 
@@ -38,8 +38,7 @@
         <version.logback>1.2.3</version.logback>
         <version.org.slf4j>1.7.30</version.org.slf4j>
         <version.ide-config>1.1</version.ide-config>
-        <!-- Strimzi 0.37 SNAPSHOT to have Fabric8 kubernetes client version aligned with XTF (6.8.1) -->
-        <version.io.strimzi-api>0.37.0-SNAPSHOT</version.io.strimzi-api>
+        <version.io.strimzi-api>0.38.0</version.io.strimzi-api>
         <version.com.fasterxml.jackson>2.13.1</version.com.fasterxml.jackson>
         <version.io.fabric8>6.8.1</version.io.fabric8>
         <version.openshift-client>6.8.1</version.openshift-client>

diff --git a/...java/org/jboss/intersmash/testsuite/provision/openshift/KafkaOperatorProvisionerTest.java b/...java/org/jboss/intersmash/testsuite/provision/openshift/KafkaOperatorProvisionerTest.java
@@ -59,6 +59,8 @@ public static void createOperatorGroup() throws IOException {
 
 	@AfterAll
 	public static void removeOperatorGroup() {
+		// clean any leftovers
+		operatorProvisioner.unsubscribe();
 		OpenShifts.adminBinary().execute("delete", "operatorgroup", "--all");
 		operatorProvisioner.dismiss();
 	}

diff --git a/...java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java b/...java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java
@@ -46,9 +46,9 @@
 import org.jboss.intersmash.tools.application.openshift.input.BuildInput;
 import org.jboss.intersmash.tools.application.openshift.input.BuildInputBuilder;
 import org.jboss.intersmash.tools.application.openshift.template.Eap7Template;
-import org.jboss.intersmash.tools.util.openshift.WildflyOpenShiftUtils;
 import org.jboss.intersmash.tools.application.openshift.template.RhSsoTemplate;
 import org.jboss.intersmash.tools.util.ProcessKeystoreGenerator;
+import org.jboss.intersmash.tools.util.openshift.WildflyOpenShiftUtils;
 import org.jboss.intersmash.tools.util.wildfly.Eap7CliScriptBuilder;
 
 import cz.xtf.builder.builders.SecretBuilder;
@@ -623,8 +623,8 @@ public Kafka getKafka() {
 						kafkaVersion = KafkaOperatorApplication.KAFKA_VERSION;
 						kafkaProtocol = KafkaOperatorApplication.INTER_BROKER_PROTOCOL_VERSION;
 					} else if (IntersmashTestsuiteProperties.isProductizedTestExecutionProfileEnabled()) {
-						kafkaVersion = "3.4.0";
-						kafkaProtocol = "3.4";
+						kafkaVersion = "3.6.0";
+						kafkaProtocol = "3.6";
 					} else {
 						throw new IllegalStateException(
 								String.format("Unknown Intersmash test suite execution profile: %s",

diff --git a/tools/intersmash-tools-provisioners/README.md b/tools/intersmash-tools-provisioners/README.md
@@ -87,8 +87,8 @@ extended easily, since Intersmash _provisioners_ are pluggable components.
 | Hyperfoil                 | 0.24.2                     | alpha        | 0.24.2                    | https://github.com/Hyperfoil/hyperfoil-operator           | We force the CRs version for the used Hyperfoil runtime to be 0.24.2, see https://github.com/Hyperfoil/hyperfoil-operator/issues/18                                                |
 | Infinispan                | 2.3.4                      | 2.3.x        | 14.0.17.Final             | https://github.com/infinispan/infinispan-operator         | As available on the OpenShift OperatorHub (community-operators)                                                                                                                    |
 | Red Hat DataGrid          | 8.4.8                      | 8.4.x        | 8.4.4.GA                  | https://github.com/infinispan/infinispan-operator         | As available on the OpenShift OperatorHub                                                                                                                                          | 
-| Kafka provided by Strimzi | 0.37.0-SNAPSHOT            | stable       | 3.5.1                     | https://github.com/strimzi/strimzi-kafka-operator         | A snapshot version of Strimzi API is used in order to be compatible with Fabric8 Kubernetes client artifacts                                                                       |
-| Red Hat AMQ Streams       | 2.5.0-0                    | stable       | 3.5.0                     | https://github.com/strimzi/strimzi-kafka-operator         | As available on the OpenShift OperatorHub. A snapshot version of Strimzi API is used in order to be compatible with Fabric8 Kubernetes client artifacts                            |
+| Kafka provided by Strimzi | 0.38.0                     | stable       | 3.6.0                     | https://github.com/strimzi/strimzi-kafka-operator         |                                                                                                                                                                                    |
+| Red Hat AMQ Streams       | 2.6.0-0                    | stable       | 3.6.0                     | https://github.com/strimzi/strimzi-kafka-operator         | As available on the OpenShift OperatorHub                                                                                                                                          |
 | Keycloak                  | 22.0.4                     | upstream     | 22.0.4                    | https://github.com/keycloak/keycloak/tree/main/operator   | Latest Keycloak, based on Quarkus. Supports a limited number of CR (Keycloak and KeycloakRealmImport): more to come in upcoming versions                                           |
 | Red Hat SSO               | 7.6.5-opr-003              | stable       | 7.4.6                     | https://github.com/keycloak/keycloak-operator             | Latest Red Hat SSO Operator, based on legacy Keycloak                                                                                                                              |
 | WildFly                   | 0.5.6                      | alpha        | 29.0.1.Final              | https://github.com/wildfly/wildfly-operator               | As available on https://operatorhub.io/operator/wildfly                                                                                                                            |

diff --git a/.../main/java/org/jboss/intersmash/tools/application/openshift/KafkaOperatorApplication.java b/.../main/java/org/jboss/intersmash/tools/application/openshift/KafkaOperatorApplication.java
@@ -33,8 +33,8 @@
  */
 public interface KafkaOperatorApplication extends OperatorApplication {
 
-	String KAFKA_VERSION = "3.5.1";
-	String INTER_BROKER_PROTOCOL_VERSION = "3.5";
+	String KAFKA_VERSION = "3.6.0";
+	String INTER_BROKER_PROTOCOL_VERSION = "3.6";
 	int KAFKA_INSTANCE_NUM = 3;
 	int TOPIC_RECONCILIATION_INTERVAL_SECONDS = 90;
 	long USER_RECONCILIATION_INTERVAL_SECONDS = 120L;

diff --git a/...ioners/src/test/java/org/jboss/intersmash/tools/provision/ProvisionerManagerTestCase.java b/...ioners/src/test/java/org/jboss/intersmash/tools/provision/ProvisionerManagerTestCase.java
@@ -146,7 +146,6 @@ public void eapS2iBuildTemplateProvisioner() {
 		Assertions.assertEquals(Eap7LegacyS2iBuildTemplateProvisioner.class, actual.getClass());
 	}
 
-
 	/**
 	 * | RhSsoTemplateOpenShiftApplication      | TEMPLATE | RhSsoTemplateOpenShiftProvisioner   |
 	 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -146,7 +146,6 @@ public void eapS2iBuildTemplateProvisioner() { @@
     		Assertions.assertEquals(Eap7LegacyS2iBuildTemplateProvisioner.class, actual.getClass());
     	}
     	/**
     	 * | RhSsoTemplateOpenShiftApplication      | TEMPLATE | RhSsoTemplateOpenShiftProvisioner   |
     	 */
@@ Expand Down @@