Skip to content

Commit f09b419

Browse files
authored
Merge pull request #772 from idebeijer/bump-k8s-deps-v0.34-go-v1.24.7
chore: bump k8s to v0.34, go to v1.24.7 and some other deps
2 parents 5a930b9 + 8787108 commit f09b419

File tree

730 files changed

+76583
-27984
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

730 files changed

+76583
-27984
lines changed

.github/workflows/e2e.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
strategy:
6464
fail-fast: false
6565
matrix:
66-
k8s: [ v1.31.4, v1.32.0, v1.33.2 ]
66+
k8s: [ v1.32.0, v1.33.2, v1.34.0 ]
6767
connection-mode: [ grpc, http-connect ]
6868
steps:
6969
- name: Install kind
@@ -106,7 +106,7 @@ jobs:
106106
fail-fast: false
107107
matrix:
108108
ipFamily: ["ipv4", "ipv6", "dual"]
109-
k8s: [ v1.31.4, v1.32.0, v1.33.2 ]
109+
k8s: [ v1.32.0, v1.33.2, v1.34.0 ]
110110
env:
111111
JOB_NAME: "kindnetd-e2e-${{ matrix.ipFamily }}"
112112
IP_FAMILY: ${{ matrix.ipFamily }}

.github/workflows/golangci-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
contents: read
1212

1313
env:
14-
GO_VERSION: v1.24.3
14+
GO_VERSION: v1.24.7
1515
GOLANGCI_LINT_VERSION: v2.1.6
1616

1717
jobs:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ALL_ARCH ?= amd64 arm arm64 ppc64le s390x
2424
# The output type could either be docker (local), or registry.
2525
OUTPUT_TYPE ?= docker
2626
GO_TOOLCHAIN ?= golang
27-
GO_VERSION ?= 1.24.3
27+
GO_VERSION ?= 1.24.7
2828
BASEIMAGE ?= gcr.io/distroless/static-debian12:nonroot
2929

3030
ifeq ($(GOPATH),)

go.mod

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
module sigs.k8s.io/apiserver-network-proxy
22

3-
go 1.24.3
3+
go 1.24.7
44

55
require (
66
github.com/google/uuid v1.6.0
7-
github.com/prometheus/client_golang v1.22.0
8-
github.com/prometheus/client_model v0.6.1
9-
github.com/prometheus/common v0.63.0
10-
github.com/spf13/cobra v1.9.1
11-
github.com/spf13/pflag v1.0.6
7+
github.com/prometheus/client_golang v1.23.0
8+
github.com/prometheus/client_model v0.6.2
9+
github.com/prometheus/common v0.65.0
10+
github.com/spf13/cobra v1.10.1
11+
github.com/spf13/pflag v1.0.10
1212
github.com/stretchr/testify v1.10.0
1313
go.uber.org/goleak v1.3.0
1414
go.uber.org/mock v0.5.2
15-
golang.org/x/net v0.38.0
16-
google.golang.org/grpc v1.71.0
15+
golang.org/x/net v0.40.0
16+
google.golang.org/grpc v1.72.1
1717
google.golang.org/protobuf v1.36.6
18-
k8s.io/api v0.33.2
19-
k8s.io/apimachinery v0.33.2
20-
k8s.io/client-go v0.33.2
21-
k8s.io/component-base v0.33.2
22-
k8s.io/component-helpers v0.33.2
18+
k8s.io/api v0.34.0
19+
k8s.io/apimachinery v0.34.0
20+
k8s.io/client-go v0.34.0
21+
k8s.io/component-base v0.34.0
22+
k8s.io/component-helpers v0.34.0
2323
k8s.io/klog/v2 v2.130.1
24-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
24+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
2525
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0
2626
sigs.k8s.io/controller-runtime v0.20.3
2727
sigs.k8s.io/e2e-framework v0.6.0
@@ -32,15 +32,15 @@ require (
3232
github.com/blang/semver/v4 v4.0.0 // indirect
3333
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3434
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
35-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
35+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3636
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
37-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
37+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
3838
github.com/go-logr/logr v1.4.2 // indirect
3939
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4040
github.com/go-openapi/jsonreference v0.20.2 // indirect
4141
github.com/go-openapi/swag v0.23.0 // indirect
4242
github.com/gogo/protobuf v1.3.2 // indirect
43-
github.com/google/gnostic-models v0.6.9 // indirect
43+
github.com/google/gnostic-models v0.7.0 // indirect
4444
github.com/google/go-cmp v0.7.0 // indirect
4545
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
4646
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -50,30 +50,32 @@ require (
5050
github.com/mailru/easyjson v0.7.7 // indirect
5151
github.com/moby/spdystream v0.5.0 // indirect
5252
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
53-
github.com/modern-go/reflect2 v1.0.2 // indirect
53+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
5454
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5555
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
5656
github.com/pkg/errors v0.9.1 // indirect
5757
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
58-
github.com/prometheus/procfs v0.15.1 // indirect
58+
github.com/prometheus/procfs v0.16.1 // indirect
5959
github.com/vladimirvivien/gexe v0.4.1 // indirect
6060
github.com/x448/float16 v0.8.4 // indirect
61-
go.opentelemetry.io/otel v1.34.0 // indirect
62-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
63-
golang.org/x/oauth2 v0.27.0 // indirect
64-
golang.org/x/sys v0.31.0 // indirect
65-
golang.org/x/term v0.30.0 // indirect
66-
golang.org/x/text v0.23.0 // indirect
61+
go.opentelemetry.io/otel v1.35.0 // indirect
62+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
63+
go.yaml.in/yaml/v2 v2.4.2 // indirect
64+
go.yaml.in/yaml/v3 v3.0.4 // indirect
65+
golang.org/x/oauth2 v0.30.0 // indirect
66+
golang.org/x/sys v0.33.0 // indirect
67+
golang.org/x/term v0.32.0 // indirect
68+
golang.org/x/text v0.25.0 // indirect
6769
golang.org/x/time v0.9.0 // indirect
68-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
70+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
6971
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7072
gopkg.in/inf.v0 v0.9.1 // indirect
7173
gopkg.in/yaml.v3 v3.0.1 // indirect
72-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
73-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
74+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
75+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
7476
sigs.k8s.io/randfill v1.0.0 // indirect
75-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
76-
sigs.k8s.io/yaml v1.4.0 // indirect
77+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
78+
sigs.k8s.io/yaml v1.6.0 // indirect
7779
)
7880

7981
replace sigs.k8s.io/apiserver-network-proxy/konnectivity-client => ./konnectivity-client

0 commit comments

Comments
 (0)