Skip to content

Commit

Permalink
SPECS/cni-plugins: update to v1.3.0 and set version while building
Browse files Browse the repository at this point in the history
Refs microsoft#6339

Also move declarations around to satisfy linter.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>
  • Loading branch information
invidian committed Oct 11, 2023
1 parent 8cb5a43 commit 55383ee
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion SPECS/cni-plugins/cni-plugins.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"cni-plugins-0.9.1.tar.gz": "35e96c6c47b9d080d1cbdcfca02808b01a95464607cd2a2c971b3ad596285928"
"cni-plugins-1.3.0.tar.gz": "f9871b9f6ccb51d2b264532e96521e44f926928f91434b56ce135c95becf2901"
}
}
14 changes: 9 additions & 5 deletions SPECS/cni-plugins/cni-plugins.spec
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
%define _default_cni_plugins_dir /opt/cni/bin
Summary: Container Network Interface (CNI) plugins
Name: cni-plugins
Version: 0.9.1
Release: 14%{?dist}
Version: 1.3.0
Release: 1%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand All @@ -11,17 +10,18 @@ Group: Development/Tools
URL: https://github.com/containernetworking/plugins
#Source0: https://github.com/containernetworking/plugins/archive/v%{version}.tar.gz
Source0: %{name}-%{version}.tar.gz
%define _default_cni_plugins_dir /opt/cni/bin
BuildRequires: golang >= 1.5

Provides: kubernetes-cni

%description
The CNI (Container Network Interface) project consists of a specification and libraries for writing plugins to configure network interfaces in Linux containers, along with a number of supported plugins.

%prep
%setup -q -n plugins-%{version}

%build
./build_linux.sh
./build_linux.sh "-ldflags '-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=v%{version}'"

%install
install -vdm 755 %{buildroot}%{_default_cni_plugins_dir}
Expand All @@ -39,6 +39,10 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
%{_default_cni_plugins_dir}/*

%changelog
* Wed Oct 11 2023 Mateusz Gozdek <mgozdek@microsoft.com> - 1.3.0-1
- Make plugin binaries correctly print version
- Upgrade to version 1.3.0

* Mon Aug 07 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 0.9.1-14
- Bump release to rebuild with go 1.19.12

Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -1907,8 +1907,8 @@
"type": "other",
"other": {
"name": "cni-plugins",
"version": "0.9.1",
"downloadUrl": "https://github.com/containernetworking/plugins/archive/v0.9.1.tar.gz"
"version": "1.3.0",
"downloadUrl": "https://github.com/containernetworking/plugins/archive/v1.3.0.tar.gz"
}
}
},
Expand Down

0 comments on commit 55383ee

Please sign in to comment.