From 482177f67f2ab7266f4e10a7c4b2e2a41762fc5a Mon Sep 17 00:00:00 2001 From: pablo gonzalez granados Date: Thu, 6 May 2021 10:03:58 +0200 Subject: [PATCH 1/2] Kafka 2.7 upgrade --- .../src/main/resources/deployments/kafka/amq-streams.yaml | 4 +++- common/src/main/resources/deployments/kafka/strimzi.yaml | 4 +++- messaging/kafka-avro-reactive-messaging/pom.xml | 2 +- .../messaging/kafka/containers/StrimziKafkaResource.java | 6 ++---- messaging/kafka-streams-reactive-messaging/pom.xml | 2 +- .../ts/openshift/messaging/kafka/StrimziKafkaResource.java | 2 +- pom.xml | 4 ++-- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/common/src/main/resources/deployments/kafka/amq-streams.yaml b/common/src/main/resources/deployments/kafka/amq-streams.yaml index 8658ff94..b3611ff8 100644 --- a/common/src/main/resources/deployments/kafka/amq-streams.yaml +++ b/common/src/main/resources/deployments/kafka/amq-streams.yaml @@ -47,7 +47,7 @@ items: terminationGracePeriodSeconds: 10 containers: - name: kafka-broker-1 - image: registry.redhat.io/amq7/amq-streams-kafka-24-rhel7:1.5.0 + image: registry.redhat.io/amq7/amq-streams-kafka-27-rhel7:1.7.0 imagePullPolicy: IfNotPresent command: [ "/bin/sh" ] args: [ "-c", "bin/kafka-server-start.sh config/server.properties --override listeners=$${KAFKA_LISTENERS} --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override zookeeper.connect=$${KAFKA_ZOOKEEPER_CONNECT}" ] @@ -58,6 +58,8 @@ items: value: "PLAINTEXT://0.0.0.0:9092" - name: KAFKA_ZOOKEEPER_CONNECT value: zookeeper-service:2181 + - name: LOG_DIR + value: "/tmp/kafka/logs" ports: - containerPort: 9092 resources: {} diff --git a/common/src/main/resources/deployments/kafka/strimzi.yaml b/common/src/main/resources/deployments/kafka/strimzi.yaml index daff00f5..997c3366 100644 --- a/common/src/main/resources/deployments/kafka/strimzi.yaml +++ b/common/src/main/resources/deployments/kafka/strimzi.yaml @@ -47,7 +47,7 @@ items: terminationGracePeriodSeconds: 10 containers: - name: kafka-broker-1 - image: strimzi/kafka:0.18.0-kafka-2.5.0 + image: quay.io/strimzi/kafka:latest-kafka-2.7.0 imagePullPolicy: IfNotPresent command: [ "/bin/sh" ] args: [ "-c", "bin/kafka-server-start.sh config/server.properties --override listeners=$${KAFKA_LISTENERS} --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override zookeeper.connect=$${KAFKA_ZOOKEEPER_CONNECT}" ] @@ -58,6 +58,8 @@ items: value: "PLAINTEXT://0.0.0.0:9092" - name: KAFKA_ZOOKEEPER_CONNECT value: zookeeper-service:2181 + - name: LOG_DIR + value: "/tmp/kafka/logs" ports: - containerPort: 9092 resources: {} diff --git a/messaging/kafka-avro-reactive-messaging/pom.xml b/messaging/kafka-avro-reactive-messaging/pom.xml index c8d387fd..5c3f9cfd 100644 --- a/messaging/kafka-avro-reactive-messaging/pom.xml +++ b/messaging/kafka-avro-reactive-messaging/pom.xml @@ -60,7 +60,7 @@ io.strimzi - test-container + strimzi-test-container test diff --git a/messaging/kafka-avro-reactive-messaging/src/test/java/io/quarkus/ts/openshift/messaging/kafka/containers/StrimziKafkaResource.java b/messaging/kafka-avro-reactive-messaging/src/test/java/io/quarkus/ts/openshift/messaging/kafka/containers/StrimziKafkaResource.java index 37176feb..8dabbd7c 100644 --- a/messaging/kafka-avro-reactive-messaging/src/test/java/io/quarkus/ts/openshift/messaging/kafka/containers/StrimziKafkaResource.java +++ b/messaging/kafka-avro-reactive-messaging/src/test/java/io/quarkus/ts/openshift/messaging/kafka/containers/StrimziKafkaResource.java @@ -20,10 +20,8 @@ public class StrimziKafkaResource implements QuarkusTestResourceLifecycleManager @Override public Map start() { Network network = Network.newNetwork(); - - kafkaContainer = new StrimziKafkaContainer("0.18.0-kafka-2.5.0").withNetwork(network); - schemaRegistry = new SchemaRegistryContainer("apicurio/apicurio-registry-mem", "1.2.2.Final", 8080).withNetwork(network) - .withKafka(kafkaContainer, 9092); + kafkaContainer = new StrimziKafkaContainer("latest-kafka-2.7.0").withNetwork(network); + schemaRegistry = new SchemaRegistryContainer("apicurio/apicurio-registry-mem", "1.2.2.Final", 8080).withNetwork(network).withKafka(kafkaContainer, 9092); Startables.deepStart(Stream.of(kafkaContainer, schemaRegistry)).join(); diff --git a/messaging/kafka-streams-reactive-messaging/pom.xml b/messaging/kafka-streams-reactive-messaging/pom.xml index 8151cf7e..e3158832 100644 --- a/messaging/kafka-streams-reactive-messaging/pom.xml +++ b/messaging/kafka-streams-reactive-messaging/pom.xml @@ -41,7 +41,7 @@ io.strimzi - test-container + strimzi-test-container test diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/openshift/messaging/kafka/StrimziKafkaResource.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/openshift/messaging/kafka/StrimziKafkaResource.java index 08dc5514..c007b4da 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/openshift/messaging/kafka/StrimziKafkaResource.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/openshift/messaging/kafka/StrimziKafkaResource.java @@ -15,7 +15,7 @@ public class StrimziKafkaResource implements QuarkusTestResourceLifecycleManager @Override public Map start() { - kafkaContainer = new StrimziKafkaContainer("0.18.0-kafka-2.5.0"); + kafkaContainer = new StrimziKafkaContainer("latest-kafka-2.7.0"); kafkaContainer.start(); String kafkaUrl = kafkaContainer.getBootstrapServers(); diff --git a/pom.xml b/pom.xml index 28dbc0b3..608f1e8a 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ io.quarkus 1.3.2.Final 0.0.2 - 0.20.1 + 0.22.1 4.5.13 2.3.2 @@ -137,7 +137,7 @@ io.strimzi - test-container + strimzi-test-container ${version.strimzi} test From 65b81bd86605be4f651bfba8f9378a7902c72e6d Mon Sep 17 00:00:00 2001 From: pablo gonzalez granados Date: Mon, 10 May 2021 09:23:31 +0200 Subject: [PATCH 2/2] Formatting common/deploy/UsingQuarkusPluginDeploymentStrategy.java --- .../messaging/kafka/containers/StrimziKafkaResource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/messaging/kafka-avro-reactive-messaging/src/test/java/io/quarkus/ts/openshift/messaging/kafka/containers/StrimziKafkaResource.java b/messaging/kafka-avro-reactive-messaging/src/test/java/io/quarkus/ts/openshift/messaging/kafka/containers/StrimziKafkaResource.java index 8dabbd7c..7ba961cc 100644 --- a/messaging/kafka-avro-reactive-messaging/src/test/java/io/quarkus/ts/openshift/messaging/kafka/containers/StrimziKafkaResource.java +++ b/messaging/kafka-avro-reactive-messaging/src/test/java/io/quarkus/ts/openshift/messaging/kafka/containers/StrimziKafkaResource.java @@ -21,7 +21,8 @@ public class StrimziKafkaResource implements QuarkusTestResourceLifecycleManager public Map start() { Network network = Network.newNetwork(); kafkaContainer = new StrimziKafkaContainer("latest-kafka-2.7.0").withNetwork(network); - schemaRegistry = new SchemaRegistryContainer("apicurio/apicurio-registry-mem", "1.2.2.Final", 8080).withNetwork(network).withKafka(kafkaContainer, 9092); + schemaRegistry = new SchemaRegistryContainer("apicurio/apicurio-registry-mem", "1.2.2.Final", 8080).withNetwork(network) + .withKafka(kafkaContainer, 9092); Startables.deepStart(Stream.of(kafkaContainer, schemaRegistry)).join();