pool/cni
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1189176 from home:dancermak:branches:devel:microos

Browse Source 
new upstream release 1.2.3

OBS-URL: https://build.opensuse.org/request/show/1189176
OBS-URL: https://build.opensuse.org/package/show/devel:microos/cni?expand=0&rev=17
This commit is contained in:
Fabian Vogt 2024-07-23 07:05:43 +00:00 committed by Git OBS Bridge
commit ca0a9eee78
11 changed files with 508 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

4
99-loopback.conf Normal file
View File

@ -0,0 +1,4 @@
{
"cniVersion": "0.4.0",
"type": "loopback"
}

19
_service Normal file
View File

@ -0,0 +1,19 @@
<services>
<service name="obs_scm" mode="manual">
<param name="url">https://github.com/containernetworking/cni.git</param>
<param name="scm">git</param>
<param name="revision">v1.2.3</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<!-- filter out spec-vN.M.O tags -->
<param name="match-tag">v*</param>
<param name="changesgenerate">enable</param>
</service>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">zst</param>
</service>
<service name="set_version" mode="manual" />
<service name="go_modules" mode="manual"/>
</services>

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/containernetworking/cni.git</param>
<param name="changesrevision">309b6bbc17b2cd9eb9c26a46977ba1f1f5f032a4</param></service></servicedata>

3
cni-1.2.2.obscpio Normal file
View File

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

3
cni-1.2.3.obscpio Normal file
View File

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

346
cni.changes Normal file
View File

@ -0,0 +1,346 @@
-------------------------------------------------------------------
Tue Jul 23 06:33:24 UTC 2024 - dcermak@suse.com
- Update to version 1.2.3:
* libcni: set both GC valid attachment keys
* SPEC: use correct GC field name.
-------------------------------------------------------------------
Tue Jun 25 07:39:41 UTC 2024 - dcermak@suse.com
- Update to version 1.2.2:
* libcni: remove use of Masterminds/semver
-------------------------------------------------------------------
Thu Jun 20 12:53:53 UTC 2024 - dcermak@suse.com
- Update to version 1.2.1:
* SPEC: add warning about preserving shared resources for GC
* Fix faulty json.Marshal behavior for embeds types.NetConf
* libcni: implement disableGC
* Spec: add disableGC flag
* GetCachedAttachments should ignore missing directories
* libcni: always delete the cache on conflist for CNI DEL
* supplement ns building files for darwin os
-------------------------------------------------------------------
Tue Apr 16 13:27:50 UTC 2024 - Dan Čermák <dcermak@suse.com>
- Remove 0001-fix-upstream-CVE-2021-38561.patch, patch has been merged into
golang.org/x/text version 0.3.7, vendored bundle now contains 0.14.0
- Stop shipping development files DCO & CONTRIBUTING.md
- New upstream release 1.2.0 with spec 1.1.0:
* GC verb
* STATUS verb
* Version negotiation
-------------------------------------------------------------------
Mon Oct 9 09:40:04 UTC 2023 - Dan Čermák <dcermak@suse.com>
- Bump BuildRequired golang version to >= 1.21, fixes bsc#1216006
-------------------------------------------------------------------
Fri Dec 30 11:08:28 UTC 2022 - Andrea Manzini <andrea.manzini@suse.com>
- added patch 0001-fix-upstream-CVE-2021-38561.patch for [bsc#1206711]
-------------------------------------------------------------------
Thu Dec 29 14:06:02 UTC 2022 - andrea.manzini@suse.com
- Update to version 1.1.2:
* Fix successfully unmarshalled nil raw result
* spec: fix format
* invoke: if Result CNIVersion is empty use netconf CNIVersion
* cnitool: address golint error
* libcni: handle empty version when parsing version
* Switch to ginkgo/v2
* add security heading to README
* Maintainers: add Mike Zappa
* introduce hybridnet to thrid-party plugins
* Fix incorrect pointer inputs to `json.Unmarshal`
* fix version of cni v0.8.1 does not have a directory of github.com/containernetworking/cni/pkg/types/100 refer to https://github.com/containernetworking/cni/tree/v0.8.1/pkg/types
* Spec: Container runtime shall tear down namespaces
* Update README.md
* Updated README.md to include Netlox loxilight CNI
* documentation: update Multus link in README.md to point to the k8snetworkplumbingwg repository
* [exec-plugins]: support plugin lists
* skel: remove superfluous err nil check in (*dispatcher).pluginMain
* Remove Gabe Rosenhouse as maintainer
* skel: print out CNI versions supported in help text.
-------------------------------------------------------------------
Thu Nov 10 14:06:19 UTC 2022 - Andrea Manzini <andrea.manzini@suse.com>
- Update to version 1.1.2:
* spec: fix format
* libcni: handle empty version when parsing version
* [exec-plugins]: support plugin lists
This is a minor update to the CNI libraries and tooling.
This does not bump the protocol / spec version, which remains at v1.0.0
-------------------------------------------------------------------
Fri Mar 26 11:05:40 UTC 2022 - Enrico Belleri <idesmi@protonmail.com>
- Update to version v1.0.1:
* Rewritten spec
+ non-List configurations are removed
+ the version field in the interfaces array was redundant and
is removed
* libcni improvements
- Employ RPM macros.go where feasible
- Use vendor tarball
- Remove ./build.sh
-------------------------------------------------------------------
Mon May 31 10:38:40 UTC 2021 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 0.8.1:
* This is a security release that fixes a single bug: bsc#1181961 aka CVE-2021-20206
- Tighten up plugin-finding logic (#811).
-------------------------------------------------------------------
Sat Apr 24 09:19:04 UTC 2021 - Dirk Müller <dmueller@suse.com>
- use buildmode=pie (cnitool is installed into sbindir)
-------------------------------------------------------------------
Tue Mar 16 05:16:27 UTC 2021 - Jeff Kowalczyk <jkowalczyk@suse.com>
- Set GO111MODULE=auto to build with go1.16+
* Default changed to GO111MODULE=on in go1.16
* Set temporarily until using upstream release with go.mod
* Drop BuildRequires: golang-packaging not currently using macros
* Add BuildRequires: golang(API) >= 1.13 recommended dependency expression
-------------------------------------------------------------------
Thu Oct 1 12:47:37 UTC 2020 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 0.8.0:
* Specification and Conventions changes
+ docs: add ips and mac to well-known capabilities
+ add interface name validation
+ Add GUID to well known Capabilities
+ Add DeviceID attribute to RuntimeConfig
+ Typo fixes for infiniband GUID
+ Fix linting issues in docs, add headers to json example, update errors into table
* Documentation changes
+ Update cnitool docs
+ Remove extra ',' chars which makes conflist examples invalid.
* libcni changes
+ Remove Result.String method
+ libcni: add config caching [v2]
+ clean up : fix staticcheck warnings
+ libcni: add InitCNIConfigWithCacheDir() and deprecate RuntimeConfig.CacheDir
+ skel: clean up errors in skel and add some well-known error codes
+ libcni: find plugin in exec
+ validate containerID and networkName
+ skel: remove needless functions and types
+ libcni: also cache IfName
+ libcni: fix cache file 'result' key name
+ Bump Go version to 1.13
+ When CNI version isn't supplied in config, use default.
+ intercept netplugin std error
+ invoke: capture and return stderr if plugin exits unexpectedly
+ Retry exec commands on text file busy
-------------------------------------------------------------------
Mon Jan 13 10:32:53 UTC 2020 - Sascha Grunert <sgrunert@suse.com>
- Set correct CNI version for 99-loopback.conf
-------------------------------------------------------------------
Tue Jul 16 07:36:57 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 0.7.1 (bsc#1160460):
* Library changes:
+ invoke : ensure custom envs of CNIArgs are prepended to process envs
+ add GetNetworkListCachedResult to CNI interface
+ delegate : allow delegation funcs override CNI_COMMAND env automatically in heritance
* Documentation & Convention changes:
+ Update cnitool documentation for spec v0.4.0
+ Add cni-route-override to CNI plugin list
* Build and test changes:
+ Release: bump go to v1.12
-------------------------------------------------------------------
Fri May 17 12:26:06 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 0.7.0:
* Spec changes:
+ Use more RFC2119 style language in specification (must, should...)
+ add notes about ADD/DEL ordering
+ Make the container ID required and unique.
+ remove the version parameter from ADD and DEL commands.
+ Network interface name matters
+ be explicit about optional and required structure members
+ add CHECK method
+ Add a well-known error for "try again"
+ SPEC.md: clarify meaning of 'routes'
* Library changes:
+ pkg/types: Makes IPAM concrete type
+ libcni: return error if Type is empty
+ skel: VERSION shouldn't block on stdin
+ non-pointer instances of types.Route now correctly marshal to JSON
+ libcni: add ValidateNetwork and ValidateNetworkList functions
+ pkg/skel: return error if JSON config has no network name
+ skel: add support for plugin version string
+ libcni: make exec handling an interface for better downstream testing
+ libcni: api now takes a Context to allow operations to be timed out or cancelled
+ types/version: add helper to parse PrevResult
+ skel: only print about message, not errors
+ skel,invoke,libcni: implementation of CHECK method
+ cnitool: Honor interface name supplied via CNI_IFNAME environment variable.
+ cnitool: validate correct number of args
+ Don't copy gw from IP4.Gateway to Route.GW When converting from 0.2.0
+ add PrintTo method to Result interface
+ Return a better error when the plugin returns none
- Install sleep binary into CNI plugin directory
- Restore build.sh script which was removed upstream
-------------------------------------------------------------------
Tue Jun 5 08:21:05 UTC 2018 - dcassany@suse.com
- Refactor %license usage to a simpler form
-------------------------------------------------------------------
Mon Jun 4 11:27:31 UTC 2018 - dcassany@suse.com
- Make use of %license macro
-------------------------------------------------------------------
Wed Apr 4 11:32:32 UTC 2018 - jmassaguerpla@suse.com
- Remove creating subvolumes. This should be in another package (kubernetes-kubelet)
-------------------------------------------------------------------
Mon Jan 29 11:12:16 UTC 2018 - kmacinnes@suse.com
- Use full/absolute path for mksubvolume
- Change snapper Requires to a Requires(post)
-------------------------------------------------------------------
Thu Jan 18 14:46:16 UTC 2018 - kmacinnes@suse.com
- Add snapper as a requirement, to provide mksubvolume
-------------------------------------------------------------------
Mon Jan 15 16:58:15 UTC 2018 - alvaro.saurin@suse.com
- Make /var/lib/cni writable
-------------------------------------------------------------------
Tue Dec 19 13:04:22 UTC 2017 - alvaro.saurin@suse.com
- Remove the dependency with the cni-plugins
- Recommend the cni-plugins
-------------------------------------------------------------------
Mon Aug 28 15:15:11 UTC 2017 - opensuse-packaging@opensuse.org
- Update to version 0.6.0:
* Conventions: add convention around chaining interfaces
* pkg/types: safer typecasting for TextUnmarshaler when loading args
* pkg/types: modify LoadArgs to return a named error when an unmarshalable condition is detected
* Update note about next Community Sync, 2017-06-21
* types: fix marshalling of omitted "interfaces" key in IPConfig JSON
* Update and document release process
* scripts/release.sh: Add in s390x architecture
* cnitool: add support for CNI_ARGS
* README plugins list: add Linen CNI plugin
-------------------------------------------------------------------
Mon Apr 10 12:23:00 UTC 2017 - opensuse-packaging@opensuse.org
- Update to version 0.5.2:
* Rename build script to avoid conflict with bazel
* Enable s390x build
* Update community sync detail
* Added entry for CNI-Genie
* travis: shift forward to Go 1.8 and 1.7
* spec/plugins: fix 'ip'->'ips' in the spec, bump to 0.3.1
* libcni: Improved error messages.
* libcni: Fixed tests that were checking error strings.
* Documentation: Added documentation for `cnitool`.
-------------------------------------------------------------------
Thu Mar 23 10:20:35 UTC 2017 - opensuse-packaging@opensuse.org
- Update to version 0.5.1:
* readme.md: Add link to community sync
* pkg/ip: do not leak types from vendored netlink package
* pkg/ip: SetupVeth returns net.Interface
* pkg/ip: improve docstring for SetupVeth
* Added Romana to list of CNI providers...
* plugins/meta/flannel: If net config is missing do not return err on DEL
* plugins/*: Don't error if the device doesn't exist
-------------------------------------------------------------------
Wed Mar 22 15:35:19 UTC 2017 - alvaro.saurin@suse.com
- Update to version 0.5.0:
* Documentation: Add conventions doc
* noop: allow specifying debug file in config JSON
* Spec/Conventions: Update to include plugin config
* spec: add network configuration list specification
* api,libcni: add network config list-based plugin chaining
* Update CONVENTIONS.md
* skel: adds PluginMainWithError which returns a *types.Error
* testutils: pass netConf in for version operations; pass raw result out for tests
* types: make Result an interface and move existing Result to separate package
* macvlan/ipvlan: use common RenameLink method
* plugins/flannel: organize test JSON alphabetically
* pkg/ipam: add testcases
* spec/plugins: return interface details and multiple IP addresses to runtime
* spec, libcni, pkg/invoke: Use OS-agnostic separator when parsing CNI_PATH
* pkg/utils/sysctl/sysctl_linux.go: fix build tag.
* pkg/utils/sysctl/sysctl_linux.go: fix typo.
* invoke: Enable plugin file names with extensions
* CONVENTIONS.md: Update details on port-mappings
* Update with feedback
* More markups
* spec: Remove `routes` from Network Configuration
* docs: consolidate host-local documentation
* pkg/ns: refactored so that builds succeed on non-linux platforms
* Fix grammar
* plugins/main/ptp: set the Sandbox property on the response
* README: List multus as 3rd party plugin
* Replace Michael Bridgen with Bryan Boreham
* pkg/ns, pkg/types: refactored non linux build fix code to
* pkg/ip: refactored so that builds succeed on non-linux platforms
* vendor: Update vishvanana/netlink dependency
* libcni: up-convert a Config to a ConfigList when no other configs are found.
* docs: CNI versioning for 0.3.0 upgrade
* docs: Edits to v0.3.0 upgrade guidance
* docs: minor improvements to 0.3.0 upgrade guidance
* docs: add small upgrade instructions
* docs: minor improvements to spec-upgrades
* docs: fill-out and correct version conversion table
* docs: table formatting is hard
* pkg/testutils: return errors after restoring stdout
* pkg/types: misc current types testcase cleanups
* Minor rewording about default config version
* spec,libcni: add support for injecting runtimeConfig into plugin stdin data
* Check n.IPAM before use it in LoadIPAMConfig function
* do not error if last_reserved_ip is missing for host local ipam
* add test for ensuring initial subnet creation does not contain an error
* fix unrelated failing tests
-------------------------------------------------------------------
Wed Mar 01 08:52:47 UTC 2017 - opensuse-packaging@opensuse.org
- Update to version 0.4.0:
* plugins/noop: return a helpful message for test authors
* host-local: trim whitespace from container IDs and disk file contents
* travis: roll forward the versions of Go that we test
* MAINTAINERS: hi CaseyC!
* ipam/host-local: Move allocator and config to backend
* ipam/host-local: add ResolvConf argument for DNS configuration
* spec: notice of version
-------------------------------------------------------------------
Thu Feb 23 12:17:48 UTC 2017 - alvaro.saurin@suse.com
- Initial version

4
cni.obsinfo Normal file
View File

@ -0,0 +1,4 @@
name: cni
version: 1.2.3
mtime: 1721661034
commit: 309b6bbc17b2cd9eb9c26a46977ba1f1f5f032a4

98
cni.spec Normal file
View File

@ -0,0 +1,98 @@
#
# spec file for package cni
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%global provider_prefix github.com/containernetworking/cni
%global import_path %{provider_prefix}
%define cni_etc_dir %{_sysconfdir}/cni
%define cni_bin_dir %{_libexecdir}/cni
%define cni_doc_dir %{_docdir}/cni
Name: cni
Version: 1.2.3
Release: 0
Summary: Container Network Interface - networking for Linux containers
License: Apache-2.0
Group: System/Management
URL: https://github.com/containernetworking/cni
Source0: %{name}-%{version}.tar.zst
Source1: 99-loopback.conf
Source2: vendor.tar.gz
BuildRequires: golang-packaging
BuildRequires: shadow
BuildRequires: systemd-rpm-macros
BuildRequires: golang(API) >= 1.21
BuildRequires: zstd
Requires(post): %fillup_prereq
Recommends: cni-plugins
%{?systemd_requires}
%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. CNI concerns itself only with network
connectivity of containers and removing allocated resources when
the container is deleted. Because of this focus, CNI has a wide
range of support and the specification is simple to implement.
%prep
%autosetup -a2
%build
export GOFLAGS=-mod=vendor
%goprep %{import_path}
%gobuild libcni
%gobuild cnitool
for d in plugins/test/*; do
if [ -d $d ]; then
%gobuild $d
fi
done
%install
# install the plugins
install -m 755 -d %{buildroot}%{cni_bin_dir}
install -D %{_builddir}/go/bin/noop %{buildroot}%{cni_bin_dir}/
install -D %{_builddir}/go/bin/sleep %{buildroot}%{cni_bin_dir}/
# undo a copy: cnitool must go to sbin/
install -m 755 -d %{buildroot}%{_sbindir}
install -D %{_builddir}/go/bin/cnitool %{buildroot}%{_sbindir}/
# config
install -m 755 -d %{buildroot}%{cni_etc_dir}
install -m 755 -d %{buildroot}%{cni_etc_dir}/net.d
install -D -p -m 0644 %{SOURCE1} %{buildroot}%{cni_etc_dir}/net.d/99-loopback.conf.sample
# documentation
install -m 755 -d "%{buildroot}%{cni_doc_dir}"
%post
%{fillup_only -n %{name}}
%files
%doc README.md
%license LICENSE
%dir %{cni_etc_dir}
%dir %{cni_etc_dir}/net.d
%config %{cni_etc_dir}/net.d/*
%dir %{cni_bin_dir}
%dir %{cni_doc_dir}
%{cni_bin_dir}/{noop,sleep}
%{_sbindir}/cnitool
%changelog

3
vendor.tar.gz Normal file
View File

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