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

Accepting request 743846 from devel:kubic

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/743846
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/flannel?expand=0&rev=18
This commit is contained in:
Dominique Leuenberger 2019-11-03 09:55:51 +00:00 committed by Git OBS Bridge
commit ba53e49929
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flannel.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 29 13:30:38 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Use Tumbleweed Kubic flannel containers instead of devel:kubic
containers. This fixes aarch64 and ppc64* (boo#1152185)
-------------------------------------------------------------------
Fri Oct 11 07:46:20 UTC 2019 - Fabian Vogt <fvogt@suse.com>

5
flannel.spec
View File

@ -20,6 +20,9 @@
%define _fillupdir /var/adm/fillup-templates
%endif
# Use Tumbleweed Kubic containers
%define flannel_container_path registry.opensuse.org/kubic/flannel
Name: flannel
Version: 0.11.0
Release: 0
@ -84,7 +87,7 @@ rm -rf %{buildroot}/%{_libdir}/go/contrib
mkdir -p %{buildroot}%{_datadir}/k8s-yaml/flannel
#install -m 0644 Documentation/kube-flannel.yml %{buildroot}%{_datadir}/k8s-yaml/flannel/kube-flannel.yaml
install -m 0644 %{SOURCE1} %{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|image: quay.io/coreos/flannel:.*|image: %{flannel_container_path}:%{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