starlingx/integ
Code Issues Proposed changes

Merge "cni: use /var/opt/cni"

Browse Source
This commit is contained in:
Zuul 2022-06-16 22:34:45 +00:00 committed by Gerrit Code Review
commit 5bc6930b0f
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kubernetes/cni/bond-cni/centos/bond-cni.spec
View File

@ -58,8 +58,8 @@ echo "Building bond-cni plugin"
%gobuild -o "${PWD}/bin/bond" "${PWD}/bond/"
%install
install -d -p %{buildroot}/opt/cni/bin
install -p -m 0755 bin/* %{buildroot}/opt/cni/bin
install -d -p %{buildroot}/var/opt/cni/bin
install -p -m 0755 bin/* %{buildroot}/var/opt/cni/bin
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
@ -67,10 +67,12 @@ install -p -m 0755 bin/* %{buildroot}/opt/cni/bin
%files
%license LICENSE
%doc *.md
%dir /opt/cni/bin
/opt/cni/bin/*
%dir /var/opt/cni/bin
/var/opt/cni/bin/*
%changelog
* Mon Jun 06 2022 Dan Voiculeasa <dan.voiculeasa@windriver.com>
- Update install directory to /var/opt/cni/bin.
* Fri May 27 2022 Steven Webster <steven.webster@windriver.com>
- Update install directory to /opt/cni/bin.
* Fri Jan 21 2022 Steven Webster <steven.webster@windriver.com>

2
kubernetes/cni/bond-cni/debian/deb_folder/bond-cni.install
View File

@ -1 +1 @@
bond /opt/cni/bin/
bond /var/opt/cni/bin/

11
kubernetes/cni/plugins/centos/containernetworking-plugins.spec
View File

@ -77,8 +77,8 @@ for d in $PLUGINS; do
done
%install
install -d -p %{buildroot}/opt/cni/bin
install -p -m 0755 bin/* %{buildroot}/opt/cni/bin
install -d -p %{buildroot}/var/opt/cni/bin
install -p -m 0755 bin/* %{buildroot}/var/opt/cni/bin
%check
%if 0%{?with_check}
@ -119,10 +119,13 @@ install -p -m 0755 bin/* %{buildroot}/opt/cni/bin
%files
%license LICENSE
%doc *.md
%dir /opt/cni/bin
/opt/cni/bin/*
%dir /var/opt/cni/bin
/var/opt/cni/bin/*
%changelog
* Mon Jun 06 2022 Dan Voiculeasa <dan.voiculeasa@windriver.com>
- Update install directory to /var/opt/cni/bin.
* Thu Feb 17 2022 Steven Webster <steven.webster@windriver.com> - 1.0.1
- bump to v1.0.1

2
kubernetes/cni/plugins/debian/deb_folder/containernetworking-plugins.install
View File

@ -1 +1 @@
usr/bin/* opt/cni/bin
usr/bin/* /var/opt/cni/bin