Hello community, here is the log from the commit of package flannel for openSUSE:Factory checked in at 2019-06-06 18:19:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flannel (Old) and /work/SRC/openSUSE:Factory/.flannel.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "flannel" Thu Jun 6 18:19:46 2019 rev:14 rq:708156 version:0.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/flannel/flannel.changes 2018-12-28 12:34:00.136018704 +0100 +++ /work/SRC/openSUSE:Factory/.flannel.new.4811/flannel.changes 2019-06-06 18:19:46.876642825 +0200 @@ -1,0 +2,24 @@ +Thu Jun 6 15:57:32 CEST 2019 - [email protected] + +- Fix path of flanneld in yaml file +- Cleanup filelist + +------------------------------------------------------------------- +Tue Apr 9 11:45:05 CEST 2019 - [email protected] + +- Require minimal set of used network utilities + +------------------------------------------------------------------- +Mon Apr 8 13:56:16 CEST 2019 - [email protected] + +- Add flannel-k8s-yaml sub-package with the yaml file to deploy + flannel. + +------------------------------------------------------------------- +Mon Apr 8 13:24:07 CEST 2019 - [email protected] + +- Update to flannel 0.11.0 +- Drop standalone support, it's only for containers +- Drop use-32-prefix-udp-backend.patch, included upstream + +------------------------------------------------------------------- Old: ---- _constraints _service flannel-0.9.1.tar.xz flannel-docker.conf flannel-tmpfiles.conf flanneld.service flanneld.sysconf use-32-prefix-udp-backend.patch New: ---- flannel-0.11.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flannel.spec ++++++ --- /var/tmp/diff_new_pack.ApKDYK/_old 2019-06-06 18:19:47.644642599 +0200 +++ /var/tmp/diff_new_pack.ApKDYK/_new 2019-06-06 18:19:47.644642599 +0200 @@ -1,7 +1,7 @@ # # spec file for package flannel # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017, 2019 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 @@ -15,37 +15,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir /var/adm/fillup-templates %endif Name: flannel -Version: 0.9.1 +Version: 0.11.0 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 -Patch1: use-32-prefix-udp-backend.patch +Source: %{name}-%{version}.tar.gz +Requires: iproute2 +# arp is used: +Requires: net-tools-deprecated +Requires: iptables BuildRequires: golang-packaging -BuildRequires: systemd -BuildRequires: xz BuildRequires: golang(API) >= 1.11 # go1.11.3 contains sec. fixes bsc#1118897(CVE-2018-16873) bsc#1118897(CVE-2018-16873) bsc#1118899(CVE-2018-16875) BuildRequires: go1.11 >= 1.11.3 -Requires(post): %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 %{go_nostrip} %{go_provides} -%{?systemd_requires} %description flannel is a virtual network that gives a subnet to each host for use with @@ -55,9 +49,26 @@ unique, routable IP inside the cluster. The advantage of this model is that it reduces the complexity of doing port mapping. +This package contains the binary to be included into a container image + +%package k8s-yaml +Summary: Kubernetes yaml file to run flannel container +Group: System/Management +BuildArch: noarch + +%description k8s-yaml +This package contains the yaml file requried to download and run the +flannel container in a kubernetes cluster. + +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 -%patch1 -p1 %build gofmt -w -r "x -> \"%{version}\"" version/version.go @@ -68,56 +79,25 @@ %{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}%{_fillupdir}/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 +# Install provided yaml file to download and run the flannel container +mkdir -p %{buildroot}%{_datadir}/k8s-yaml/flannel +install -m 0644 Documentation/kube-flannel.yml %{buildroot}%{_datadir}/k8s-yaml/flannel/kube-flannel.yaml +sed -i -e 's|image: quay.io/coreos/flannel:.*|image: registry.opensuse.org/devel/kubic/containers/container/kubic/flannel:%{version}|g' %{buildroot}%{_datadir}/k8s-yaml/flannel/kube-flannel.yaml +sed -i -e 's|/opt/bin/flanneld|/usr/sbin/flanneld|g' %{buildroot}%{_datadir}/k8s-yaml/flannel/kube-flannel.yaml # Move +mkdir -p %{buildroot}%{_sbindir} 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 DCO NOTICE +%doc README.md DCO NOTICE %license LICENSE %{_sbindir}/flanneld -# Service -%dir %{_unitdir}/docker.service.d -%{_unitdir}/docker.service.d/flannel.conf -%{_unitdir}/flanneld.service -%{_sbindir}/rcflanneld - -# Sysconfig -%{_fillupdir}/sysconfig.flanneld -%{_tmpfilesdir}/%{name}.conf -%attr(0750,root,root) %dir %ghost %{_rundir}/%{name} - -# Additional -%dir %{_libexecdir}/flannel -%{_libexecdir}/flannel/mk-docker-opts.sh +%files k8s-yaml +%dir %{_datarootdir}/k8s-yaml +%dir %{_datarootdir}/k8s-yaml/flannel +%{_datarootdir}/k8s-yaml/flannel/kube-flannel.yaml %changelog
