Skip to content

Commit aabf171

Browse files
authored
chore: add version consts for 3.8.1+3.9.0 (#3011)
Also bump the 3.8 FV to use the 3.8.1 packages. Will add Kafka 3.9.0 to the FV once it is available from: https://s3-us-west-2.amazonaws.com/kafka-packages Signed-off-by: Dominic Evans <[email protected]>
1 parent f75af48 commit aabf171

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

.github/workflows/fvt-main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
go-version: [1.23.x]
20-
kafka-version: [1.0.2, 2.0.1, 2.2.2, 2.6.2, 2.8.2, 3.0.2, 3.3.2, 3.6.2, 3.8.0]
20+
kafka-version: [1.0.2, 2.0.1, 2.2.2, 2.6.2, 2.8.2, 3.0.2, 3.3.2, 3.6.2, 3.8.1]
2121
include:
2222
- kafka-version: 1.0.2
2323
scala-version: 2.11

.github/workflows/fvt-pr.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
go-version: [1.23.x]
19-
kafka-version: [1.0.2, 2.6.2, 3.6.2, 3.8.0]
19+
kafka-version: [1.0.2, 2.6.2, 3.6.2, 3.8.1]
2020
include:
2121
- kafka-version: 1.0.2
2222
scala-version: 2.11
2323
- kafka-version: 2.6.2
2424
scala-version: 2.12
2525
- kafka-version: 3.6.2
2626
scala-version: 2.13
27-
- kafka-version: 3.8.0
27+
- kafka-version: 3.8.1
2828
scala-version: 2.13
2929
uses: ./.github/workflows/fvt.yml
3030
with:

.pre-commit-config.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ fail_fast: false
22
default_install_hook_types: [pre-commit, commit-msg]
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v4.4.0
5+
rev: v5.0.0
66
hooks:
77
- id: check-merge-conflict
88
- id: check-yaml
@@ -32,10 +32,10 @@ repos:
3232
files: \.go$
3333
args: []
3434
- repo: https://github.com/gitleaks/gitleaks
35-
rev: v8.16.3
35+
rev: v8.21.2
3636
hooks:
3737
- id: gitleaks
3838
- repo: https://github.com/golangci/golangci-lint
39-
rev: v1.52.2
39+
rev: v1.61.0
4040
hooks:
4141
- id: golangci-lint

Dockerfile.kafka

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ RUN cd /etc/java/java-11-openjdk/*/conf/security \
1717
&& echo 'networkaddress.cache.negative.ttl=0' >> java.security
1818

1919
ARG SCALA_VERSION="2.13"
20-
ARG KAFKA_VERSION="3.6.0"
20+
ARG KAFKA_VERSION="3.6.2"
2121

22-
# https://github.com/apache/kafka/blob/0eaaff88cf68bc2c24d4874ff9bc1cc2b493c24b/tests/docker/Dockerfile#L75-L103
22+
# https://github.com/apache/kafka/blob/2e2b0a58eda3e677763af974a44a6aaa3c280214/tests/docker/Dockerfile#L77-L105
2323
ARG KAFKA_MIRROR="https://s3-us-west-2.amazonaws.com/kafka-packages"
2424
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
2525
RUN mkdir -p "/opt/kafka-${KAFKA_VERSION}" \

utils.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ var (
205205
V3_7_0_0 = newKafkaVersion(3, 7, 0, 0)
206206
V3_7_1_0 = newKafkaVersion(3, 7, 1, 0)
207207
V3_8_0_0 = newKafkaVersion(3, 8, 0, 0)
208+
V3_8_1_0 = newKafkaVersion(3, 8, 1, 0)
209+
V3_9_0_0 = newKafkaVersion(3, 9, 0, 0)
208210

209211
SupportedVersions = []KafkaVersion{
210212
V0_8_2_0,
@@ -274,9 +276,11 @@ var (
274276
V3_7_0_0,
275277
V3_7_1_0,
276278
V3_8_0_0,
279+
V3_8_1_0,
280+
V3_9_0_0,
277281
}
278282
MinVersion = V0_8_2_0
279-
MaxVersion = V3_8_0_0
283+
MaxVersion = V3_9_0_0
280284
DefaultVersion = V2_1_0_0
281285

282286
// reduced set of protocol versions to matrix test

0 commit comments

Comments
 (0)