starlingx/integ
Code Issues Proposed changes

debian-pkg: Uprev containernetworking-plugins to 1.0.1

Browse Source 
This commit uprevs the containernetworking-plugins to 1.0.1 on
Debian.

The version of this package has a Build-Depends on:

golang-github-appc-cni-dev >= 1.0.1
golang-github-vishvananda-netlink-dev >= 1.1.0.125

Currently, the Debian Bullseye release provides:

golang-github-appc-cni-dev = 0.8.1
golang-github-vishvananda-netlink-dev = 1.1.0-2

So in order to build the containernetworking-plugins 1.0.1, this
commit pulls in the appropriate versions of the dependencies
and builds them too.

The other thing to note in this commit is that the plugin install
path has been changed from /usr/lib/cni/ to /usr/libexec/cni/.
This aligns with where k8s expects to find CNI plugins on StarlingX

Testing:

- PASS: downloader -s
- PASS: full build
- PASS: install and ensure the plugins are present
        at /usr/libexec/cni/
- PASS: install and ensure the package is the correct version

Story: 2009832
Task: 44635

Signed-off-by: Steven Webster <steven.webster@windriver.com>
Change-Id: Ic1c9a0d7eb2adb831c6316e1ab72d288ac805929
This commit is contained in:
Steven Webster 2022-03-17 14:04:03 -04:00
parent 6a80cc50f3
commit 75e3878176
5 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian_pkg_dirs
View File

@ -32,6 +32,8 @@ config/puppet-modules/puppet-staging
docker/python-docker
filesystem/drbd/drbd-tools
filesystem/parted
golang-github-dev/golang-github-appc-cni
golang-github-dev/golang-github-vishvananda-netlink
grub/grub2
grub/grubby
kubernetes/armada

11
golang-github-dev/golang-github-appc-cni/debian/meta_data.yaml Normal file
View File

@ -0,0 +1,11 @@
---
debname: golang-github-appc-cni
debver: 1.0.1-3
dl_path:
name: golang-github-appc-cni-1.0.1-3.tar.gz
url: https://salsa.debian.org/go-team/packages/golang-github-appc-cni/-/archive/debian/1.0.1-3/golang-github-appc-cni-debian-1.0.1-3.tar.gz
md5sum: a884ffbc1eaa127efafd93e7599751c3
sha256sum: 5d7c277964860a2f6d15d8208e37909d89f47adba4292247c24f65ebba2566d0
revision:
dist: $STX_DIST
PKG_GITREVCOUNT: true

11
golang-github-dev/golang-github-vishvananda-netlink/debian/meta_data.yaml Normal file
View File

@ -0,0 +1,11 @@
---
debname: golang-github-vishvananda-netlink
debver: 1.1.0.125.gf243826-4
dl_path:
name: golang-github-vishvananda-debian-1.1.0.125.gf243826-4.tar.gz
url: https://salsa.debian.org/go-team/packages/golang-github-vishvananda-netlink/-/archive/debian/1.1.0.125.gf243826-4/golang-github-vishvananda-netlink-debian-1.1.0.125.gf243826-4.tar.gz
md5sum: f6446c199670cdd89690f3366cf18916
sha256sum: 8db9eaf59ab220c5205c97ff1bb38ca76ad7760afdf8778746db318b76515c95
revision:
dist: $STX_DIST
PKG_GITREVCOUNT: true

1
kubernetes/cni/plugins/debian/deb_folder/containernetworking-plugins.install Normal file
View File

@ -0,0 +1 @@
usr/bin/* usr/libexec/cni/

10
kubernetes/cni/plugins/debian/meta_data.yaml
View File

@ -1,11 +1,11 @@
---
debname: golang-github-containernetworking-plugins
debver: 0.9.0-1
debver: 1.0.1+ds1-1
dl_path:
name: golang-github-containernetworking-plugins-debian-0.9.0-1.tar.gz
url: https://salsa.debian.org/go-team/packages/golang-github-containernetworking-plugins/-/archive/debian/0.9.0-1/golang-github-containernetworking-plugins-debian-0.9.0-1.tar.gz
md5sum: 8e38d8a13f5dd5ddc17f1a1b21fd3f9d
sha256sum: 65ade9991a6a16dddb05271c430a0b45fa3b4a6aa5675efe6b729f74f73c35d8
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
revision:
dist: $STX_DIST
PKG_GITREVCOUNT: true