Skip to content

Commit 8c4e93c

Browse files
committed
Update to k8s 1.34.1, go 1.24 and multus-cni v4.2.3
- Remove explicit pin to k8s 1.29.1 - Update to go 1.24 - Update to k8s 1.34.1 - Update to multus-cni v4.2.3 Signed-off-by: Michael Fritch <[email protected]>
1 parent 4a3cac6 commit 8c4e93c

File tree

2,847 files changed

+224366
-144491
lines changed

Some content is hidden

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

2,847 files changed

+224366
-144491
lines changed

.github/workflows/check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up Go
2424
uses: actions/setup-go@v3
2525
with:
26-
go-version: 1.22.10
26+
go-version: 1.24
2727

2828
- name: Build
2929
run: time make build

.github/workflows/e2e-containerd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up Go
2424
uses: actions/setup-go@v3
2525
with:
26-
go-version: 1.22
26+
go-version: 1.24
2727

2828
- name: Setup kind cluster
2929
run: hack/e2e-kind-cluster-setup.sh

go.mod

Lines changed: 46 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,68 @@
11
module github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller
22

3-
go 1.22.0
4-
5-
toolchain go1.22.10
3+
go 1.24.0
64

75
require (
8-
github.com/containernetworking/cni v1.2.3
9-
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.5
10-
github.com/onsi/ginkgo/v2 v2.21.0
11-
github.com/onsi/gomega v1.35.1
12-
github.com/opencontainers/runtime-spec v1.2.0
13-
google.golang.org/grpc v1.69.2
14-
gopkg.in/k8snetworkplumbingwg/multus-cni.v4 v4.1.1
15-
k8s.io/api v0.29.1
16-
k8s.io/apimachinery v0.29.1
17-
k8s.io/client-go v1.5.2
18-
k8s.io/cri-api v0.29.1
19-
k8s.io/klog/v2 v2.120.1
20-
k8s.io/kubelet v0.29.1
6+
github.com/containernetworking/cni v1.3.0
7+
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.7
8+
github.com/onsi/ginkgo/v2 v2.23.4
9+
github.com/onsi/gomega v1.37.0
10+
github.com/opencontainers/runtime-spec v1.2.1
11+
google.golang.org/grpc v1.73.0
12+
gopkg.in/k8snetworkplumbingwg/multus-cni.v4 v4.2.3
13+
k8s.io/api v0.34.1
14+
k8s.io/apimachinery v0.34.1
15+
k8s.io/client-go v0.34.1
16+
k8s.io/cri-api v0.34.1
17+
k8s.io/klog/v2 v2.130.1
18+
k8s.io/kubelet v0.34.1
2119
)
2220

2321
require (
24-
github.com/davecgh/go-spew v1.1.1 // indirect
25-
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
26-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
22+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
23+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
24+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
2725
github.com/go-logr/logr v1.4.2 // indirect
28-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
26+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2927
github.com/go-openapi/jsonreference v0.20.4 // indirect
30-
github.com/go-openapi/swag v0.22.8 // indirect
28+
github.com/go-openapi/swag v0.23.0 // indirect
3129
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3230
github.com/gogo/protobuf v1.3.2 // indirect
33-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
34-
github.com/golang/protobuf v1.5.4 // indirect
35-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
36-
github.com/google/go-cmp v0.6.0 // indirect
37-
github.com/google/gofuzz v1.2.0 // indirect
38-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
31+
github.com/google/gnostic-models v0.7.0 // indirect
32+
github.com/google/go-cmp v0.7.0 // indirect
33+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
3934
github.com/google/uuid v1.6.0 // indirect
40-
github.com/imdario/mergo v0.3.16 // indirect
4135
github.com/josharian/intern v1.0.0 // indirect
4236
github.com/json-iterator/go v1.1.12 // indirect
4337
github.com/mailru/easyjson v0.7.7 // indirect
4438
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
45-
github.com/modern-go/reflect2 v1.0.2 // indirect
39+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
4640
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4741
github.com/pkg/errors v0.9.1 // indirect
48-
github.com/spf13/pflag v1.0.5 // indirect
49-
github.com/vishvananda/netns v0.0.4 // indirect
50-
golang.org/x/net v0.30.0 // indirect
51-
golang.org/x/oauth2 v0.23.0 // indirect
52-
golang.org/x/sys v0.26.0 // indirect
53-
golang.org/x/term v0.25.0 // indirect
54-
golang.org/x/text v0.19.0 // indirect
55-
golang.org/x/time v0.5.0 // indirect
56-
golang.org/x/tools v0.26.0 // indirect
57-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
58-
google.golang.org/protobuf v1.35.1 // indirect
42+
github.com/pmezard/go-difflib v1.0.0 // indirect
43+
github.com/spf13/pflag v1.0.6 // indirect
44+
github.com/vishvananda/netns v0.0.5 // indirect
45+
github.com/x448/float16 v0.8.4 // indirect
46+
go.uber.org/automaxprocs v1.6.0 // indirect
47+
go.yaml.in/yaml/v2 v2.4.2 // indirect
48+
go.yaml.in/yaml/v3 v3.0.4 // indirect
49+
golang.org/x/net v0.41.0 // indirect
50+
golang.org/x/oauth2 v0.28.0 // indirect
51+
golang.org/x/sys v0.33.0 // indirect
52+
golang.org/x/term v0.32.0 // indirect
53+
golang.org/x/text v0.26.0 // indirect
54+
golang.org/x/time v0.9.0 // indirect
55+
golang.org/x/tools v0.33.0 // indirect
56+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
57+
google.golang.org/protobuf v1.36.6 // indirect
58+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
5959
gopkg.in/inf.v0 v0.9.1 // indirect
6060
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
61-
gopkg.in/yaml.v2 v2.4.0 // indirect
6261
gopkg.in/yaml.v3 v3.0.1 // indirect
63-
k8s.io/kube-openapi v0.0.0-20240117194847-208609032b15 // indirect
64-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
65-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
66-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
67-
sigs.k8s.io/yaml v1.4.0 // indirect
68-
)
69-
70-
replace (
71-
k8s.io/api => k8s.io/api v0.29.1
72-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.1
73-
k8s.io/apimachinery => k8s.io/apimachinery v0.29.1
74-
k8s.io/apiserver => k8s.io/apiserver v0.29.1
75-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.1
76-
k8s.io/client-go => k8s.io/client-go v0.29.1
77-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.1
78-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.1
79-
k8s.io/code-generator => k8s.io/code-generator v0.29.1
80-
k8s.io/component-base => k8s.io/component-base v0.29.1
81-
k8s.io/component-helpers => k8s.io/component-helpers v0.29.1
82-
k8s.io/controller-manager => k8s.io/controller-manager v0.29.1
83-
k8s.io/cri-api => k8s.io/cri-api v0.29.1
84-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.1
85-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.1
86-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.1
87-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.1
88-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.1
89-
k8s.io/kubectl => k8s.io/kubectl v0.29.1
90-
k8s.io/kubelet => k8s.io/kubelet v0.29.1
91-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.1
92-
k8s.io/metrics => k8s.io/metrics v0.29.1
93-
k8s.io/mount-utils => k8s.io/mount-utils v0.29.1
94-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.1
95-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.1
62+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
63+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
64+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
65+
sigs.k8s.io/randfill v1.0.0 // indirect
66+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
67+
sigs.k8s.io/yaml v1.6.0 // indirect
9668
)

0 commit comments

Comments
 (0)