Bump Multus to Kube 1.34 #1443
Merged
Bump Multus to Kube 1.34 #1443
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
cc: @bpickard22 |
Contributor
Author
|
cc: @barbora137 |
yingwang-0320
changed the title
yingwang-0320
force-pushed
the
CORENET-6353
branch
from
aa8e35e to
44c0d75
Compare
|
/assign @pliurh |
Collaborator
|
/approve |
thomasferrandiz
requested changes
Oct 30, 2025
Collaborator
thomasferrandiz
left a comment
thomasferrandiz
left a comment
There was a problem hiding this comment.
Thanks for the PR.
Please have a look at the PR and squash the commits and we'll be good to merge.
yingwang-0320
force-pushed
the
CORENET-6353
branch
from
a715e5e to
4d59913
Compare
Signed-off-by: “yingwang-0320” <[email protected]>
yingwang-0320
force-pushed
the
CORENET-6353
branch
from
4d59913 to
fc3053f
Compare
Contributor
Author
|
@thomasferrandiz Please help review, I made a clean commit and cherry-picks #1445 |
thomasferrandiz
approved these changes
Nov 12, 2025
thomasferrandiz
merged commit f42e0bd
into
k8snetworkplumbingwg:master
18 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
kube rebase to 1.34.1
go get k8s.io/[email protected]
go get k8s.io/[email protected]
go get k8s.io/[email protected]
go mod tidy
go mod vendor
make build
make test
go.mod content after go get packages:
`module gopkg.in/k8snetworkplumbingwg/multus-cni.v4
go 1.24.0
toolchain go1.24.6
require (
github.com/blang/semver v3.5.1+incompatible
github.com/containernetworking/cni v1.3.0
github.com/containernetworking/plugins v1.7.1
github.com/fsnotify/fsnotify v1.9.0
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.6
github.com/onsi/ginkgo/v2 v2.23.4
github.com/onsi/gomega v1.37.0
github.com/prometheus/client_golang v1.22.0
github.com/spf13/pflag v1.0.6
github.com/vishvananda/netlink v1.3.1
golang.org/x/net v0.41.0
golang.org/x/sys v0.33.0
google.golang.org/grpc v1.73.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1
k8s.io/api v0.34.1
k8s.io/apimachinery v0.34.1
k8s.io/client-go v0.34.1
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.130.1
k8s.io/kubelet v0.34.1
)
require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/go-logr/logr v1.4.2 // 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/go-task/slim-sprig/v3 v3.0.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/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.62.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/vishvananda/netns v0.0.5 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/oauth2 v0.28.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/text v0.26.0 // indirect
golang.org/x/time v0.9.0 // indirect
golang.org/x/tools v0.33.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.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
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)`
fixed conflicts:
$make build
./hack/build-go.sh
Building multus
`# gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/kubeletclient
pkg/kubeletclient/kubeletclient.go:163:44: claimResource.CDIDevices undefined (type *"k8s.io/kubelet/pkg/apis/podresources/v1".ClaimResource has no field or method CDIDevices, but does have field CdiDevices)
make: *** [Makefile:11: build] Error 1