Revert "feat : migrate to use official apache kafka image"

This reverts commit 4c63b48.
rajadilipkolli · Jun 26, 2024 · be1b9f9 · be1b9f9
1 parent 4c63b48
commit be1b9f9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/catalog-service/src/test/java/com/example/catalogservice/TestCatalogServiceApplication.java b/catalog-service/src/test/java/com/example/catalogservice/TestCatalogServiceApplication.java
@@ -12,8 +12,8 @@ Licensed under MIT License Copyright (c) 2023-2024 Raja Kolli.
 import org.springframework.context.annotation.Bean;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.kafka.KafkaContainer;
 import org.testcontainers.utility.DockerImageName;
 
 @TestConfiguration(proxyBeanMethods = false)
@@ -37,7 +37,8 @@ PostgreSQLContainer<?> postgreSqlContainer() {
     @ServiceConnection
     KafkaContainer kafkaContainer(DynamicPropertyRegistry dynamicPropertyRegistry) {
         KafkaContainer kafkaContainer =
-                new KafkaContainer(DockerImageName.parse("apache/kafka").withTag("3.7.0"))
+                new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.0"))
+                        .withKraft()
                         .withReuse(true);
         dynamicPropertyRegistry.add(
                 "spring.cloud.stream.kafka.binder.brokers", kafkaContainer::getBootstrapServers);

diff --git a/inventory-service/src/test/java/com/example/inventoryservice/TestInventoryApplication.java b/inventory-service/src/test/java/com/example/inventoryservice/TestInventoryApplication.java
@@ -13,7 +13,7 @@ Licensed under MIT License Copyright (c) 2023-2024 Raja Kolli.
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.kafka.KafkaContainer;
+import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.utility.DockerImageName;
 
 @TestConfiguration(proxyBeanMethods = false)
@@ -31,7 +31,8 @@ GenericContainer<?> zipkContainer() {
     @Bean
     @ServiceConnection
     KafkaContainer kafkaContainer() {
-        return new KafkaContainer(DockerImageName.parse("apache/kafka").withTag("3.7.0"))
+        return new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.0"))
+                .withKraft()
                 .withReuse(true);
     }
 

diff --git a/order-service/src/test/java/com/example/orderservice/TestOrderServiceApplication.java b/order-service/src/test/java/com/example/orderservice/TestOrderServiceApplication.java
@@ -15,7 +15,7 @@ Licensed under MIT License Copyright (c) 2023-2024 Raja Kolli.
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.kafka.KafkaContainer;
+import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.utility.DockerImageName;
 
 @TestConfiguration(proxyBeanMethods = false)
@@ -26,7 +26,8 @@ public class TestOrderServiceApplication {
     @ServiceConnection
     @RestartScope
     KafkaContainer kafkaContainer() {
-        return new KafkaContainer(DockerImageName.parse("apache/kafka").withTag("3.7.0"))
+        return new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.0"))
+                .withKraft()
                 .withReuse(true);
     }
 

diff --git a/payment-service/src/test/java/com/example/paymentservice/TestPaymentApplication.java b/payment-service/src/test/java/com/example/paymentservice/TestPaymentApplication.java
@@ -6,8 +6,8 @@
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.kafka.KafkaContainer;
 import org.testcontainers.utility.DockerImageName;
 
 @TestConfiguration(proxyBeanMethods = false)
@@ -31,7 +31,8 @@ GenericContainer<?> zipkContainer() {
     @Bean
     @ServiceConnection
     KafkaContainer kafkaContainer() {
-        return new KafkaContainer(DockerImageName.parse("apache/kafka").withTag("3.7.0"))
+        return new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.0"))
+                .withKraft()
                 .withReuse(true);
     }