Merge pull request quarkusio#24003 from ozangunalp/remove_redpanda_im…

…age_name_check
michalszynkiewicz · Feb 28, 2022 · b4e0afd · b4e0afd
2 parents d004fdd + eb221b0
commit b4e0afd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/...eployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java b/...eployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java
@@ -11,7 +11,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import org.apache.kafka.clients.admin.AdminClient;
@@ -53,9 +52,6 @@ public class DevServicesKafkaProcessor {
     private static final Logger log = Logger.getLogger(DevServicesKafkaProcessor.class);
     private static final String KAFKA_BOOTSTRAP_SERVERS = "kafka.bootstrap.servers";
 
-    private static final Pattern STRIMZI_IMAGE_NAME_PATTERN = Pattern
-            .compile("(^.*test-container):(\\d+\\.\\d+\\.\\d+|latest)-kafka-(.*)$");
-
     /**
      * Label to add to shared Dev Service for Kafka running in containers.
      * This allows other applications to discover the running service and use it instead of starting a new instance.

diff --git a/...t/deployment/src/main/java/io/quarkus/kafka/client/deployment/RedPandaKafkaContainer.java b/...t/deployment/src/main/java/io/quarkus/kafka/client/deployment/RedPandaKafkaContainer.java
@@ -39,15 +39,11 @@ final class RedPandaKafkaContainer extends GenericContainer<RedPandaKafkaContain
         }
 
         // For redpanda, we need to start the broker - see https://vectorized.io/docs/quick-start-docker/
-        if (dockerImageName.getRepository().equals("vectorized/redpanda")) {
-            withCreateContainerCmdModifier(cmd -> {
-                cmd.withEntrypoint("sh");
-            });
-            withCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
-            waitingFor(Wait.forLogMessage(".*Started Kafka API server.*", 1));
-        } else {
-            throw new IllegalArgumentException("Only vectorized/redpanda images are supported");
-        }
+        withCreateContainerCmdModifier(cmd -> {
+            cmd.withEntrypoint("sh");
+        });
+        withCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT);
+        waitingFor(Wait.forLogMessage(".*Started Kafka API server.*", 1));
     }
 
     @Override