Hello community, here is the log from the commit of package cri-o for openSUSE:Factory checked in at 2019-04-22 12:23:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cri-o (Old) and /work/SRC/openSUSE:Factory/.cri-o.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cri-o" Mon Apr 22 12:23:27 2019 rev:28 rq:695815 version:1.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes 2019-04-15 11:51:39.070524746 +0200 +++ /work/SRC/openSUSE:Factory/.cri-o.new.5536/cri-o.changes 2019-04-22 12:23:30.404891835 +0200 @@ -1,0 +2,7 @@ +Thu Apr 18 16:45:33 UTC 2019 - Michal Rostecki <[email protected]> + +- Use /opt/cni/bin as the additional directory where cri-o is going + to look up for CNI plugins installed by DaemonSets running on + Kubernetes (i.e. Cilium). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cri-o.spec ++++++ --- /var/tmp/diff_new_pack.mnOAJq/_old 2019-04-22 12:23:32.048893108 +0200 +++ /var/tmp/diff_new_pack.mnOAJq/_new 2019-04-22 12:23:32.052893111 +0200 @@ -144,6 +144,9 @@ %post %service_add_post %{name_source1} +# This is the additional directory where cri-o is going to look up for CNI +# plugins installed by DaemonSets running on Kubernetes (i.e. Cilium). +mkdir -p /opt/cni/bin %post kubeadm-criconfig %fillup_only -n kubelet ++++++ crio.conf ++++++ --- /var/tmp/diff_new_pack.mnOAJq/_old 2019-04-22 12:23:32.088893139 +0200 +++ /var/tmp/diff_new_pack.mnOAJq/_new 2019-04-22 12:23:32.092893142 +0200 @@ -251,4 +251,4 @@ network_dir = "/etc/cni/net.d/" # Path to directory where CNI plugin binaries are located. -plugin_dir = ["/usr/lib/cni"] +plugin_dir = ["/usr/lib/cni", "/opt/cni/bin"]
