[1.11] Backport/kafka2.7 (#286)

* Kafka 2.7 upgrade
quarkus-qe · May 13, 2021 · b26b96d · b26b96d
1 parent 216be91
commit b26b96d
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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
@@ -77,7 +77,7 @@
 
         <dependency>
             <groupId>io.strimzi</groupId>
-            <artifactId>test-container</artifactId>
+            <artifactId>strimzi-test-container</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/...rc/test/java/io/quarkus/ts/openshift/messaging/kafka/containers/StrimziKafkaResource.java b/...rc/test/java/io/quarkus/ts/openshift/messaging/kafka/containers/StrimziKafkaResource.java
@@ -19,12 +19,11 @@ public class StrimziKafkaResource implements QuarkusTestResourceLifecycleManager
     @Override
     public Map<String, String> 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();
-
         String kafkaUrl = kafkaContainer.getBootstrapServers();
         String registryUrl = schemaRegistry.getSchemaRegistryUrl();
         LOG.info(String.format("TestContainers Kafka URL -> %s", kafkaUrl));

diff --git a/messaging/kafka-streams-reactive-messaging/pom.xml b/messaging/kafka-streams-reactive-messaging/pom.xml
@@ -50,7 +50,7 @@
 
         <dependency>
             <groupId>io.strimzi</groupId>
-            <artifactId>test-container</artifactId>
+            <artifactId>strimzi-test-container</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/...messaging/src/test/java/io/quarkus/ts/openshift/messaging/kafka/StrimziKafkaResource.java b/...messaging/src/test/java/io/quarkus/ts/openshift/messaging/kafka/StrimziKafkaResource.java
@@ -14,7 +14,7 @@ public class StrimziKafkaResource implements QuarkusTestResourceLifecycleManager
 
     @Override
     public Map<String, String> 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
@@ -15,7 +15,6 @@
         <module>app-metadata/deployment</module>
         <module>app-metadata/runtime</module>
         <module>common</module>
-
         <module>http/http-minimum</module>
         <module>http/http-advanced</module>
         <module>configmap/api-server</module>
@@ -50,11 +49,9 @@
         <module>microprofile</module>
         <module>micrometer/prometheus</module>
         <module>micrometer/prometheus-kafka</module>
-
         <module>external-applications/todo-demo-app</module>
         <module>external-applications/quarkus-workshop-super-heroes</module>
         <module>external-applications/quickstart-using-s2i</module>
-
         <module>deployment-strategies/quarkus</module>
     </modules>
 
@@ -69,8 +66,8 @@
         <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
         <version.apicurio.registry.utils.serde>1.3.2.Final</version.apicurio.registry.utils.serde>
-        <version.quarkiverse.apicurio.registry.client>0.0.1</version.quarkiverse.apicurio.registry.client>
-        <version.strimzi>0.20.1</version.strimzi>
+        <version.quarkiverse.apicurio.registry.client>0.0.2</version.quarkiverse.apicurio.registry.client>
+        <version.strimzi>0.22.1</version.strimzi>
         <version.apache-httpclient-fluent>4.5.12</version.apache-httpclient-fluent> <!-- same as Apache HTTP Client managed by Quarkus BOM -->
         <version.fusesource-jansi>2.2.0</version.fusesource-jansi>
         <version.impsort-maven-plugin>1.5.0</version.impsort-maven-plugin>
@@ -143,7 +140,7 @@
             </dependency>
             <dependency>
                 <groupId>io.strimzi</groupId>
-                <artifactId>test-container</artifactId>
+                <artifactId>strimzi-test-container</artifactId>
                 <version>${version.strimzi}</version>
                 <scope>test</scope>
             </dependency>