From e6fb9d7b0819442e5ea26ea99a2b43b0b1d2f11bba08a2d4e41295a6cf71dfe9 Mon Sep 17 00:00:00 2001 From: Maximilian Meister Date: Fri, 15 Sep 2017 11:54:21 +0000 Subject: [PATCH] osc copypac from project:Virtualization:containers package:cni revision:4 OBS-URL: https://build.opensuse.org/package/show/devel:CaaSP:Head:ControllerNode/cni?expand=0&rev=1 --- .gitattributes | 23 ++++++++++ .gitignore | 1 + 99-loopback.conf | 4 ++ _service | 18 ++++++++ cni-0.6.0.tar.xz | 3 ++ cni.changes | 109 +++++++++++++++++++++++++++++++++++++++++++++++ cni.spec | 91 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 249 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 99-loopback.conf create mode 100644 _service create mode 100644 cni-0.6.0.tar.xz create mode 100644 cni.changes create mode 100644 cni.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -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 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/99-loopback.conf b/99-loopback.conf new file mode 100644 index 0000000..a14adcf --- /dev/null +++ b/99-loopback.conf @@ -0,0 +1,4 @@ +{ + "cniVersion": "0.2.0", + "type": "loopback" +} diff --git a/_service b/_service new file mode 100644 index 0000000..132a398 --- /dev/null +++ b/_service @@ -0,0 +1,18 @@ + + + https://github.com/containernetworking/cni.git + git + cni + .git + 0.6.0 + v0.6.0 + enable + + + cni-*.tar + xz + + + cni + + diff --git a/cni-0.6.0.tar.xz b/cni-0.6.0.tar.xz new file mode 100644 index 0000000..8bc3700 --- /dev/null +++ b/cni-0.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7ed2bbdd4057f33b220ced885311246b6ee6b006e6ed6e96c30f76a11b85c1e +size 141940 diff --git a/cni.changes b/cni.changes new file mode 100644 index 0000000..d4e17f9 --- /dev/null +++ b/cni.changes @@ -0,0 +1,109 @@ +------------------------------------------------------------------- +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 + + diff --git a/cni.spec b/cni.spec new file mode 100644 index 0000000..7726c75 --- /dev/null +++ b/cni.spec @@ -0,0 +1,91 @@ +# +# spec file for package cni +# +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# +# 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 http://bugs.opensuse.org/ +# + +%define cni_etc_dir %{_sysconfdir}/cni +%define cni_bin_dir %{_libexecdir}/cni +%define cni_doc_dir %{_docdir}/cni + +Name: cni +Version: 0.6.0 +Release: 0 +Summary: Container Network Interface - networking for Linux containers +License: Apache-2.0 +Group: System/Management +Url: https://github.com/containernetworking/cni +Source: %{name}-%{version}.tar.xz +Source1: 99-loopback.conf +BuildRequires: golang-packaging +BuildRequires: shadow +BuildRequires: systemd-rpm-macros +BuildRequires: xz +Requires(post): %fillup_prereq +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} +# Make sure that the binary is not getting stripped. +%{go_nostrip} + +%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 +%setup -q + +%build +./build.sh + +%install + +# install the plugins +install -m 755 -d "%{buildroot}%{cni_bin_dir}" +cp bin/noop "%{buildroot}%{cni_bin_dir}/" + +# undo a copy: cnitool must go to sbin/ +install -m 755 -d "%{buildroot}%{_sbindir}" +cp 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 + +# documentation +install -m 755 -d "%{buildroot}%{cni_doc_dir}" +cp CONTRIBUTING.md README.md LICENSE DCO %{buildroot}%{cni_doc_dir}/ + +%post +%{fillup_only -n %{name}} + +%files +%defattr(-,root,root) +%doc CONTRIBUTING.md README.md LICENSE DCO +%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}/* +%{cni_etc_dir}/net.d/* +%{_sbindir}/cnitool + + +%changelog