ci: Update Kafka container.

.circleci/config.yml

@@ -241,18 +241,16 @@ jobs:
       - store-pytest-results
       - store-coverage-report
 
-  py312kafka:
+  py313kafka:
     docker:
-      - image: public.ecr.aws/docker/library/python:3.12
-      - image: public.ecr.aws/bitnami/kafka:3.9.0
+      - image: public.ecr.aws/docker/library/python:3.13
+      - image: public.ecr.aws/ubuntu/zookeeper:latest
+        environment:
+          TZ: UTC
+      - image: public.ecr.aws/ubuntu/kafka:latest
         environment:
-          KAFKA_CFG_NODE_ID: 0
-          KAFKA_CFG_PROCESS_ROLES: controller,broker
-          KAFKA_CFG_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093,EXTERNAL://:9094
-          KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT,PLAINTEXT:PLAINTEXT
-          KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 0@localhost:9093
-          KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
-          KAFKA_CFG_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092,EXTERNAL://localhost:9094
+          TZ: UTC
+          ZOOKEEPER_HOST: localhost
     working_directory: ~/repo
     steps:
       - checkout
@@ -309,7 +307,7 @@ workflows:
       - py39cassandra
       - py39gevent_starlette
       - py312aws
-      - py312kafka
+      - py313kafka
       - autowrapt:
           matrix:
             parameters:
@@ -322,5 +320,5 @@ workflows:
             - py39cassandra
             - py39gevent_starlette
             - py312aws
-            - py312kafka
+            - py313kafka
             - autowrapt

.tekton/task.yaml

@@ -166,23 +166,18 @@ metadata:
   name: python-tracer-unittest-kafka-task
 spec:
   sidecars:
+    - name: zookeeper
+      image: public.ecr.aws/ubuntu/zookeeper:latest
+      env:
+        - name: TZ
+          value: "UTC"
     - name: kafka
-      image: public.ecr.aws/bitnami/kafka:3.9.0
+      image: public.ecr.aws/ubuntu/kafka:latest
       env:
-        - name: KAFKA_CFG_NODE_ID
-          value: "0"
-        - name: KAFKA_CFG_PROCESS_ROLES
-          value: "controller,broker"
-        - name: KAFKA_CFG_LISTENERS
-          value: "PLAINTEXT://:9092,CONTROLLER://:9093,EXTERNAL://:9094"
-        - name: KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP
-          value: "CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT,PLAINTEXT:PLAINTEXT"
-        - name: KAFKA_CFG_CONTROLLER_QUORUM_VOTERS
-          value: "0@kafka:9093"
-        - name: KAFKA_CFG_CONTROLLER_LISTENER_NAMES
-          value: "CONTROLLER"
-        - name: KAFKA_CFG_ADVERTISED_LISTENERS
-          value: "PLAINTEXT://kafka:9092,EXTERNAL://localhost:9094"
+        - name: TZ
+          value: "UTC"
+        - name: ZOOKEEPER_HOST
+          value: zookeeper
   params:
   - name: imageDigest
     type: string

docker-compose.yml

@@ -61,16 +61,18 @@ services:
       - "8681:8681"
       - "8682:8682"
 
+  # Sidecar container for Kafka
+  zookeeper:
+    image: public.ecr.aws/ubuntu/zookeeper:latest
+    ports:
+      - 2181:2181
+    environment:
+      - TZ=UTC
+
   kafka:
-    image: public.ecr.aws/bitnami/kafka:latest
+    image: public.ecr.aws/ubuntu/kafka:latest   # works on amd64, arm64, ppc64le and s390x
     ports:
       - '9092:9092'
-      - '9094:9094'
     environment:
-      - KAFKA_CFG_NODE_ID=0
-      - KAFKA_CFG_PROCESS_ROLES=controller,broker
-      - KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,EXTERNAL://:9094
-      - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT,PLAINTEXT:PLAINTEXT
-      - KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
-      - KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
-      - KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,EXTERNAL://localhost:9094
+      - TZ=UTC
+      - ZOOKEEPER_HOST=zookeeper