Skip to content

Commit 1839a88

Browse files
authored
Merge pull request #167 from grepplabs/kafka-3.7
kafka 3.7
2 parents 5676da6 + 938a1f4 commit 1839a88

File tree

8 files changed

+25
-11
lines changed

8 files changed

+25
-11
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup go
1515
uses: actions/setup-go@v4
1616
with:
17-
go-version: '1.20'
17+
go-version: '1.22'
1818
check-latest: true
1919
- run: go version
2020
- name: Run build

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup go
2323
uses: actions/setup-go@v4
2424
with:
25-
go-version: '1.20'
25+
go-version: '1.22'
2626
check-latest: true
2727
- run: go version
2828
- name: Run build and test

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM golang:1.20-alpine3.17 as builder
1+
FROM --platform=$BUILDPLATFORM golang:1.22-alpine3.19 as builder
22
RUN apk add alpine-sdk ca-certificates
33

44
ARG TARGETOS
@@ -21,7 +21,7 @@ RUN mkdir -p build && \
2121
go build -mod=vendor -o build/kafka-proxy \
2222
-ldflags "${LDFLAGS}" .
2323

24-
FROM --platform=$BUILDPLATFORM alpine:3.17
24+
FROM --platform=$BUILDPLATFORM alpine:3.19
2525
RUN apk add --no-cache ca-certificates libcap
2626
RUN adduser \
2727
--disabled-password \

Dockerfile.all

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM golang:1.20-alpine3.17 as builder
1+
FROM --platform=$BUILDPLATFORM golang:1.22-alpine3.19 as builder
22
RUN apk add alpine-sdk ca-certificates
33

44
ARG TARGETOS
@@ -27,7 +27,7 @@ RUN mkdir -p build && \
2727
go build -mod=vendor -o build/unsecured-jwt-provider -ldflags "${LDFLAGS}" cmd/plugin-unsecured-jwt-provider/main.go && \
2828
go build -mod=vendor -o build/oidc-provider -ldflags "${LDFLAGS}" cmd/plugin-oidc-provider/main.go
2929

30-
FROM --platform=$BUILDPLATFORM alpine:3.17
30+
FROM --platform=$BUILDPLATFORM alpine:3.19
3131
RUN apk add --no-cache ca-certificates libcap
3232
RUN adduser \
3333
--disabled-password \

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ VERSION ?= $(shell git describe --tags --always --dirty)
1010
GOPKGS = $(shell go list ./... | grep -v /vendor/)
1111
BUILD_FLAGS ?=
1212
LDFLAGS ?= -X github.com/grepplabs/kafka-proxy/config.Version=$(VERSION) -w -s
13-
TAG ?= "v0.3.8"
13+
TAG ?= "v0.3.9"
1414
GOOS ?= $(if $(TARGETOS),$(TARGETOS),linux)
1515
GOARCH ?= $(if $(TARGETARCH),$(TARGETARCH),amd64)
1616
GOARM ?= $(TARGETVARIANT)

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@ As not every Kafka release adds new messages/versions which are relevant to the
3939
| | from 0.11.0 |
4040
| 0.2.9 | to 2.8.0 |
4141
| 0.3.1 | to 3.4.0 |
42-
42+
| 0.3.9 | to 3.7.0 |
4343

4444
### Install binary release
4545

4646
1. Download the latest release
4747

4848
Linux
4949

50-
curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.3.8/kafka-proxy-v0.3.8-linux-amd64.tar.gz | tar xz
50+
curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.3.9/kafka-proxy-v0.3.9-linux-amd64.tar.gz | tar xz
5151

5252
macOS
5353

54-
curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.3.8/kafka-proxy-v0.3.8-darwin-amd64.tar.gz | tar xz
54+
curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.3.9/kafka-proxy-v0.3.9-darwin-amd64.tar.gz | tar xz
5555

5656
2. Move the binary in to your PATH.
5757

proxy/processor_default.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (handler *DefaultRequestHandler) handleRequest(dst DeadlineWriter, src Dead
4141
logrus.Debugf("Kafka request key %v, version %v, length %v", requestKeyVersion.ApiKey, requestKeyVersion.ApiVersion, requestKeyVersion.Length)
4242

4343
if requestKeyVersion.ApiKey < minRequestApiKey || requestKeyVersion.ApiKey > maxRequestApiKey {
44-
return true, fmt.Errorf("api key %d is invalid", requestKeyVersion.ApiKey)
44+
return true, fmt.Errorf("api key %d is invalid, possible cause: using plain connection instead of TLS", requestKeyVersion.ApiKey)
4545
}
4646

4747
proxyRequestsTotal.WithLabelValues(ctx.brokerAddress, strconv.Itoa(int(requestKeyVersion.ApiKey)), strconv.Itoa(int(requestKeyVersion.ApiVersion))).Inc()

proxy/protocol/request_key_version.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,20 @@ func (r *RequestKeyVersion) ResponseHeaderVersion() int16 {
346346
return 1
347347
case 67: // AllocateProducerIds
348348
return 1
349+
case 68: // ConsumerGroupHeartbeat
350+
return 1
351+
case 69: // ConsumerGroupDescribe
352+
return 1
353+
case 70: // ControllerRegistration
354+
return 1
355+
case 71: // GetTelemetrySubscriptions
356+
return 1
357+
case 72: // PushTelemetry
358+
return 1
359+
case 73: // AssignReplicasToDirs
360+
return 1
361+
case 74: // ListClientMetricsResources
362+
return 1
349363
default:
350364
// throw new UnsupportedVersionException("Unsupported API key " + apiKey);
351365
return -1

0 commit comments

Comments
 (0)