Skip to content

chore: bump mockgen, proto-gen-go and grpc deps #811

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.

Sign up for GitHub

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

Draft
idebeijer wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

chore: bump mockgen, proto-gen-go and grpc deps #811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9675d3d
chore: bump k8s deps to v0.35.1 and bump go to v1.25.7
idebeijer Feb 11, 2026
0de2ea3
chore: go mod vendor
idebeijer Feb 11, 2026
03a2d11
chore: bump remaining deps
idebeijer Feb 11, 2026
a9396d1
revert: downgrade google.golang.org/grpc to v1.72.2
idebeijer Feb 11, 2026
ddc0b9f
chore: bump mockgen, protoc-gen-go and grpc deps
idebeijer Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
strategy:
fail-fast: false
matrix:
k8s: [ v1.32.0, v1.33.2, v1.34.0 ]
k8s: [ v1.33.2, v1.34.0, v1.35.1 ]
connection-mode: [ grpc, http-connect ]
steps:
- name: Install kind
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:
contents: read

env:
GO_VERSION: v1.24.7
GO_VERSION: v1.25.7
GOLANGCI_LINT_VERSION: v2.1.6

jobs:
Expand Down
8 changes: 2 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ALL_ARCH ?= amd64 arm arm64 ppc64le s390x
# The output type could either be docker (local), or registry.
OUTPUT_TYPE ?= docker
GO_TOOLCHAIN ?= golang
GO_VERSION ?= 1.24.7
GO_VERSION ?= 1.25.7
BASEIMAGE ?= gcr.io/distroless/static-debian12:nonroot

ifeq ($(GOPATH),)
Expand Down Expand Up @@ -59,7 +59,7 @@ KIND_IMAGE ?= kindest/node:v1.30.2
CONNECTION_MODE ?= grpc

MOCKGEN_VERSION := $(shell mockgen -version)
DESIRED_MOCKGEN := "v0.5.2"
DESIRED_MOCKGEN := "v0.6.0"

## --------------------------------------
## Testing
Expand Down Expand Up @@ -151,11 +151,7 @@ gen: mod-download gen-proto mock_gen
.PHONY: gen-proto
gen-proto:
protoc -I . konnectivity-client/proto/client/client.proto --go_out=. --go_opt=paths=source_relative --go-grpc_out=require_unimplemented_servers=false:. --go-grpc_opt=paths=source_relative
cat hack/go-license-header.txt konnectivity-client/proto/client/client_grpc.pb.go > konnectivity-client/proto/client/client_grpc.licensed.go
mv konnectivity-client/proto/client/client_grpc.licensed.go konnectivity-client/proto/client/client_grpc.pb.go
protoc -I . proto/agent/agent.proto --go_out=. --go_opt=paths=source_relative --go-grpc_out=require_unimplemented_servers=false:. --go-grpc_opt=paths=source_relative
cat hack/go-license-header.txt proto/agent/agent_grpc.pb.go > proto/agent/agent_grpc.licensed.go
mv proto/agent/agent_grpc.licensed.go proto/agent/agent_grpc.pb.go

## --------------------------------------
## Certs
Expand Down
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,19 @@ The [```mockgen```](https://github.com/uber-go/mock) tool must be installed on y

Currently, we are using go.uber.org/mock/mockgen@v0.5.2

`go install go.uber.org/mock/mockgen@v0.5.2`
`go install go.uber.org/mock/mockgen@v0.6.0`

### Protoc

Proto definitions are compiled with `protoc`. Please ensure you have protoc installed ([Instructions](https://grpc.io/docs/languages/go/quickstart/)) and the `protoc-gen-go` and `protoc-gen-go-grpc` libraries at the appropriate version.

Currently, we are using protoc-gen-go@v1.27.1
Currently, we are using protoc-gen-go@v1.35.1

`go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.27.1`
`go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.35.1`

Currently, we are using protoc-gen-go-grpc@v1.2
Currently, we are using protoc-gen-go-grpc@v1.5.1

`go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2`
`go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.5.1`

### Local builds

Expand Down
62 changes: 30 additions & 32 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
module sigs.k8s.io/apiserver-network-proxy

go 1.24.7
go 1.25.7

require (
github.com/google/uuid v1.6.0
github.com/prometheus/client_golang v1.23.0
github.com/prometheus/client_golang v1.23.2
github.com/prometheus/client_model v0.6.2
github.com/prometheus/common v0.65.0
github.com/spf13/cobra v1.10.1
github.com/prometheus/common v0.67.5
github.com/spf13/cobra v1.10.2
github.com/spf13/pflag v1.0.10
github.com/stretchr/testify v1.10.0
github.com/stretchr/testify v1.11.1
go.uber.org/goleak v1.3.0
go.uber.org/mock v0.5.2
golang.org/x/net v0.40.0
google.golang.org/grpc v1.72.1
google.golang.org/protobuf v1.36.6
k8s.io/api v0.34.0
k8s.io/apimachinery v0.34.0
k8s.io/client-go v0.34.0
k8s.io/component-base v0.34.0
k8s.io/component-helpers v0.34.0
go.uber.org/mock v0.6.0
golang.org/x/net v0.50.0
google.golang.org/grpc v1.72.2
google.golang.org/protobuf v1.36.11
k8s.io/api v0.35.1
k8s.io/apimachinery v0.35.1
k8s.io/client-go v0.35.1
k8s.io/component-base v0.35.1
k8s.io/component-helpers v0.35.1
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0
sigs.k8s.io/controller-runtime v0.20.3
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0
sigs.k8s.io/controller-runtime v0.23.1
sigs.k8s.io/e2e-framework v0.6.0
)

Expand All @@ -35,11 +35,10 @@ require (
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/gnostic-models v0.7.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
Expand All @@ -53,28 +52,27 @@ require (
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/vladimirvivien/gexe v0.4.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.opentelemetry.io/otel v1.38.0 // indirect
go.opentelemetry.io/otel/trace v1.38.0 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/text v0.25.0 // indirect
golang.org/x/oauth2 v0.34.0 // indirect
golang.org/x/sys v0.41.0 // indirect
golang.org/x/term v0.40.0 // indirect
golang.org/x/text v0.34.0 // indirect
golang.org/x/time v0.9.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)

Expand Down
Loading