Hello community, here is the log from the commit of package cri-o for openSUSE:Factory checked in at 2018-03-13 10:23:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cri-o (Old) and /work/SRC/openSUSE:Factory/.cri-o.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cri-o" Tue Mar 13 10:23:41 2018 rev:5 rq:585789 version:1.9.9 Changes: -------- --- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes 2018-03-09 10:45:43.976543372 +0100 +++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-03-13 10:23:51.434160159 +0100 @@ -1,0 +2,6 @@ +Mon Mar 12 07:07:39 UTC 2018 - vrothb...@suse.com + +- Update cri-o to v1.9.9: + * sandbox_stop: Call CNI stop before stopping pod infra container + +------------------------------------------------------------------- Old: ---- cri-o-1.9.8.tar.xz New: ---- cri-o-1.9.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cri-o.spec ++++++ --- /var/tmp/diff_new_pack.a5r2Mm/_old 2018-03-13 10:23:53.090100830 +0100 +++ /var/tmp/diff_new_pack.a5r2Mm/_new 2018-03-13 10:23:53.094100687 +0100 @@ -31,7 +31,7 @@ %define name_source2 sysconfig.crio %define name_source3 crio.conf Name: cri-o -Version: 1.9.8 +Version: 1.9.9 Release: 0 Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.a5r2Mm/_old 2018-03-13 10:23:53.134099253 +0100 +++ /var/tmp/diff_new_pack.a5r2Mm/_new 2018-03-13 10:23:53.134099253 +0100 @@ -2,8 +2,8 @@ <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/kubernetes-incubator/cri-o</param> <param name="scm">git</param> -<param name="versionformat">1.9.8</param> -<param name="revision">v1.9.8</param> +<param name="versionformat">1.9.9</param> +<param name="revision">v1.9.9</param> </service> <service name="recompress" mode="disabled"> <param name="file">cri-o-*.tar</param> ++++++ cri-o-1.9.8.tar.xz -> cri-o-1.9.9.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.9.8/server/sandbox_stop.go new/cri-o-1.9.9/server/sandbox_stop.go --- old/cri-o-1.9.8/server/sandbox_stop.go 2018-03-01 18:42:03.000000000 +0100 +++ new/cri-o-1.9.9/server/sandbox_stop.go 2018-03-08 10:50:58.000000000 +0100 @@ -56,12 +56,12 @@ for _, c := range containers { cStatus := s.Runtime().ContainerStatus(c) if cStatus.Status != oci.ContainerStateStopped { - if err := s.Runtime().StopContainer(ctx, c, 10); err != nil { - return nil, fmt.Errorf("failed to stop container %s in pod sandbox %s: %v", c.Name(), sb.ID(), err) - } if c.ID() == podInfraContainer.ID() { continue } + if err := s.Runtime().StopContainer(ctx, c, 10); err != nil { + return nil, fmt.Errorf("failed to stop container %s in pod sandbox %s: %v", c.Name(), sb.ID(), err) + } if err := s.StorageRuntimeServer().StopContainer(c.ID()); err != nil && errors.Cause(err) != storage.ErrContainerUnknown { // assume container already umounted logrus.Warnf("failed to stop container %s in pod sandbox %s: %v", c.Name(), sb.ID(), err) @@ -72,6 +72,12 @@ // Clean up sandbox networking and close its network namespace. s.networkStop(sb) + podInfraStatus := s.Runtime().ContainerStatus(podInfraContainer) + if podInfraStatus.Status != oci.ContainerStateStopped { + if err := s.Runtime().StopContainer(ctx, podInfraContainer, 10); err != nil { + return nil, fmt.Errorf("failed to stop infra container %s in pod sandbox %s: %v", podInfraContainer.Name(), sb.ID(), err) + } + } if s.config.Config.ManageNetworkNSLifecycle { if err := sb.NetNsRemove(); err != nil { return nil, err diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cri-o-1.9.8/version/version.go new/cri-o-1.9.9/version/version.go --- old/cri-o-1.9.8/version/version.go 2018-03-01 18:42:03.000000000 +0100 +++ new/cri-o-1.9.9/version/version.go 2018-03-08 10:50:58.000000000 +0100 @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "1.9.8" +const Version = "1.9.9"
