commit 906c5fb0f5795cb3dc7149697cb44b42fcb4db80ad8cafe4ffed9d4e1d402f17 Author: Dominique Leuenberger Date: Sat Jan 21 23:27:07 2017 +0000 Accepting request 446428 from Virtualization:containers new package OBS-URL: https://build.opensuse.org/request/show/446428 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/flannel?expand=0&rev=1 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/_constraints b/_constraints new file mode 100644 index 0000000..a6a4866 --- /dev/null +++ b/_constraints @@ -0,0 +1,7 @@ + + + + 6 + + + diff --git a/_service b/_service new file mode 100644 index 0000000..ec1b3f0 --- /dev/null +++ b/_service @@ -0,0 +1,16 @@ + + + git + git@github.com:coreos/flannel.git + .git + flannel + 0.6.1 + v0.6.1 + enable + + + *.tar + xz + + + diff --git a/flannel-0.6.1.tar.xz b/flannel-0.6.1.tar.xz new file mode 100644 index 0000000..aa31cb2 --- /dev/null +++ b/flannel-0.6.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cc2b086001571b93a0b02aa4cba54dd4293b60dc68417e61c09b7f42c345bf8 +size 5437340 diff --git a/flannel-docker.conf b/flannel-docker.conf new file mode 100644 index 0000000..839d473 --- /dev/null +++ b/flannel-docker.conf @@ -0,0 +1,2 @@ +[Service] +EnvironmentFile=-/run/flannel/docker diff --git a/flannel-tmpfiles.conf b/flannel-tmpfiles.conf new file mode 100644 index 0000000..02ace2f --- /dev/null +++ b/flannel-tmpfiles.conf @@ -0,0 +1 @@ +d /run/flannel 0755 root root - diff --git a/flannel.changes b/flannel.changes new file mode 100644 index 0000000..e9045d4 --- /dev/null +++ b/flannel.changes @@ -0,0 +1,70 @@ +------------------------------------------------------------------- +Wed Sep 14 10:10:05 UTC 2016 - opensuse-packaging@opensuse.org + +- Update to version 0.6.1: + * Support quorum read option + * deps: Update go-iptables version + * mk-docker-opts.sh: replace with busybox shell compatible version + * BUILDS: Overhaul build process + * vxlan: error on sysctl fail + * Fix a typo in format error. + * Makefile: Disable static builds of flanneld + * Makefile: Make the ARCH part of the tag name not the image name + * Builds: Insert libpthread into busybox images + * Support VXLAN GBP + * Add cli args for etcd basic auth + * Add reservations to admin control subnet allocs + * Ability to revoke lease + * small docs changes + * overhaul of the build system + * improvements to stability and UX tweaks + * refactoring mainly driven by reservation support + +------------------------------------------------------------------- +Fri Jul 15 15:45:36 UTC 2016 - kstreitova@suse.com + +- clean specfile by spec-cleaner +- change 'PreReq: %fillup_prereq' to 'Requires(post)' + +------------------------------------------------------------------- +Thu Jul 7 11:37:03 UTC 2016 - tboerger@suse.com + +- Dropped rpmlintrc +- Refactoring of the spec based on golang-packaging + +------------------------------------------------------------------- +Wed Jul 6 14:12:51 UTC 2016 - msabate@suse.com + +- Added go_provides + +------------------------------------------------------------------- +Wed Jul 6 13:24:52 UTC 2016 - msabate@suse.com + +- Removed kernel-devel build requirement + +I've also added golang-packaging as a build requirement and we will be using +the %{go_nostrip} macro from that package. Moreover, I've done some minor +improvements here and there. + +------------------------------------------------------------------- +Tue Jul 5 09:27:54 UTC 2016 - cbrauner@suse.com + +- add %ghost instruction: Files that are put into /run should be generated on + the fly during runtime. To prevent them from getting installed we use + %ghost. + +------------------------------------------------------------------- +Tue Jul 5 09:16:42 UTC 2016 - cbrauner@suse.com + +- add _constraints file to get more disk space on aarch64 + +------------------------------------------------------------------- +Tue Mar 22 14:35:36 UTC 2016 - fcastelli@suse.com + +- Fix issue inside of systemd unit file + +------------------------------------------------------------------- +Mon Mar 21 21:50:17 UTC 2016 - fcastelli@suse.com + +- First release v0.5.5 + diff --git a/flannel.spec b/flannel.spec new file mode 100644 index 0000000..91ea326 --- /dev/null +++ b/flannel.spec @@ -0,0 +1,110 @@ +# +# spec file for package flannel +# +# 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/ +# + + +Name: flannel +Version: 0.6.1 +Release: 0 +Summary: An etcd backed network fabric for containers +License: Apache-2.0 +Group: System/Management +Url: https://github.com/coreos/flannel +Source: %{name}-%{version}.tar.xz +Source1: flanneld.sysconf +Source2: flanneld.service +Source3: flannel-docker.conf +Source4: flannel-tmpfiles.conf +BuildRequires: golang-packaging +BuildRequires: systemd +BuildRequires: xz +Requires(post): %fillup_prereq +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{go_nostrip} +%{go_provides} +%{?systemd_requires} + +%description +flannel is a virtual network that gives a subnet to each host for use with +container runtimes. + +Platforms like Google's Kubernetes assume that each container (pod) has a +unique, routable IP inside the cluster. The advantage of this model is that it +reduces the complexity of doing port mapping. + +%prep +%setup -q + +%build +%{goprep} github.com/coreos/flannel +%{gobuild} + +%install +%{goinstall} +rm -rf %{buildroot}/%{_libdir}/go/contrib + +# Service +install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/docker.service.d/flannel.conf + +install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/flanneld.service +install -d %{buildroot}/%{_sbindir} +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcflanneld + +# Sysconfig +install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.flanneld +install -D -p -m 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf + +# Additional +install -D -p -m 0755 dist/mk-docker-opts.sh %{buildroot}%{_libexecdir}/flannel/mk-docker-opts.sh + +# Move +mv %{buildroot}%{_bindir}/flannel %{buildroot}%{_sbindir}/flanneld + +%pre +%service_add_pre flanneld.service + +%post +%service_add_post flanneld.service +%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf +%{fillup_only -n flanneld} + +%preun +%service_del_preun flanneld.service + +%postun +%service_del_postun flanneld.service + +%files +%defattr(-,root,root) +%doc CONTRIBUTING.md README.md LICENSE DCO NOTICE +%{_sbindir}/flanneld + +# Service +%dir %{_unitdir}/docker.service.d +%{_unitdir}/docker.service.d/flannel.conf +%{_unitdir}/flanneld.service +%{_sbindir}/rcflanneld + +# Sysconfig +%{_localstatedir}/adm/fillup-templates/sysconfig.flanneld +%{_tmpfilesdir}/%{name}.conf +%attr(0750,root,root) %dir %ghost %{_rundir}/%{name} + +# Additional +%dir %{_libexecdir}/flannel +%{_libexecdir}/flannel/mk-docker-opts.sh + +%changelog diff --git a/flanneld.service b/flanneld.service new file mode 100644 index 0000000..52534ad --- /dev/null +++ b/flanneld.service @@ -0,0 +1,19 @@ +[Unit] +Description=Flanneld overlay address etcd agent +After=network.target +After=network-online.target +Wants=network-online.target +After=etcd.service +Before=docker.service + +[Service] +Type=notify +EnvironmentFile=/etc/sysconfig/flanneld +EnvironmentFile=-/etc/sysconfig/docker-network +ExecStart=/usr/sbin/flanneld -etcd-endpoints=${FLANNEL_ETCD_ENDPOINTS} -etcd-prefix=${FLANNEL_ETCD_KEY} $FLANNEL_OPTIONS +ExecStartPost=/usr/lib/flannel/mk-docker-opts.sh -k DOCKER_NETWORK_OPTIONS -d /run/flannel/docker +Restart=on-failure + +[Install] +WantedBy=multi-user.target +RequiredBy=docker.service diff --git a/flanneld.sysconf b/flanneld.sysconf new file mode 100644 index 0000000..43f4e66 --- /dev/null +++ b/flanneld.sysconf @@ -0,0 +1,7 @@ +# Flanneld configuration options + +# etcd url location. Point this to the server where etcd runs +FLANNEL_ETCD_ENDPOINTS="http://127.0.0.1:2379" + +# Any additional options that you want to pass +#FLANNEL_OPTIONS=""