[arch-commits] Commit in cri-o/trunk (PKGBUILD)

[David Runge]

    Date: Friday, December 11, 2020 @ 10:42:59
  Author: dvzrv
Revision: 773119

upgpkg: cri-o 1.19.0-7: Rebuild to add default CNI configuration.

Add the default CNI configuration for bridge and loopback setup (also to backup array).

Modified:
  cri-o/trunk/PKGBUILD

----------+
 PKGBUILD |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-11 09:58:02 UTC (rev 773118)
+++ PKGBUILD	2020-12-11 10:42:59 UTC (rev 773119)
@@ -3,7 +3,7 @@
 
 pkgname=cri-o
 pkgver=1.19.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Open Container Initiative-based implementation of Kubernetes Container Runtime Interface"
 arch=('x86_64')
 url="https://github.com/cri-o/cri-o"
@@ -14,7 +14,10 @@
 optdepends=('apparmor: for apparmor integration'
             'btrfs-progs: for btrfs support')
 provides=('container-runtime')
-backup=('etc/crio/crio.conf')
+backup=('etc/crio/crio.conf'
+        'etc/cni/net.d/100-crio-bridge.conf'
+        'etc/cni/net.d/199-crio-loopback.conf'
+)
 # configuration override and hook directories should exist
 options=('emptydirs')
 install="${pkgname}.install"
@@ -65,6 +68,9 @@
   cd "${pkgname}-${pkgver}"
   # makefile is mixing DESTDIR and PREFIX
   make install install.systemd DESTDIR="${pkgdir}" PREFIX="${pkgdir}/usr"
+  # install CNI configs
+  install -vDm 644 contrib/cni/10-crio-bridge.conf "${pkgdir}/etc/cni/net.d/100-crio-bridge.conf"
+  install -vDm 644 contrib/cni/99-loopback.conf "${pkgdir}/etc/cni/net.d/199-crio-loopback.conf"
   # modules
   install -vDm 644 "../modules-${pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/cri-o.conf"
   # sysctl