debian-pkg: Uprev cni plugins
This commit uprevs the containernetworking-plugins to 1.1.1 and
bond-cni v1.0 (with the latest commit) on Debian
This version of containernetworking-plugins has a Build-Depends on:
golang-github-networkplumbing-go-nft-dev v0.2.0-2
The bond-cni vendor module patches are taken care of
in the latest commit update.
Also, the plugins sysctl patches are taken care of in the
containernetworking-plugins v1.1.1 release.
Test Plan:
- PASS: downloader -b -s -B std,rt
- PASS: build pkgs
- PASS: build image
- PASS: install and ensure the plugins are present
at /var/opt/cni/bin/
- PASS: install and ensure the packages are the correct version
Story: 2010212
Task: 46507
Signed-off-by: Mohammad Issa <mohammad.issa@windriver.com>
Change-Id: I079e50c9339bac395dfaf9d1f27aa321dbc45140
This commit is contained in:
Mohammad Issa
parent
308d87b296
commit
241c07d1ff
@ -45,6 +45,7 @@ golang-github-dev/golang-github-cilium-ebpf-dev
|
||||
golang-github-dev/golang-github-coreos-go-systemd-dev
|
||||
golang-github-dev/golang-github-opencontainers-specs-dev
|
||||
golang-github-dev/golang-github-vishvananda-netlink
|
||||
golang-github-dev/golang-github-networkplumbing-go-nft-dev
|
||||
gpu/gpu-operator
|
||||
grub/grub2
|
||||
grub/grubby
|
||||
|
||||
@ -0,0 +1,7 @@
|
||||
---
|
||||
debname: golang-github-networkplumbing-go-nft
|
||||
debver: 0.2.0-2
|
||||
archive: https://snapshot.debian.org/archive/debian/20221002T213554Z/pool/main/g/golang-github-networkplumbing-go-nft/
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
PKG_GITREVCOUNT: true
|
||||
@ -1,3 +1,10 @@
|
||||
bond-cni (1.0-33bcd8f15d67c0923fe1fb03c09ee998f52103c9) unstable; urgency=medium
|
||||
|
||||
* Updated using latest commit
|
||||
|
||||
-- Mohammad Issa <mohammad.issa@windriver.com> Thu, 06 Oct 2022 14:39:45 -0400
|
||||
|
||||
|
||||
bond-cni (1.0-bff6422d7089d988dc1548e6abe0543601f6e1c7) unstable; urgency=medium
|
||||
|
||||
* Initial release.
|
||||
|
||||
@ -13,7 +13,7 @@ Build-Depends: debhelper-compat (= 13),
|
||||
golang-github-coreos-go-iptables-dev (>= 0.4.5~),
|
||||
golang-github-safchain-ethtool-dev,
|
||||
golang-golang-x-sys-dev,
|
||||
XS-Go-Import-Path: github.com/bond
|
||||
XS-Go-Import-Path: github.com/intel/bond-cni
|
||||
|
||||
Package: bond-cni
|
||||
Architecture: any
|
||||
|
||||
@ -1,68 +0,0 @@
|
||||
From 76ac4271502d6356f5150f6047d9dc05eb2470bd Mon Sep 17 00:00:00 2001
|
||||
From: Steven Webster <steven.webster@windriver.com>
|
||||
Date: Fri, 8 Apr 2022 16:01:58 -0400
|
||||
Subject: [PATCH] Add explicit vendor module dependencies
|
||||
|
||||
Signed-off-by: Steven Webster <steven.webster@windriver.com>
|
||||
---
|
||||
go.mod | 6 ++++++
|
||||
vendor/modules.txt | 11 +++++++----
|
||||
2 files changed, 13 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/go.mod b/go.mod
|
||||
index c334299..385a70f 100644
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -8,3 +8,9 @@ require (
|
||||
github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
|
||||
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74
|
||||
)
|
||||
+
|
||||
+require (
|
||||
+ github.com/coreos/go-iptables v0.6.0 // indirect
|
||||
+ github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1 // indirect
|
||||
+ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect
|
||||
+)
|
||||
diff --git a/vendor/modules.txt b/vendor/modules.txt
|
||||
index ac4b3f5..d684960 100644
|
||||
--- a/vendor/modules.txt
|
||||
+++ b/vendor/modules.txt
|
||||
@@ -1,5 +1,5 @@
|
||||
# github.com/containernetworking/cni v1.0.1
|
||||
-## explicit
|
||||
+## explicit; go 1.14
|
||||
github.com/containernetworking/cni/pkg/invoke
|
||||
github.com/containernetworking/cni/pkg/skel
|
||||
github.com/containernetworking/cni/pkg/types
|
||||
@@ -11,22 +11,25 @@ github.com/containernetworking/cni/pkg/types/internal
|
||||
github.com/containernetworking/cni/pkg/utils
|
||||
github.com/containernetworking/cni/pkg/version
|
||||
# github.com/containernetworking/plugins v1.0.1
|
||||
-## explicit
|
||||
+## explicit; go 1.16
|
||||
github.com/containernetworking/plugins/pkg/ip
|
||||
github.com/containernetworking/plugins/pkg/ipam
|
||||
github.com/containernetworking/plugins/pkg/ns
|
||||
github.com/containernetworking/plugins/pkg/utils/sysctl
|
||||
# github.com/coreos/go-iptables v0.6.0
|
||||
+## explicit; go 1.16
|
||||
github.com/coreos/go-iptables/iptables
|
||||
# github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1
|
||||
+## explicit
|
||||
github.com/safchain/ethtool
|
||||
# github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
|
||||
-## explicit
|
||||
+## explicit; go 1.12
|
||||
github.com/vishvananda/netlink
|
||||
github.com/vishvananda/netlink/nl
|
||||
# github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74
|
||||
-## explicit
|
||||
+## explicit; go 1.12
|
||||
github.com/vishvananda/netns
|
||||
# golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e
|
||||
+## explicit; go 1.17
|
||||
golang.org/x/sys/internal/unsafeheader
|
||||
golang.org/x/sys/unix
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1 +0,0 @@
|
||||
0001-Add-explicit-vendor-module-dependencies.patch
|
||||
@ -1,11 +1,11 @@
|
||||
---
|
||||
debname: bond-cni
|
||||
debver: 1.0-bff6422d7089d988dc1548e6abe0543601f6e1c7
|
||||
debver: 1.0-33bcd8f15d67c0923fe1fb03c09ee998f52103c9
|
||||
dl_path:
|
||||
name: bond-cni-1.0-bff6422d7089d988dc1548e6abe0543601f6e1c7.tar.gz
|
||||
url: https://api.github.com/repos/k8snetworkplumbingwg/bond-cni/tarball/bff6422d7089d988dc1548e6abe0543601f6e1c7
|
||||
md5sum: 9c0ae1dad63cf953b5257d3253fda7cb
|
||||
sha256sum: c20d67e19e5508e12683adfe18252f8b99a8e902980fb08e2de67d1893cabc5b
|
||||
name: bond-cni-1.0-33bcd8f15d67c0923fe1fb03c09ee998f52103c9.tar.gz
|
||||
url: https://api.github.com/repos/k8snetworkplumbingwg/bond-cni/tarball/33bcd8f15d67c0923fe1fb03c09ee998f52103c9
|
||||
md5sum: 3aafaedebe9e06c40b7b8d5ba9f1bca2
|
||||
sha256sum: 551457ffca2df8a4faa3454207bd059546a111e8ad54fdb6dc7f07abca9a4d63
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
PKG_GITREVCOUNT: true
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
---
|
||||
debname: golang-github-containernetworking-plugins
|
||||
debver: 1.0.1+ds1-1
|
||||
debver: 1.1.1+ds1-1
|
||||
dl_path:
|
||||
name: golang-github-containernetworking-plugins-debian-1.0.1+ds1-1.tar.gz
|
||||
url: https://salsa.debian.org/go-team/packages/golang-github-containernetworking-plugins/-/archive/debian/1.0.1+ds1-1/golang-github-containernetworking-plugins-debian-1.0.1+ds1-1.tar.gz
|
||||
md5sum: 1e36d1f0256fb39b5504a10fd974f045
|
||||
sha256sum: 6c5909b12123d7039abbc422926462b47dbf02952ef2e3093d4dc72ae8724ecc
|
||||
name: golang-github-containernetworking-plugins-debian-1.1.1+ds1-1.tar.gz
|
||||
url: https://salsa.debian.org/go-team/packages/golang-github-containernetworking-plugins/-/archive/debian/1.1.1+ds1-1/golang-github-containernetworking-plugins-debian-1.1.1+ds1-1.tar.gz
|
||||
md5sum: 64cae07a4337f3eae6cc1e1a13ce1af7
|
||||
sha256sum: cb08260f6b1136de00d62724911d427870ab2473d030e0909f963a36891fd98d
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
PKG_GITREVCOUNT: true
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
From c16cff9805427c5db34b43de3155769b362f596e Mon Sep 17 00:00:00 2001
|
||||
From: Piotr Skamruk <piotr.skamruk@gmail.com>
|
||||
Date: Fri, 1 Oct 2021 18:07:50 +0200
|
||||
Subject: [PATCH] Allow setting sysctls on a particular interface
|
||||
|
||||
Signed-off-by: Piotr Skamruk <piotr.skamruk@gmail.com>
|
||||
[ commit c16cff9805427c5db34b43de3155769b362f596e
|
||||
in upstream repo https://github.com/containernetworking/plugins ]
|
||||
Signed-off-by: Steven Webster <steven.webster@windriver.com>
|
||||
---
|
||||
plugins/meta/tuning/tuning.go | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/plugins/meta/tuning/tuning.go b/plugins/meta/tuning/tuning.go
|
||||
index 7b56944..d9eef83 100644
|
||||
--- a/plugins/meta/tuning/tuning.go
|
||||
+++ b/plugins/meta/tuning/tuning.go
|
||||
@@ -325,6 +325,11 @@ func cmdAdd(args *skel.CmdArgs) error {
|
||||
|
||||
err = ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
|
||||
for key, value := range tuningConf.SysCtl {
|
||||
+ // If the key contains `IFNAME` - substitute it with args.IfName
|
||||
+ // to allow setting sysctls on a particular interface, on which
|
||||
+ // other operations (like mac/mtu setting) are performed
|
||||
+ key = strings.Replace(key, "IFNAME", args.IfName, 1)
|
||||
+
|
||||
fileName := filepath.Join("/proc/sys", strings.Replace(key, ".", "/", -1))
|
||||
fileName = filepath.Clean(fileName)
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1 +0,0 @@
|
||||
0001-Allow-setting-sysctls-on-a-particular-interface.patch
|
||||
Loading…
Reference in New Issue
Block a user