diff --git a/src/kafka/Dockerfile b/src/kafka/Dockerfile index 369608f043..ce8e827368 100644 --- a/src/kafka/Dockerfile +++ b/src/kafka/Dockerfile @@ -10,9 +10,6 @@ ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/release RUN chmod go+r /tmp/opentelemetry-javaagent.jar USER appuser -WORKDIR /tmp -COPY ./src/kafka/clusterID clusterID -COPY ./src/kafka/update_run.sh update_run.sh ENV KAFKA_LISTENERS=PLAINTEXT://0.0.0.0:9092,CONTROLLER://0.0.0.0:9093 ENV KAFKA_CONTROLLER_QUORUM_VOTERS='1@0.0.0.0:9093' @@ -28,5 +25,4 @@ ENV KAFKA_AUTO_CREATE_TOPICS_ENABLE=true ENV KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 ENV KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR=1 ENV KAFKA_OPTS="-javaagent:/tmp/opentelemetry-javaagent.jar -Dotel.jmx.target.system=kafka-broker" - -ENTRYPOINT ["/bin/sh", "-c", "ls -lh /tmp && /tmp/update_run.sh && /etc/confluent/docker/run"] +ENV CLUSTER_ID=ckjPoprWQzOf0-FuNkGfFQ diff --git a/src/kafka/README.md b/src/kafka/README.md index e49576c74a..15d3d67d43 100644 --- a/src/kafka/README.md +++ b/src/kafka/README.md @@ -3,8 +3,5 @@ This is used as a message queue service to connect the checkout service with the accounting and fraud detection services. -## KRaft: Kafka without ZooKeeper - -Kafka is run in KRaft mode. The `update_run.sh` script is used to configure -the system to run Kafka in this mode. Environment variables are substituted at +Kafka is run in KRaft mode. Environment variables are substituted at deploy-time. diff --git a/src/kafka/clusterID b/src/kafka/clusterID deleted file mode 100644 index afbbda6f5e..0000000000 --- a/src/kafka/clusterID +++ /dev/null @@ -1 +0,0 @@ -ckjPoprWQzOf0-FuNkGfFQ \ No newline at end of file diff --git a/src/kafka/update_run.sh b/src/kafka/update_run.sh deleted file mode 100755 index bd985ba821..0000000000 --- a/src/kafka/update_run.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright The OpenTelemetry Authors -# SPDX-License-Identifier: Apache-2.0 -#!/bin/sh - - -# https://github.com/confluentinc/learn-kafka-kraft/blob/4c75598779c4a993464f6979dc0d702552df8f3b/kraft/scripts/update_run.sh - -# Docker workaround: Remove check for KAFKA_ZOOKEEPER_CONNECT parameter -sed -i '/KAFKA_ZOOKEEPER_CONNECT/d' /etc/confluent/docker/configure - -# Docker workaround: Remove check for KAFKA_ADVERTISED_LISTENERS parameter -sed -i '/dub ensure KAFKA_ADVERTISED_LISTENERS/d' /etc/confluent/docker/configure - -# Docker workaround: Ignore cub zk-ready -sed -i 's/cub zk-ready/echo ignore zk-ready/' /etc/confluent/docker/ensure - -# KRaft required step: Format the storage directory with a new cluster ID -echo "kafka-storage format --ignore-formatted -t $(cat /tmp/clusterID) -c /etc/kafka/kafka.properties" >> /etc/confluent/docker/ensure