Update to the newest Kafka + some minor changes (#53)

* Update to the newest Kafka + some minor changes Signed-off-by: see-quick <maros.orsak159@gmail.com> * tom commend Signed-off-by: see-quick <maros.orsak159@gmail.com> * back to contains but let startWith method Signed-off-by: see-quick <maros.orsak159@gmail.com> --------- Signed-off-by: see-quick <maros.orsak159@gmail.com>
strimzi · Feb 28, 2023 · a4fa1ce · a4fa1ce
1 parent c5f9854
commit a4fa1ce
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/io/strimzi/test/container/StrimziKafkaContainer.java b/src/main/java/io/strimzi/test/container/StrimziKafkaContainer.java
@@ -116,7 +116,7 @@ protected void doStart() {
             this.imageNameProvider.complete(KafkaVersionService.strimziTestContainerImageName(this.kafkaVersion));
         }
         try {
-            if (this.useKraft && ((this.kafkaVersion != null && this.kafkaVersion.equals("2.8.1")) || this.imageNameProvider.get().contains("2.8.1"))) {
+            if (this.useKraft && ((this.kafkaVersion != null && this.kafkaVersion.startsWith("2.")) || this.imageNameProvider.get().contains("2.8.2"))) {
                 throw new UnsupportedKraftKafkaVersionException("Specified Kafka version " + this.kafkaVersion + " is not supported in KRaft mode.");
             }
         } catch (InterruptedException | ExecutionException e) {
@@ -163,7 +163,7 @@ public StrimziKafkaContainer waitForRunning() {
         if (this.useKraft) {
             super.waitingFor(Wait.forLogMessage(".*Transitioning from RECOVERY to RUNNING.*", 1));
         } else {
-            super.waitingFor(Wait.forLogMessage(".*Recorded new controller, from now on will use broker.*", 1));
+            super.waitingFor(Wait.forLogMessage(".*Recorded new controller, from now on will use [node|broker].*", 1));
         }
         return this;
     }

diff --git a/src/main/resources/kafka_versions.json b/src/main/resources/kafka_versions.json
@@ -1,10 +1,10 @@
 {
   "kafkaVersions": {
-    "2.8.1": "quay.io/strimzi-test-container/test-container:latest-kafka-2.8.1",
-    "3.0.1": "quay.io/strimzi-test-container/test-container:latest-kafka-3.0.1",
-    "3.1.0": "quay.io/strimzi-test-container/test-container:latest-kafka-3.1.0",
-    "3.1.1": "quay.io/strimzi-test-container/test-container:latest-kafka-3.1.1",
-    "3.2.0": "quay.io/strimzi-test-container/test-container:latest-kafka-3.2.0",
-    "3.2.1": "quay.io/strimzi-test-container/test-container:latest-kafka-3.2.1"
+    "2.8.2": "quay.io/strimzi-test-container/test-container:latest-kafka-2.8.2",
+    "3.0.2": "quay.io/strimzi-test-container/test-container:latest-kafka-3.0.2",
+    "3.1.2": "quay.io/strimzi-test-container/test-container:latest-kafka-3.1.2",
+    "3.2.3": "quay.io/strimzi-test-container/test-container:latest-kafka-3.2.3",
+    "3.3.2": "quay.io/strimzi-test-container/test-container:latest-kafka-3.3.2",
+    "3.4.0": "quay.io/strimzi-test-container/test-container:latest-kafka-3.4.0"
   }
 }
diff --git a/src/test/java/io/strimzi/test/container/StrimziKafkaKraftContainerIT.java b/src/test/java/io/strimzi/test/container/StrimziKafkaKraftContainerIT.java
@@ -110,7 +110,7 @@ void testUnsupportedKRaftUsingKafkaVersion() {
 
         try {
             systemUnderTest = new StrimziKafkaContainer()
-                .withKafkaVersion("2.8.1")
+                .withKafkaVersion("2.8.2")
                 .withBrokerId(1)
                 .withKraft()
                 .waitForRunning();
@@ -127,7 +127,7 @@ void testUnsupportedKRaftUsingImageName() {
         assumeDocker();
 
         try {
-            systemUnderTest = new StrimziKafkaContainer("quay.io/strimzi-test-container/test-container:latest-kafka-2.8.1")
+            systemUnderTest = new StrimziKafkaContainer("quay.io/strimzi-test-container/test-container:latest-kafka-2.8.2")
                 .withBrokerId(1)
                 .withKraft()
                 .waitForRunning();