Skip to content

Commit e1a0d2a

Browse files
authored
Merge pull request #1345 from dougbtv/net-attach-def-lib-175
Update net-attach-def client library to 1.7.5 for cri-o functionality
2 parents adfb270 + ecf5854 commit e1a0d2a

4 files changed

Lines changed: 43 additions & 6 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/containernetworking/plugins v1.1.0
99
github.com/fsnotify/fsnotify v1.6.0
1010
github.com/go-logr/logr v1.3.0 // indirect
11-
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.4
11+
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.5
1212
github.com/onsi/ginkgo/v2 v2.13.2
1313
github.com/onsi/gomega v1.30.0
1414
github.com/pkg/errors v0.9.1 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -825,8 +825,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
825825
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
826826
github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
827827
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
828-
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.4 h1:vn0d/47rWzEHpDl3Ac7MiD9DfKK3gNBezI5khPKE7AQ=
829-
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.4/go.mod h1:CM7HAH5PNuIsqjMN0fGc1ydM74Uj+0VZFhob620nklw=
828+
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.5 h1:CELpSMPSyicFBaVsxROmfrWlu9yr3Dduk+y7vGrIsx8=
829+
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.5/go.mod h1:CM7HAH5PNuIsqjMN0fGc1ydM74Uj+0VZFhob620nklw=
830830
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
831831
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
832832
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=

vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils/net-attach-def.go

Lines changed: 33 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ github.com/josharian/intern
114114
# github.com/json-iterator/go v1.1.12
115115
## explicit; go 1.12
116116
github.com/json-iterator/go
117-
# github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.4
117+
# github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.5
118118
## explicit; go 1.21
119119
github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io
120120
github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1
@@ -211,6 +211,8 @@ github.com/vishvananda/netlink/nl
211211
# github.com/vishvananda/netns v0.0.4
212212
## explicit; go 1.17
213213
github.com/vishvananda/netns
214+
# golang.org/x/mod v0.13.0
215+
## explicit; go 1.18
214216
# golang.org/x/net v0.23.0
215217
## explicit; go 1.18
216218
golang.org/x/net/context
@@ -783,6 +785,10 @@ k8s.io/client-go/util/homedir
783785
k8s.io/client-go/util/keyutil
784786
k8s.io/client-go/util/retry
785787
k8s.io/client-go/util/workqueue
788+
# k8s.io/code-generator v0.29.0 => k8s.io/code-generator v0.29.0
789+
## explicit; go 1.21
790+
# k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01
791+
## explicit; go 1.13
786792
# k8s.io/klog v1.0.0
787793
## explicit; go 1.12
788794
k8s.io/klog

0 commit comments

Comments
 (0)