diff --git a/README.md b/README.md index d1be9eac..3f2842a6 100644 --- a/README.md +++ b/README.md @@ -151,8 +151,8 @@ Feel free to submit an issue in such a case, Intersmash welcomes community contr | Infinispan | 15.0.5.Final | Or _default_ provided by the default Infinispan Operator `stable` channel | | Red Hat Data Grid | 8.5.0.GA | Or _default_ provided by the Red Hat DataGrid Operator `stable` channel | | | | | -| Kafka provided by Strimzi | 3.6.0 | Provided by the Strimzi Operator `stable` channel | -| Red Hat AMQ Streams | 3.6.0.redhat-00005 | Or _default_, as provided by the Red Hat AMQ Streams Operator `stable` channel | +| Kafka provided by Strimzi | 3.8.0 | Provided by the Strimzi Operator `stable` channel | +| Red Hat AMQ Streams | 3.8.0.redhat-00007 | Or _default_, as provided by the Red Hat AMQ Streams Operator `stable` channel | | | | | | Keycloak | 24.0.3 | Or _default_, as provided by default by the Keycloak Operator `fast` channel | | Red Hat Build of keycloak (RHBK) | 24.0.3.redhat-00004 | Or _latest_ in the `:24` tag image stream, see registry.redhat.io/rhbk/keycloak-rhel9 | @@ -162,7 +162,7 @@ Feel free to submit an issue in such a case, Intersmash welcomes community contr | Red Hat JBoss EAP 8 | JBoss EAP 8.0.x (and XP 5.x) | | | Red Hat JBoss EAP 7 | JBoss EAP 7.4.z (and XP 4.z) | | | | | | -| Hyperfoil | 0.24.2 | Supports provisioning via the Operator, both on **Kubernetes** and **OpenShift** | +| Hyperfoil | 0.24.2 | Supports provisioning via the Operator, both on **Kubernetes** and **OpenShift** | Since multiple deliverables can be bound to a given service version, e.g.: container images, operator CRs, or Helm Charts, more information can be found in [the provisioners' documentation](./provisioners/README.md), or in the resources there linked. diff --git a/docs/Operator-Based-Provisioning.md b/docs/Operator-Based-Provisioning.md index 14a94700..c6c859dc 100644 --- a/docs/Operator-Based-Provisioning.md +++ b/docs/Operator-Based-Provisioning.md @@ -14,7 +14,7 @@ extended easily, since Intersmash _provisioners_ are pluggable components. | Infinispan | 2.4.5 | stable | https://github.com/infinispan/infinispan-operator | As available on the OpenShift OperatorHub (community-operators) | | Red Hat DataGrid | 8.5.2 | stable | https://github.com/infinispan/infinispan-operator | As available on the OpenShift OperatorHub | | Kafka provided by Strimzi | 0.44.0 | stable | https://github.com/strimzi/strimzi-kafka-operator | | -| Red Hat AMQ Streams | 2.7.0-3 | stable | https://github.com/strimzi/strimzi-kafka-operator | As available on the OpenShift OperatorHub | +| Red Hat AMQ Streams | 2.8.0-0 | stable | https://github.com/strimzi/strimzi-kafka-operator | As available on the OpenShift OperatorHub | | Keycloak | 24.0.3 | fast | 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 Build of keycloak (RHBK) | 24.0.3-opr.1 | stable-v24 | https://github.com/keycloak/keycloak/tree/main/operator | Latest Keycloak, based on Quarkus. | | Red Hat SSO - **DEPRECATED** | 7.6.8-opr-001 | stable | https://github.com/keycloak/keycloak-operator | Latest Red Hat SSO Operator, based on legacy Keycloak | diff --git a/provisioners/src/main/java/org/jboss/intersmash/provision/operator/KafkaOperatorProvisioner.java b/provisioners/src/main/java/org/jboss/intersmash/provision/operator/KafkaOperatorProvisioner.java index 10df4fe2..f0d1a6f1 100644 --- a/provisioners/src/main/java/org/jboss/intersmash/provision/operator/KafkaOperatorProvisioner.java +++ b/provisioners/src/main/java/org/jboss/intersmash/provision/operator/KafkaOperatorProvisioner.java @@ -104,7 +104,7 @@ public List getZookeeperPods() { } public void waitForKafkaClusterCreation() { - FailFastCheck ffCheck = () -> false; + FailFastCheck ffCheck = getFailFastCheck(); int expectedReplicas = getApplication().getKafka().getSpec().getKafka().getReplicas(); new SimpleWaiter(() -> kafka().get() != null) .failFast(ffCheck) @@ -121,7 +121,7 @@ public void waitForKafkaClusterCreation() { .reason("Wait for a conditions field of the Kafka cluster instance to be initialized.") .level(Level.DEBUG) .waitFor(); - new SimpleWaiter(() -> kafka().get().getStatus().getConditions().size() > 0) + new SimpleWaiter(() -> !kafka().get().getStatus().getConditions().isEmpty()) .failFast(ffCheck) .reason("Wait for a conditions field of the Kafka cluster instance to contain at least one condition.") .level(Level.DEBUG) diff --git a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java index 33898660..f473f142 100644 --- a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java +++ b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java @@ -559,21 +559,8 @@ public static KafkaOperatorApplication getKafkaApplication() { @Override public Kafka getKafka() { if (kafka == null) { - final String kafkaVersion, kafkaProtocol; - if (IntersmashTestsuiteProperties.isCommunityTestExecutionProfileEnabled()) { - kafkaVersion = KafkaOperatorApplication.KAFKA_VERSION; - kafkaProtocol = KafkaOperatorApplication.INTER_BROKER_PROTOCOL_VERSION; - } else if (IntersmashTestsuiteProperties.isProductizedTestExecutionProfileEnabled()) { - kafkaVersion = "3.6.0"; - kafkaProtocol = "3.6"; - } else { - throw new IllegalStateException( - String.format("Unknown Intersmash test suite execution profile: %s", - IntersmashTestsuiteProperties.getTestExecutionProfile())); - } - Map config = new HashMap<>(); - config.put("inter.broker.protocol.version", kafkaProtocol); + config.put("inter.broker.protocol.version", KafkaOperatorApplication.INTER_BROKER_PROTOCOL_VERSION); config.put("offsets.topic.replication.factor", KAFKA_INSTANCE_NUM); config.put("transaction.state.log.min.isr", KAFKA_INSTANCE_NUM); config.put("transaction.state.log.replication.factor", KAFKA_INSTANCE_NUM); @@ -604,7 +591,7 @@ public Kafka getKafka() { .endKafkaAuthorizationSimple() .withReplicas(KAFKA_INSTANCE_NUM) .withNewEphemeralStorage().endEphemeralStorage() - .withVersion(kafkaVersion) + .withVersion(KafkaOperatorApplication.KAFKA_VERSION) .endKafka() .withNewZookeeper() .withReplicas(KAFKA_INSTANCE_NUM)