Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[kafka] remove KRaft mode support workarounds #880

Merged
merged 1 commit into from
May 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ release.
([#869](https://github.com/open-telemetry/opentelemetry-demo/pull/869))
* [grafana] fix demo dashboard to be compatible with spanmetrics connector
([#874](https://github.com/open-telemetry/opentelemetry-demo/pull/874))
* [kafka] remove KRaft mode support workarounds
([#880](https://github.com/open-telemetry/opentelemetry-demo/pull/880))

## 1.4.0

Expand Down
6 changes: 1 addition & 5 deletions src/kafka/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
5 changes: 1 addition & 4 deletions src/kafka/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
1 change: 0 additions & 1 deletion src/kafka/clusterID

This file was deleted.

18 changes: 0 additions & 18 deletions src/kafka/update_run.sh

This file was deleted.