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

Accepting request 708155 from home:kukuk:container

Browse Source 
- Fix path of flanneld in yaml file
- Cleanup filelist

OBS-URL: https://build.opensuse.org/request/show/708155
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/flannel?expand=0&rev=2
This commit is contained in:
Richard Brown 2019-06-06 14:01:48 +00:00 committed by Git OBS Bridge
parent 9c2ff41790
commit b57915f47b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flannel.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 6 15:57:32 CEST 2019 - kukuk@suse.de
- Fix path of flanneld in yaml file
- Cleanup filelist
-------------------------------------------------------------------
Tue Apr 9 11:45:05 CEST 2019 - kukuk@suse.de

10
flannel.spec
View File

@ -82,10 +82,8 @@ rm -rf %{buildroot}/%{_libdir}/go/contrib
# 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/home/kukuk/container/container/kubic/flannel:%{version}|g' %{buildroot}%{_datadir}/k8s-yaml/flannel/kube-flannel.yaml
# Additional
install -D -p -m 0755 dist/mk-docker-opts.sh %{buildroot}%{_libexecdir}/flannel/mk-docker-opts.sh
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}
@ -97,10 +95,6 @@ mv %{buildroot}%{_bindir}/flannel %{buildroot}%{_sbindir}/flanneld
%license LICENSE
%{_sbindir}/flanneld
# Additional
%dir %{_libexecdir}/flannel
%{_libexecdir}/flannel/mk-docker-opts.sh
%files k8s-yaml
%dir %{_datarootdir}/k8s-yaml
%dir %{_datarootdir}/k8s-yaml/flannel