From 435ba6e1946b4d79f99612c910397ff3af2c84cc Mon Sep 17 00:00:00 2001 From: Mohammad Issa Date: Fri, 23 Feb 2024 16:43:30 +0000 Subject: [PATCH] debian-pkg: Update golang for cni plugins This commit updates the containernetworking-plugins and bond-cni pkgs to use golang-1.18. Test Plan: - PASS: downloader - PASS: build pkgs - PASS: build image - PASS: the plugins are present at /var/opt/cni/bin/ - PASS: test the plugins' functionality Story: 2010878 Task: 49619 Change-Id: Ie8e0f01502e74cf2fb7a4b3ba88c37b69609c297 Signed-off-by: Mohammad Issa --- kubernetes/cni/bond-cni/debian/deb_folder/changelog | 7 +++++++ kubernetes/cni/bond-cni/debian/deb_folder/control | 3 ++- kubernetes/cni/bond-cni/debian/deb_folder/rules | 2 +- kubernetes/cni/plugins/debian/deb_folder/changelog | 7 +++++++ kubernetes/cni/plugins/debian/deb_folder/control | 2 +- kubernetes/cni/plugins/debian/deb_folder/rules | 2 +- 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/kubernetes/cni/bond-cni/debian/deb_folder/changelog b/kubernetes/cni/bond-cni/debian/deb_folder/changelog index 1c5ce216e..740a9fc41 100644 --- a/kubernetes/cni/bond-cni/debian/deb_folder/changelog +++ b/kubernetes/cni/bond-cni/debian/deb_folder/changelog @@ -1,3 +1,10 @@ +bond-cni (1.0-408b549d88c6395b50ef20bf3195c7e1a8766a47) unstable; urgency=medium + + * Updated golang to 1.18 + + -- Mohammad Issa Tue, 20 Feb 2024 15:38:13 -0400 + + bond-cni (1.0-408b549d88c6395b50ef20bf3195c7e1a8766a47) unstable; urgency=medium * Updated using latest commit diff --git a/kubernetes/cni/bond-cni/debian/deb_folder/control b/kubernetes/cni/bond-cni/debian/deb_folder/control index 0667f5a8d..da2b735fc 100644 --- a/kubernetes/cni/bond-cni/debian/deb_folder/control +++ b/kubernetes/cni/bond-cni/debian/deb_folder/control @@ -6,7 +6,7 @@ Standards-Version: 4.6.0 Homepage: https://www.starlingx.io Build-Depends: debhelper-compat (= 13), dh-golang, - golang-1.17, + golang-1.18, golang-github-appc-cni-dev, golang-github-containernetworking-plugins-dev, golang-github-vishvananda-netlink-dev, @@ -18,6 +18,7 @@ XS-Go-Import-Path: github.com/intel/bond-cni Package: bond-cni Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} +Built-Using: ${misc:Built-Using} Description: Provides a binary for the bond-cni plugin. Bonding provides a method for aggregating multiple network interfaces into a single logical "bonded" interface. diff --git a/kubernetes/cni/bond-cni/debian/deb_folder/rules b/kubernetes/cni/bond-cni/debian/deb_folder/rules index 61ec68ae5..a4779c576 100644 --- a/kubernetes/cni/bond-cni/debian/deb_folder/rules +++ b/kubernetes/cni/bond-cni/debian/deb_folder/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export PATH := /usr/lib/go-1.17/bin:$(PATH) +export PATH := /usr/lib/go-1.18/bin:$(PATH) export DH_VERBOSE = 1 export DH_GOLANG_GO_GENERATE := 1 export INSTALL_DIR := $(CURDIR)/debian/bond-cni/ diff --git a/kubernetes/cni/plugins/debian/deb_folder/changelog b/kubernetes/cni/plugins/debian/deb_folder/changelog index 93cfbf527..194555d83 100644 --- a/kubernetes/cni/plugins/debian/deb_folder/changelog +++ b/kubernetes/cni/plugins/debian/deb_folder/changelog @@ -1,3 +1,10 @@ +golang-github-containernetworking-plugins (1.3.0) unstable; urgency=medium + + * Updated golang to 1.18 + + -- Mohammad Issa Tue, 20 Feb 2024 15:26:40 -0400 + + golang-github-containernetworking-plugins (1.3.0) unstable; urgency=medium * Updated for stx debian packaging diff --git a/kubernetes/cni/plugins/debian/deb_folder/control b/kubernetes/cni/plugins/debian/deb_folder/control index 7d134a7e2..a1daec9fd 100644 --- a/kubernetes/cni/plugins/debian/deb_folder/control +++ b/kubernetes/cni/plugins/debian/deb_folder/control @@ -5,7 +5,7 @@ Standards-Version: 4.6.1 Maintainer: StarlingX Developers Build-Depends: debhelper-compat (= 13), dh-golang, - golang-1.17, + golang-1.18, golang-dbus-dev (>= 5.0.2~), golang-github-alexflint-go-filemutex-dev, golang-github-appc-cni-dev (>= 1.0.1~), diff --git a/kubernetes/cni/plugins/debian/deb_folder/rules b/kubernetes/cni/plugins/debian/deb_folder/rules index 3cb7f2c57..322fcff4a 100644 --- a/kubernetes/cni/plugins/debian/deb_folder/rules +++ b/kubernetes/cni/plugins/debian/deb_folder/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export PATH := /usr/lib/go-1.17/bin:$(PATH) +export PATH := /usr/lib/go-1.18/bin:$(PATH) export DH_VERBOSE := 1 export DH_GOLANG_GO_GENERATE := 1 export INSTALL_DIR := $(CURDIR)/debian/plugins