Accepting request 1226589 from devel:microos

OBS-URL: https://build.opensuse.org/request/show/1226589
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cni-plugins?expand=0&rev=23

_service

@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="filename">cni-plugins</param>
     <param name="exclude">.git</param>
-    <param name="revision">v1.5.1</param>
+    <param name="revision">v1.6.0</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="changesgenerate">enable</param>
     <param name="versionrewrite-pattern">v(.*)</param>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/containernetworking/plugins.git</param>
-              <param name="changesrevision">c29dc79f96cd50452a247a4591443d2aac033429</param></service></servicedata>
+              <param name="changesrevision">fec2d62676cbe4f2fd587b4840c7fc021bead3f9</param></service></servicedata>

cni-plugins-1.5.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:681a5c79b48c26ab74dac1a587de043583b8e9a16f22c0b49b024bb72abf936b
-size 2032368

cni-plugins-1.6.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a2ff0ca1528fc4cc0fdc242ce0de4276a256b8a4f0a1feb6b3bf1ac32ebd3811
+size 2045436

cni-plugins.changes

@@ -1,3 +1,48 @@
+-------------------------------------------------------------------
+Tue Oct 22 12:13:41 UTC 2024 - Alexandre Vicenzi <alexandre.vicenzi@suse.com>
+
+- Require iptables (bsc#1231424)
+  * Add cni-iptables.conf to load required kernel modules
+
+-------------------------------------------------------------------
+Tue Oct 22 05:29:37 UTC 2024 - madhankumar.chellamuthu@suse.com
+
+- Update to version 1.6.0:
+  * Pass status along ipam update
+  * feat(dhcp): Cancel backoff retry on stop
+  * fix(dhcp): can not renew an ip address
+  * build(deps): bump golang.org/x/sys in the golang group
+  * VRF: Wait for the local/host routes to be added
+  * add problem hint
+  * make test working again
+  * Revert "Merge pull request #921 from oOraph/dev/exclude_subnets_from_traffic_shapping2"
+  * resolve merge conflicts
+  * build(deps): bump the golang group across 1 directory with 2 updates
+  * host-device: use temp network namespace for rename
+  * Fix txqueuelen being accidentally set to zero
+  * Ignore link-local routes in SBR tests
+  * build(deps): bump the golang group with 3 updates
+  * ci, go.mod: bump to go 1.23 (#1094)
+  * dhcp: Add priority option to dhcp.
+  * .github: add check to verify vendor directory
+  * Add nftables backend to portmap
+  * Fix portmap unit tests
+  * Add a backend abstraction to the portmap plugin
+  * Add nftables implementation of ipmasq
+  * Vendor nftables library, add utils.SupportsIPTables and utils.SupportsNFTables
+  * Use of Scope for routes in IPAM
+  * SBR: option to pass the table id (#1088)
+  * Update containernetworking/cni to v1.2.3 for GC
+  * Update go-iptables
+  * macvlan: add bcqueuelen setting
+  * build(deps): bump the golang group across 1 directory with 4 updates
+  * build: update github.com/vishvananda/netlink to 1.3.0
+  * Fix unnecessary retrying when the link is down in dhcp.
+  * test: bump go version
+  * .github: fix double-triggering CI
+  * Change chown to change current dir as well
+  * build(deps): bump the golang group with 2 updates
+
 -------------------------------------------------------------------
 Mon Jun 17 15:56:20 UTC 2024 - Enrico Belleri <kilgore.trout@idesmi.eu>
 

cni-plugins.conf

@@ -0,0 +1,4 @@
+# A rootless user has no permsissions to load kernel modules.
+# CNI requires iptables.
+ip_tables
+ip6_tables

cni-plugins.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cni-plugins
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,18 +19,20 @@
 %define         cni_bin_dir  %{_libexecdir}/cni
 %define         cni_doc_dir  %{_docdir}/cni-plugins
 Name:           cni-plugins
-Version:        1.5.1
+Version:        1.6.0
 Release:        0
 Summary:        Container Network Interface plugins
 License:        Apache-2.0
 Group:          System/Management
 URL:            https://github.com/containernetworking/plugins
 Source:         %{name}-%{version}.tar.xz
+Source1:        %{name}.conf
 BuildRequires:  shadow
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  xz
 BuildRequires:  golang(API) >= 1.21
 Requires:       cni
+Requires:       iptables
 Requires(post): %fillup_prereq
 %{?systemd_requires}
 
@@ -61,6 +63,9 @@ export GOFLAGS="-buildmode=pie"
 install -m 755 -d "%{buildroot}%{cni_bin_dir}"
 cp bin/* "%{buildroot}%{cni_bin_dir}/"
 
+mkdir -p %{buildroot}%{_prefix}/lib/modules-load.d
+install -m 0644 -t %{buildroot}%{_prefix}/lib/modules-load.d/ %{SOURCE1}
+
 # documentation
 install -m 755 -d "%{buildroot}%{cni_doc_dir}"
 
@@ -79,6 +84,8 @@ install -m 755 -d "%{buildroot}%{cni_doc_dir}"
 %license LICENSE
 %dir %{cni_bin_dir}
 %{cni_bin_dir}/*
+%dir %{_prefix}/lib/modules-load.d
+%{_prefix}/lib/modules-load.d/%{name}.conf
 # %%{cni_doc_dir}/plugins/*
 
 %changelog