RHINENG-19571: use upstream kafka image

apache/kafka is build both for amd64 and arm64

Author: MichaelMraka

dev/kafka/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/psegedy/cp-kafka:7.7.0
+FROM docker.io/apache/kafka:4.0.0
 
 ADD /dev/kafka/entrypoint.sh /app/entrypoint.sh
 ADD /dev/kafka/setup.sh      /app/setup.sh

dev/kafka/entrypoint.sh

@@ -2,5 +2,5 @@
 
 /app/setup.sh 2>&1 | grep -v '^WARNING: Due to limitations in metric names' &
 
-exec /etc/confluent/docker/run 2>&1 \
+exec /etc/kafka/docker/run 2>&1 \
     | grep -v -E ' (TRACE|DEBUG|INFO) '

dev/kafka/setup.sh

@@ -9,14 +9,14 @@ for topic in "platform.inventory.events" "patchman.evaluator.upload" \
              "platform.payload-status" "test" \
              "platform.content-sources.template"
 do
-    until /usr/bin/kafka-topics --create --if-not-exists --topic $topic --partitions 1 --bootstrap-server kafka:9092 \
-    --replication-factor 1; do
+    until /opt/kafka/bin/kafka-topics.sh --create --if-not-exists --topic $topic \
+        --partitions 1 --bootstrap-server kafka:9092 --replication-factor 1; do
       echo "Unable to create topic $topic"
       sleep 1
     done
     echo "Topic $topic created successfully"
 done
 # start simple http server so other components can check that kafka has fully started
 while : ; do
-    nc -l -p 9099 -c 'echo -e "HTTP/1.1 200 OK\n\nTOPICS READY"';
+    nc -lk -p 9099 -e echo -e "HTTP/1.1 200 OK\n\nTOPICS READY"
 done

docker-compose.prod.yml

@@ -26,8 +26,6 @@ services:
       - ./dev/kafka/secrets:/etc/kafka/secrets
       - ./dev/kafka:/app
     ports:
-      - 29092:29092
-      - 29093:29093
       - 9092:9092
       - 9093:9093
       - 9099:9099

docker-compose.test.yml

@@ -23,8 +23,6 @@ services:
       - ./dev/kafka/secrets:/etc/kafka/secrets
       - ./dev/kafka:/app
     ports:
-      - 29092:29092
-      - 29093:29093
       - 9092:9092
       - 9093:9093
       - 9099:9099

docker-compose.yml

@@ -26,8 +26,6 @@ services:
       - ./dev/kafka/secrets:/etc/kafka/secrets
       - ./dev/kafka:/app
     ports:
-      - 29092:29092
-      - 29093:29093
       - 9092:9092
       - 9093:9093
       - 9099:9099