Hello community, here is the log from the commit of package cri-o for openSUSE:Factory checked in at 2020-01-13 22:15:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cri-o (Old) and /work/SRC/openSUSE:Factory/.cri-o.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cri-o" Mon Jan 13 22:15:43 2020 rev:41 rq:762851 version:1.16.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes 2019-12-02 11:34:56.586457253 +0100 +++ /work/SRC/openSUSE:Factory/.cri-o.new.6675/cri-o.changes 2020-01-13 22:16:31.310379008 +0100 @@ -1,0 +2,11 @@ +Fri Jan 10 13:40:13 UTC 2020 - Richard Brown <[email protected]> + +- Add prevent-local-loopback-teardown-rh1754154.patch to stop local loopback interfaces being torndown before cluster is bootstrapped + +------------------------------------------------------------------- +Tue Dec 17 08:51:58 UTC 2019 - [email protected] + +- Make cgroup-driver for kubelet be cgroupfs for SLE to be consistent + with the cri-o configuration + +------------------------------------------------------------------- New: ---- prevent-local-loopback-teardown-rh1754154.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cri-o.spec ++++++ --- /var/tmp/diff_new_pack.PbFi0b/_old 2020-01-13 22:16:34.394380438 +0100 +++ /var/tmp/diff_new_pack.PbFi0b/_new 2020-01-13 22:16:34.398380440 +0100 @@ -43,6 +43,7 @@ Source5: kubelet.env Source6: %{name_source4} Source7: %{name_source5} +Patch1: prevent-local-loopback-teardown-rh1754154.patch BuildRequires: device-mapper-devel BuildRequires: fdupes BuildRequires: glib2-devel-static @@ -90,11 +91,13 @@ %prep %setup -q +%patch1 -p1 %build # Keep cgroupfs as the default cgroup manager for SLE15 builds %if 0%{?sle_version} >= 150000 && !0%{?is_opensuse} sed -i "s|^cgroup_manager = \"systemd\"$|cgroup_manager = \"cgroupfs\"|g" %{SOURCE3} +sed -i "s|--cgroup-driver=systemd|--cgroup-driver=cgroupfs|g" %{SOURCE5} %endif # We can't use symlinks here because go-list gets confused by symlinks, so we ++++++ prevent-local-loopback-teardown-rh1754154.patch ++++++ --- a/internal/lib/container_server.go 2019-11-23 01:13:24.000000000 +0100 +++ b/internal/lib/container_server.go 2020-01-10 15:17:40.705019004 +0100 @@ -341,10 +341,7 @@ netNsPath, err := configNetNsPath(&m) if err == nil { nsErr := sb.NetNsJoin(netNsPath, sb.Name()) - // If we can't load the networking namespace - // because it's closed, we just set the sb netns - // pointer to nil. Otherwise we return an error. - if nsErr != nil && nsErr != sandbox.ErrClosedNetNS { + if nsErr != nil { return nsErr } }
