From: danielhanrahan Date: Tue, 10 Feb 2026 14:35:10 +0000 (+0000) Subject: Remove zookeeper and upgrade kafka X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F54%2F143154%2F1;p=policy%2Fdocker.git Remove zookeeper and upgrade kafka - remove zookeeper as modern kafka has builtin controller - uplift versions of kafka, jaeger, and postgres Issue-ID: POLICY-5534 Change-Id: I82d38d9609f98f30d92c9467903294f91a7f8b86 Signed-off-by: danielhanrahan --- diff --git a/compose/compose.common.yml b/compose/compose.common.yml index 62bd1ed4..f0941be0 100644 --- a/compose/compose.common.yml +++ b/compose/compose.common.yml @@ -144,37 +144,24 @@ services: retries: 6 # messaging services: - zookeeper: - image: nexus3.onap.org:10001/confluentinc/cp-zookeeper:latest - container_name: zookeeper - hostname: zookeeper - ports: - - 2181:2181 - environment: - ZOOKEEPER_CLIENT_PORT: 2181 - healthcheck: - test: "nc -z localhost 2181 || exit 1" - interval: 5s - timeout: 5s - retries: 6 - kafka: - image: nexus3.onap.org:10001/confluentinc/cp-kafka:7.4.9 + image: nexus3.onap.org:10001/confluentinc/cp-kafka:7.7.7 container_name: kafka hostname: kafka - depends_on: - - zookeeper ports: - 9092:9092 - 29092:29092 environment: - KAFKA_BROKER_ID: 1 - KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181" - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT + KAFKA_NODE_ID: 1 + KAFKA_PROCESS_ROLES: broker,controller + KAFKA_LISTENERS: PLAINTEXT://kafka:9092,CONTROLLER://kafka:9093,PLAINTEXT_HOST://0.0.0.0:29092 KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:29092 + KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT + KAFKA_CONTROLLER_QUORUM_VOTERS: 1@kafka:9093 + KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 - KAFKA_ADVERTISED_HOST_NAME: kafka + CLUSTER_ID: MkU3OEVBNTcwNTJENDM2Qk healthcheck: test: "kafka-topics --bootstrap-server kafka:29092 --list || exit 1" interval: 10s @@ -183,7 +170,7 @@ services: start_period: 30s jaeger: - image: nexus3.onap.org:10001/jaegertracing/all-in-one:1.58 + image: nexus3.onap.org:10001/jaegertracing/all-in-one:1.76.0 container_name: jaeger hostname: jaeger ports: diff --git a/compose/get-versions.sh b/compose/get-versions.sh index cb8b83a9..8e4cc317 100755 --- a/compose/get-versions.sh +++ b/compose/get-versions.sh @@ -26,7 +26,7 @@ if [ -z "${WORKSPACE}" ]; then fi #default values -export POLICY_POSTGRES_VER=16.4 +export POLICY_POSTGRES_VER=17.7 echo POLICY_POSTGRES_VER=${POLICY_POSTGRES_VER} if [ -n "${USE_LOCAL_IMAGES}" ] && [ "${USE_LOCAL_IMAGES}" = "true" ]; then