Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Kafka 2.8.0 #1921

Merged
merged 1 commit into from
Apr 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
matrix:
go-version: [1.15.x, 1.16.x]
kafka-version: [2.6.1, 2.7.0]
kafka-version: [2.7.1, 2.8.0]
platform: [ubuntu-latest]

env:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ get:
$(GO) mod tidy

update:
$(GO) get -u -v all
$(GO) get -u -v ./...
$(GO) mod verify
$(GO) mod tidy

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ You might also want to look at the [Frequently Asked Questions](https://github.c
Sarama provides a "2 releases + 2 months" compatibility guarantee: we support
the two latest stable releases of Kafka and Go, and we provide a two month
grace period for older releases. This means we currently officially support
Go 1.14 through 1.16, and Kafka 2.6 through 2.7, although older releases are
Go 1.15 through 1.16, and Kafka 2.6 through 2.8, although older releases are
still likely to work.

Sarama follows semantic versioning and provides API stability via the gopkg.in service.
Expand Down
10 changes: 4 additions & 6 deletions functional_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,10 @@ func prepareDockerTestEnvironment(ctx context.Context, env *testEnvironment) err
// found here: https://docs.confluent.io/current/installation/versions-interoperability.html
var confluentPlatformVersion string
switch env.KafkaVersion {
case "2.7.0":
confluentPlatformVersion = "6.0.1"
case "2.6.1":
confluentPlatformVersion = "6.0.1"
case "2.5.1":
confluentPlatformVersion = "5.5.0"
case "2.8.0":
confluentPlatformVersion = "6.1.1"
case "2.7.1":
confluentPlatformVersion = "6.1.1"
default:
return fmt.Errorf("don't know what confluent platform version to use for kafka %s", env.KafkaVersion)
}
Expand Down
4 changes: 3 additions & 1 deletion utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ var (
V2_5_0_0 = newKafkaVersion(2, 5, 0, 0)
V2_6_0_0 = newKafkaVersion(2, 6, 0, 0)
V2_7_0_0 = newKafkaVersion(2, 7, 0, 0)
V2_8_0_0 = newKafkaVersion(2, 8, 0, 0)

SupportedVersions = []KafkaVersion{
V0_8_2_0,
Expand Down Expand Up @@ -191,9 +192,10 @@ var (
V2_5_0_0,
V2_6_0_0,
V2_7_0_0,
V2_8_0_0,
}
MinVersion = V0_8_2_0
MaxVersion = V2_7_0_0
MaxVersion = V2_8_0_0
DefaultVersion = V1_0_0_0
)

Expand Down