Skip to content

Commit 9910bc9

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request cri-o#8758 from haircommander/ocicni-0.4.3
vendor cni 0.4.3
2 parents 9c4c831 + 19efac2 commit 9910bc9

File tree

6 files changed

+186
-59
lines changed

6 files changed

+186
-59
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
github.com/containers/storage v1.55.0
3030
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09
3131
github.com/creack/pty v1.1.23
32-
github.com/cri-o/ocicni v0.4.2
32+
github.com/cri-o/ocicni v0.4.3
3333
github.com/cyphar/filepath-securejoin v0.3.4
3434
github.com/docker/distribution v2.8.3+incompatible
3535
github.com/docker/go-units v0.5.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -747,8 +747,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
747747
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
748748
github.com/creack/pty v1.1.23 h1:4M6+isWdcStXEf15G/RbrMPOQj1dZ7HPZCGwE4kOeP0=
749749
github.com/creack/pty v1.1.23/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
750-
github.com/cri-o/ocicni v0.4.2 h1:/QRdfxW9x0AUtIloDNLTHY21cEK/U+fh+CadoNG0BPg=
751-
github.com/cri-o/ocicni v0.4.2/go.mod h1:KoSu7fBBKuRRM+t4om4iFOGt+/a0bkUF+9IeYTMZCNs=
750+
github.com/cri-o/ocicni v0.4.3 h1:BfnrZrtr/F+o+b+yOguB1o6I4OzjieF3k3dN4MrsCJA=
751+
github.com/cri-o/ocicni v0.4.3/go.mod h1:RzIKSln5AT65hyyfGj3/gsfCpjiY1Y6rVK51Uc5YNzk=
752752
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f h1:eHnXnuK47UlSTOQexbzxAZfekVz6i+LKRdj1CU5DPaM=
753753
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f/go.mod h1:uzvlm1mxhHkdfqitSA92i7Se+S9ksOn3a3qmv/kyOCw=
754754
github.com/cyphar/filepath-securejoin v0.3.4 h1:VBWugsJh2ZxJmLFSM06/0qzQyiQX2Qs0ViKrUAcqdZ8=

‎test/mocks/ocicni/types.go‎

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

‎vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go‎

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

0 commit comments

Comments
 (0)