Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[issue 117] Bumping Kafka Operator provisioning support to Kafka 3.6.0/AMQ Streams 2.6.z, Strimzi 0.38.0 #116

Merged
merged 2 commits into from
Dec 11, 2023
Merged

[issue 117] Bumping Kafka Operator provisioning support to Kafka 3.6.0/AMQ Streams 2.6.z, Strimzi 0.38.0 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ec0958
[issue 117] Bumping Kafka Operator provisioning support to Kafka 3.6.…
fabiobrz Dec 10, 2023
e573fba
[issue 117] Minor formatting fixes
fabiobrz Dec 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions ...java/org/jboss/intersmash/testsuite/provision/openshift/KafkaOperatorProvisionerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
6 changes: 3 additions & 3 deletions ...java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions tools/intersmash-tools-provisioners/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
4 changes: 2 additions & 2 deletions .../main/java/org/jboss/intersmash/tools/application/openshift/KafkaOperatorApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion ...ioners/src/test/java/org/jboss/intersmash/tools/provision/ProvisionerManagerTestCase.java
View file
Open in desktop
Original file line number Diff 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