From a45d58429ed1baec70d977c927f0fece08421dd7 Mon Sep 17 00:00:00 2001 From: Dominic Evans Date: Tue, 2 Aug 2022 22:53:00 +0100 Subject: [PATCH] chore: add kafka 3.1.1 to the version matrix Bump default fvt version to 3.1.1 as well. --- .github/workflows/fvt.yml | 2 +- Dockerfile.kafka | 2 +- docker-compose.yml | 10 +++++----- entrypoint.sh | 2 +- functional_test.go | 2 +- utils.go | 4 +++- utils_test.go | 2 ++ 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/fvt.yml b/.github/workflows/fvt.yml index 3f77a8b87..fe5eb4559 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.0, 3.2.0] + kafka-version: [2.8.1, 3.0.1, 3.1.1, 3.2.0] env: DEBUG: true GOFLAGS: -trimpath diff --git a/Dockerfile.kafka b/Dockerfile.kafka index 37aa1aa1d..68c79ae66 100644 --- a/Dockerfile.kafka +++ b/Dockerfile.kafka @@ -19,7 +19,7 @@ RUN cd /etc/java/java-11-openjdk/*/conf/security \ 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.0" && chmod a+rw /opt/kafka-3.1.0 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.1.0.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.1.0" +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" COPY entrypoint.sh / diff --git a/docker-compose.yml b/docker-compose.yml index 72add7259..7a07e0a29 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.0} + KAFKA_VERSION: ${KAFKA_VERSION:-3.1.1} 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.0} + KAFKA_VERSION: ${KAFKA_VERSION:-3.1.1} 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.0} + KAFKA_VERSION: ${KAFKA_VERSION:-3.1.1} 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.0} + KAFKA_VERSION: ${KAFKA_VERSION:-3.1.1} 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.0} + KAFKA_VERSION: ${KAFKA_VERSION:-3.1.1} 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 4aaa4a5e1..0249cca48 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/bash -KAFKA_VERSION="${KAFKA_VERSION:-3.1.0}" +KAFKA_VERSION="${KAFKA_VERSION:-3.1.1}" KAFKA_HOME="/opt/kafka-${KAFKA_VERSION}" if [ ! -d "${KAFKA_HOME}" ]; then diff --git a/functional_test.go b/functional_test.go index 53bdc4351..176dac44f 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.0" + env.KafkaVersion = "3.1.1" } c := exec.Command("docker-compose", "up", "-d") diff --git a/utils.go b/utils.go index c8723d381..05788c92a 100644 --- a/utils.go +++ b/utils.go @@ -182,6 +182,7 @@ var ( V3_0_0_0 = newKafkaVersion(3, 0, 0, 0) V3_0_1_0 = newKafkaVersion(3, 0, 1, 0) V3_1_0_0 = newKafkaVersion(3, 1, 0, 0) + V3_1_0_1 = newKafkaVersion(3, 1, 0, 1) V3_2_0_0 = newKafkaVersion(3, 2, 0, 0) SupportedVersions = []KafkaVersion{ @@ -228,6 +229,7 @@ var ( V3_0_0_0, V3_0_1_0, V3_1_0_0, + V3_1_0_1, V3_2_0_0, } MinVersion = V0_8_2_0 @@ -250,7 +252,7 @@ var ( V2_7_1_0, V2_8_1_0, V3_0_1_0, - V3_1_0_0, + V3_1_0_1, V3_2_0_0, } ) diff --git a/utils_test.go b/utils_test.go index e3071e66f..dc487dd67 100644 --- a/utils_test.go +++ b/utils_test.go @@ -73,6 +73,8 @@ func TestVersionParsing(t *testing.T) { "3.0.0", "3.0.1", "3.1.0", + "3.1.1", + "3.2.0", } for _, s := range validVersions { v, err := ParseKafkaVersion(s)