From 6ec09585082217822ddc3eea36ebceafc8e821bb Mon Sep 17 00:00:00 2001 From: Fabio Burzigotti Date: Sun, 10 Dec 2023 11:43:38 +0100 Subject: [PATCH 1/2] [issue 117] Bumping Kafka Operator provisioning support to Kafka 3.6.0/AMQ Streams 2.6.z, Strinzi 0.38.0 --- pom.xml | 5 ++--- .../provision/openshift/KafkaOperatorProvisionerTest.java | 2 ++ .../provision/openshift/OpenShiftProvisionerTestBase.java | 4 ++-- tools/intersmash-tools-provisioners/README.md | 4 ++-- .../application/openshift/KafkaOperatorApplication.java | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 9a1e7aa67..7c60df581 100644 --- 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 --> - 0.31-update_kn_client-SNAPSHOT + 0.31 5.7.0 @@ -38,8 +38,7 @@ 1.2.3 1.7.30 1.1 - - 0.37.0-SNAPSHOT + 0.38.0 2.13.1 6.8.1 6.8.1 diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KafkaOperatorProvisionerTest.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KafkaOperatorProvisionerTest.java index 2497ba9fd..f26d4021c 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KafkaOperatorProvisionerTest.java +++ b/testsuite/src/test/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/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java index 0a6f513a6..5e397465d 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java @@ -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 index ddbd9c195..ad6bafa4e 100644 --- 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/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/KafkaOperatorApplication.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/KafkaOperatorApplication.java index ab4772dd7..0518f9bf3 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/KafkaOperatorApplication.java +++ b/tools/intersmash-tools-provisioners/src/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; From e573fbad80d4b97032a5b8c6fc4d57cabdeb40ac Mon Sep 17 00:00:00 2001 From: Fabio Burzigotti Date: Sun, 10 Dec 2023 16:54:52 +0100 Subject: [PATCH 2/2] [issue 117] Minor formatting fixes --- .../provision/openshift/OpenShiftProvisionerTestBase.java | 2 +- .../intersmash/tools/provision/ProvisionerManagerTestCase.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java index 5e397465d..f82eed7a8 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java +++ b/testsuite/src/test/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; diff --git a/tools/intersmash-tools-provisioners/src/test/java/org/jboss/intersmash/tools/provision/ProvisionerManagerTestCase.java b/tools/intersmash-tools-provisioners/src/test/java/org/jboss/intersmash/tools/provision/ProvisionerManagerTestCase.java index 20bd4bdf7..318ad0101 100644 --- a/tools/intersmash-tools-provisioners/src/test/java/org/jboss/intersmash/tools/provision/ProvisionerManagerTestCase.java +++ b/tools/intersmash-tools-provisioners/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 | */