diff --git a/flannel.changes b/flannel.changes index d02bb16..2745401 100644 --- a/flannel.changes +++ b/flannel.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 29 13:30:38 UTC 2019 - Guillaume GARDET + +- 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 diff --git a/flannel.spec b/flannel.spec index 6603ac7..8fa237c 100644 --- a/flannel.spec +++ b/flannel.spec @@ -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