From 0e0c8e0457b0582f6aacdb3795f589aae39dcbca Mon Sep 17 00:00:00 2001 From: Dominic Evans Date: Tue, 27 Sep 2022 21:45:30 +0100 Subject: [PATCH] chore(ci): bump kafka-versions to latest - also populate utils.go with versions matrix --- .github/workflows/fvt.yml | 2 +- Dockerfile.kafka | 8 ++++---- docker-compose.yml | 10 +++++----- entrypoint.sh | 2 +- functional_test.go | 2 +- utils.go | 26 +++++++++++++++++++------- 6 files changed, 31 insertions(+), 19 deletions(-) diff --git a/.github/workflows/fvt.yml b/.github/workflows/fvt.yml index 573bd17fa..334e24e8e 100644 --- a/.github/workflows/fvt.yml +++ b/.github/workflows/fvt.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: go-version: [1.18.x] - kafka-version: [2.8.1, 3.0.1, 3.1.1, 3.2.0] + kafka-version: [2.8.2, 3.0.2, 3.1.2, 3.2.3] env: DEBUG: true GOFLAGS: -trimpath diff --git a/Dockerfile.kafka b/Dockerfile.kafka index 68c79ae66..c361f6d12 100644 --- a/Dockerfile.kafka +++ b/Dockerfile.kafka @@ -17,10 +17,10 @@ RUN cd /etc/java/java-11-openjdk/*/conf/security \ # https://github.com/apache/kafka/blob/0d518aaed158896ee9ee6949b8f38128d1d73634/tests/docker/Dockerfile#L65-L67 ARG KAFKA_MIRROR="https://s3-us-west-2.amazonaws.com/kafka-packages" -RUN mkdir -p "/opt/kafka-2.8.1" && chmod a+rw /opt/kafka-2.8.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.8.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.8.1" -RUN mkdir -p "/opt/kafka-3.0.1" && chmod a+rw /opt/kafka-3.0.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.0.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.0.1" -RUN mkdir -p "/opt/kafka-3.1.1" && chmod a+rw /opt/kafka-3.1.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.1.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.1.1" -RUN mkdir -p "/opt/kafka-3.2.0" && chmod a+rw /opt/kafka-3.2.0 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.2.0.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.2.0" +RUN mkdir -p "/opt/kafka-2.8.2" && chmod a+rw /opt/kafka-2.8.2 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.8.2.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.8.2" +RUN mkdir -p "/opt/kafka-3.0.2" && chmod a+rw /opt/kafka-3.0.2 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.0.2.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.0.2" +RUN mkdir -p "/opt/kafka-3.1.2" && chmod a+rw /opt/kafka-3.1.2 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.1.2.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.1.2" +RUN mkdir -p "/opt/kafka-3.2.3" && chmod a+rw /opt/kafka-3.2.3 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.2.3.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.2.3" COPY entrypoint.sh / diff --git a/docker-compose.yml b/docker-compose.yml index 7a07e0a29..5dedbb0d6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,7 +40,7 @@ services: dockerfile: Dockerfile.kafka restart: always environment: - KAFKA_VERSION: ${KAFKA_VERSION:-3.1.1} + KAFKA_VERSION: ${KAFKA_VERSION:-3.1.2} KAFKA_CFG_ZOOKEEPER_CONNECT: 'zookeeper-1:2181,zookeeper-2:2181,zookeeper-3:2181' KAFKA_CFG_LISTENERS: 'LISTENER_INTERNAL://:9091,LISTENER_LOCAL://:29091' KAFKA_CFG_ADVERTISED_LISTENERS: 'LISTENER_INTERNAL://kafka-1:9091,LISTENER_LOCAL://localhost:29091' @@ -61,7 +61,7 @@ services: dockerfile: Dockerfile.kafka restart: always environment: - KAFKA_VERSION: ${KAFKA_VERSION:-3.1.1} + KAFKA_VERSION: ${KAFKA_VERSION:-3.1.2} KAFKA_CFG_ZOOKEEPER_CONNECT: 'zookeeper-1:2181,zookeeper-2:2181,zookeeper-3:2181' KAFKA_CFG_LISTENERS: 'LISTENER_INTERNAL://:9091,LISTENER_LOCAL://:29092' KAFKA_CFG_ADVERTISED_LISTENERS: 'LISTENER_INTERNAL://kafka-2:9091,LISTENER_LOCAL://localhost:29092' @@ -82,7 +82,7 @@ services: dockerfile: Dockerfile.kafka restart: always environment: - KAFKA_VERSION: ${KAFKA_VERSION:-3.1.1} + KAFKA_VERSION: ${KAFKA_VERSION:-3.1.2} KAFKA_CFG_ZOOKEEPER_CONNECT: 'zookeeper-1:2181,zookeeper-2:2181,zookeeper-3:2181' KAFKA_CFG_LISTENERS: 'LISTENER_INTERNAL://:9091,LISTENER_LOCAL://:29093' KAFKA_CFG_ADVERTISED_LISTENERS: 'LISTENER_INTERNAL://kafka-3:9091,LISTENER_LOCAL://localhost:29093' @@ -103,7 +103,7 @@ services: dockerfile: Dockerfile.kafka restart: always environment: - KAFKA_VERSION: ${KAFKA_VERSION:-3.1.1} + KAFKA_VERSION: ${KAFKA_VERSION:-3.1.2} KAFKA_CFG_ZOOKEEPER_CONNECT: 'zookeeper-1:2181,zookeeper-2:2181,zookeeper-3:2181' KAFKA_CFG_LISTENERS: 'LISTENER_INTERNAL://:9091,LISTENER_LOCAL://:29094' KAFKA_CFG_ADVERTISED_LISTENERS: 'LISTENER_INTERNAL://kafka-4:9091,LISTENER_LOCAL://localhost:29094' @@ -124,7 +124,7 @@ services: dockerfile: Dockerfile.kafka restart: always environment: - KAFKA_VERSION: ${KAFKA_VERSION:-3.1.1} + KAFKA_VERSION: ${KAFKA_VERSION:-3.1.2} KAFKA_CFG_ZOOKEEPER_CONNECT: 'zookeeper-1:2181,zookeeper-2:2181,zookeeper-3:2181' KAFKA_CFG_LISTENERS: 'LISTENER_INTERNAL://:9091,LISTENER_LOCAL://:29095' KAFKA_CFG_ADVERTISED_LISTENERS: 'LISTENER_INTERNAL://kafka-5:9091,LISTENER_LOCAL://localhost:29095' diff --git a/entrypoint.sh b/entrypoint.sh index 0249cca48..cbcbcfc58 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/bash -KAFKA_VERSION="${KAFKA_VERSION:-3.1.1}" +KAFKA_VERSION="${KAFKA_VERSION:-3.1.2}" KAFKA_HOME="/opt/kafka-${KAFKA_VERSION}" if [ ! -d "${KAFKA_HOME}" ]; then diff --git a/functional_test.go b/functional_test.go index 176dac44f..4c8b35218 100644 --- a/functional_test.go +++ b/functional_test.go @@ -135,7 +135,7 @@ func prepareDockerTestEnvironment(ctx context.Context, env *testEnvironment) err if version, ok := os.LookupEnv("KAFKA_VERSION"); ok { env.KafkaVersion = version } else { - env.KafkaVersion = "3.1.1" + env.KafkaVersion = "3.1.2" } c := exec.Command("docker-compose", "up", "-d") diff --git a/utils.go b/utils.go index 2427a7168..74c308920 100644 --- a/utils.go +++ b/utils.go @@ -180,11 +180,17 @@ var ( V2_7_2_0 = newKafkaVersion(2, 7, 2, 0) V2_8_0_0 = newKafkaVersion(2, 8, 0, 0) V2_8_1_0 = newKafkaVersion(2, 8, 1, 0) + V2_8_2_0 = newKafkaVersion(2, 8, 2, 0) V3_0_0_0 = newKafkaVersion(3, 0, 0, 0) V3_0_1_0 = newKafkaVersion(3, 0, 1, 0) + V3_0_2_0 = newKafkaVersion(3, 0, 2, 0) V3_1_0_0 = newKafkaVersion(3, 1, 0, 0) - V3_1_0_1 = newKafkaVersion(3, 1, 0, 1) + V3_1_1_0 = newKafkaVersion(3, 1, 1, 0) + V3_1_2_0 = newKafkaVersion(3, 1, 2, 0) V3_2_0_0 = newKafkaVersion(3, 2, 0, 0) + V3_2_1_0 = newKafkaVersion(3, 2, 1, 0) + V3_2_2_0 = newKafkaVersion(3, 2, 2, 0) + V3_2_3_0 = newKafkaVersion(3, 2, 3, 0) SupportedVersions = []KafkaVersion{ V0_8_2_0, @@ -227,14 +233,20 @@ var ( V2_7_1_0, V2_8_0_0, V2_8_1_0, + V2_8_2_0, V3_0_0_0, V3_0_1_0, + V3_0_2_0, V3_1_0_0, - V3_1_0_1, + V3_1_1_0, + V3_1_2_0, V3_2_0_0, + V3_2_1_0, + V3_2_2_0, + V3_2_3_0, } MinVersion = V0_8_2_0 - MaxVersion = V3_2_0_0 + MaxVersion = V3_2_3_0 DefaultVersion = V1_0_0_0 // reduced set of versions to matrix test @@ -251,10 +263,10 @@ var ( V2_5_1_0, V2_6_2_0, V2_7_1_0, - V2_8_1_0, - V3_0_1_0, - V3_1_0_1, - V3_2_0_0, + V2_8_2_0, + V3_0_2_0, + V3_1_2_0, + V3_2_3_0, } )