commit cri-o for openSUSE:Factory

2020-09-18 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2020-09-18 15:21:10

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.4249 (New)


Package is "cri-o"

Fri Sep 18 15:21:10 2020 rev:56 rq:834541 version:1.19.0

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2020-08-04 
20:18:23.164929387 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.4249/cri-o.changes2020-09-18 
15:21:16.777962075 +0200
@@ -1,0 +2,121 @@
+Tue Sep 15 07:24:16 UTC 2020 - Sascha Grunert 
+
+- API Change
+  - CRI-O now manages namespace lifecycles by default
+- Feature
+  - Add --version-file-persist, a place to put the version file in
+persistent storage. Now, crio wipe wipes containers if
+--version-file is not present
+  - Add big_files_temporary_dir to allow customization of where
+large temporary files are put
+  - Add build support for setting SOURCE_DATE_EPOCH
+  - Added `--metrics-socket`/`metrics_socket` configuration option
+to allow exposing the metrics endpoint on a local socket path
+  - Added `crio_image_layer_reuse` metric which counts layer reuses
+during image pull
+  - Added `privileged` field to container status `info`
+  - Added behavior to allow filtering by a partial Pod Sandbox ID
+  - Added configuration validation to ensure a `conmon_cgroup ==
+"pod"` if `cgroup_manager == "cgroupfs"`
+  - Added latest `crun` version to static binary bundle
+  - Added metrics-exporter and [documentation]
+  - Added new metrics `crio_image_pulls_failures` and
+`crio_image_pulls_successes`. For more information please refer
+to the [CRI-O metrics guide]
+  - Container HostPort with SCTP protocol is supported.
+  - Containers running `init` or `systemd` are now given a new
+selinux label `container_init_t`, giving it selinux privileges
+more appropriate for the workload
+  - If users want the container_kvm_t label when using a runtime
+that supports kvm separation, they will need to either set the
+runtime_type to "vm" or have "kata" in the runtime name. E.g
+
+[crio.runtime.runtimes.my-kata-runtime]
+runtime_path = ""
+runtime_type = "oci"
+runtime_root = "/run/kata"
+
+or
+
+[crio.runtime.runtimes.my-kata-runtime]
+runtime_path = ""
+runtime_type = "vm"
+runtime_root = "/run/kata"
+  - Re-add the behavior that string slices can be passed to the CLI
+comma separated, for example `--default-capabilities
+CHOWN,KILL`
+  - Removed `socat` runtime dependency which was needed for pod
+port forwarding
+  - Return pod image, pid and spec in sandbox_status CRI verbose
+mode
+- Design
+  - Hooks_dir entries are now created if they don't exist
+- Documentation
+  - Added `crun` container runtime to `crio.conf`
+  - Added dependency report to generated release notes
+  - The changelog is now rendered by a custom go template and
+contains the table of contents
+- Bug or Regression
+  - Adding additional runtime handler doesn't require the user to
+copy existing default runtime handler configuration. The
+existing default runtime handler configuration will be
+preserved while adding the new runtime handler.
+  - ExecSync requests will ask conmon to not double fork, causing
+systemd to have fewer conmons re-parented to it. conmon v2.0.19
+or greater is required for this feature.
+  - Fix handling of the --cni-plugin-dir and other multivalue
+command line flags
+  - Fix path to bash via `/usr/bin/env` in crio-shutdown.service
+  - Fix the container cgroup in case cgroupfs cgroup manager is
+used
+  - Fix working set calculation
+  - Fixed `crio version` binary mode parsing on musl toolchains
+  - Fixed a bug where crictl only showed pod level stats, not
+container level stats.
+  - Fixed a bug where exec sync requests (manually or automatically
+triggered via readiness/liveness probes) overwrite the runtime
+`info.runtimeSpec.process.args` of the container status
+  - Fixed bug where Pod creation would fail if Uid was not
+specified in Metadata of sandbox config passed in a run pod
+sandbox request
+  - Fixed bug where pod names would sometimes leak on creation,
+causing the kubelet to fail to recreate
+  - Fixed crio restart behavior to make sure that Pod creation
+timestamps are restored and the order in the list of pods stays
+stable across restarts
+  - Fixed wrong linkmode output
+  - Reflects resource updates under the container spec.
+- Other
+  - Added info logs for image pulls and image status
+  - Cleanup default info logging
+  - Cleanup go module and vendor files.
+  - Pod creation now fails if conmon cannot be moved to the cgroup
+specified in `conmon_cgroup`. Our default value for
+

commit cri-o for openSUSE:Factory

2020-08-04 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2020-08-04 20:18:06

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.3592 (New)


Package is "cri-o"

Tue Aug  4 20:18:06 2020 rev:55 rq:824081 version:1.18.3

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2020-07-29 
17:17:18.892405155 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.3592/cri-o.changes2020-08-04 
20:18:23.164929387 +0200
@@ -1,0 +2,5 @@
+Sun Aug  2 21:49:08 UTC 2020 - Callum Farmer 
+
+- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075)
+
+---



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.Lb2QiZ/_old  2020-08-04 20:18:25.952930646 +0200
+++ /var/tmp/diff_new_pack.Lb2QiZ/_new  2020-08-04 20:18:25.960930650 +0200
@@ -142,6 +142,7 @@
 install -m 0644 docs/crio.conf.5 %{buildroot}/%{_mandir}/man5
 install -m 0644 docs/crio.8  %{buildroot}/%{_mandir}/man8
 # Configs
+sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE3}
 install -D -m 0644 %{SOURCE3}   
%{buildroot}/%{_sysconfdir}/crio/crio.conf.d/00-default.conf
 install -D -m 0644 crio-umount.conf 
%{buildroot}/%{_datadir}/oci-umount/oci-umount.d/cri-umount.conf
 install -D -m 0644 %{SOURCE2}   %{buildroot}%{_fillupdir}/sysconfig.crio

++ crio.conf ++
--- /var/tmp/diff_new_pack.Lb2QiZ/_old  2020-08-04 20:18:26.096930711 +0200
+++ /var/tmp/diff_new_pack.Lb2QiZ/_new  2020-08-04 20:18:26.096930711 +0200
@@ -355,7 +355,7 @@
 # Paths to directories where CNI plugin binaries are located.
 plugin_dirs = [
"/opt/cni/bin/",
-   "/usr/lib/cni/",
+   "@LIBEXECDIR@/cni/",
 ]
 
 # A necessary configuration for Prometheus based metrics retrieval




commit cri-o for openSUSE:Factory

2020-07-29 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2020-07-29 17:16:45

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.3592 (New)


Package is "cri-o"

Wed Jul 29 17:16:45 2020 rev:54 rq:823099 version:1.18.3

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2020-07-26 
16:18:08.264740601 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.3592/cri-o.changes2020-07-29 
17:17:18.892405155 +0200
@@ -1,0 +2,6 @@
+Tue Jul 28 09:19:33 UTC 2020 - Fabian Vogt 
+
+- Suggest katacontainers instead of recommending it. It's not
+  enabled by default, so it's just bloat
+
+---



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.obJzOE/_old  2020-07-29 17:17:20.064406112 +0200
+++ /var/tmp/diff_new_pack.obJzOE/_new  2020-07-29 17:17:20.064406112 +0200
@@ -58,7 +58,7 @@
 Requires:   runc >= 1.0.0~rc6
 Requires:   socat
 Requires:   conmon
-Recommends: katacontainers
+Suggests:   katacontainers
 # Provide generic cri-runtime dependency (needed by kubernetes)
 Provides:   cri-runtime
 # disable stripping of binaries




commit cri-o for openSUSE:Factory

2020-07-26 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2020-07-26 16:17:05

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.3592 (New)


Package is "cri-o"

Sun Jul 26 16:17:05 2020 rev:53 rq:822091 version:1.18.3

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2020-06-23 
21:02:56.861524032 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.3592/cri-o.changes2020-07-26 
16:18:08.264740601 +0200
@@ -1,0 +2,13 @@
+Mon Jul 20 12:44:28 UTC 2020 - Sascha Grunert 
+
+- Update to version 1.18.3:
+  - Fix a bug where a sudden reboot causes incomplete image writes.
+This could cause image storage to be corrupted, resulting in an
+error layer not known.
+  - Fixed bug where pod names would sometimes leak on creation,
+causing the kubelet to fail to recreate
+  - If conmon is v2.0.19 or greater, ExecSync requests will not
+double fork, causing systemd to have fewer conmons re-parented
+to it
+
+---

Old:

  cri-o-1.18.2.tar.xz

New:

  cri-o-1.18.3.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.oRH2HW/_old  2020-07-26 16:18:09.764742004 +0200
+++ /var/tmp/diff_new_pack.oRH2HW/_new  2020-07-26 16:18:09.768742007 +0200
@@ -24,7 +24,7 @@
 %define project github.com/cri-o/cri-o
 # Define macros for further referenced sources
 Name:   cri-o
-Version:1.18.2
+Version:1.18.3
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.oRH2HW/_old  2020-07-26 16:18:09.804742041 +0200
+++ /var/tmp/diff_new_pack.oRH2HW/_new  2020-07-26 16:18:09.808742045 +0200
@@ -2,8 +2,8 @@
   
 https://github.com/cri-o/cri-o
 git
-1.18.2
-v1.18.2
+1.18.3
+v1.18.3
 enable
   
   

++ _servicedata ++
--- /var/tmp/diff_new_pack.oRH2HW/_old  2020-07-26 16:18:09.824742060 +0200
+++ /var/tmp/diff_new_pack.oRH2HW/_new  2020-07-26 16:18:09.824742060 +0200
@@ -1,4 +1,4 @@
 
 
 https://github.com/cri-o/cri-o
-  7f261aeebffed079b4475dde8b9d602b01973d33
\ No newline at end of file
+  381ae2c212ba8b8d70b8f4492a5dc51bbed41368
\ No newline at end of file

++ cri-o-1.18.2.tar.xz -> cri-o-1.18.3.tar.xz ++
/work/SRC/openSUSE:Factory/cri-o/cri-o-1.18.2.tar.xz 
/work/SRC/openSUSE:Factory/.cri-o.new.3592/cri-o-1.18.3.tar.xz differ: char 27, 
line 1




commit cri-o for openSUSE:Factory

2020-06-23 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2020-06-23 21:02:33

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.2956 (New)


Package is "cri-o"

Tue Jun 23 21:02:33 2020 rev:52 rq:815808 version:1.18.2

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2020-05-20 
18:37:04.504182011 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.2956/cri-o.changes2020-06-23 
21:02:56.861524032 +0200
@@ -1,0 +2,12 @@
+Thu Jun 18 20:50:15 UTC 2020 - dmuel...@suse.com
+
+- Update to version 1.18.2:
+  * Bump version to v1.18.2
+  * criocli: Avoid parsing the config twice
+  * StringSliceTrySplit: return a copy of the underlying slice
+  * Restore version output from crio --version
+  * Add info logs for image pull and status CRI calls
+  * managed_ns: deflake tests
+  * bump containers image to 5.4.4  (fixes gh#containers/image/issues/898)
+
+---

Old:

  cri-o-1.18.1.tar.xz

New:

  _servicedata
  cri-o-1.18.2.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.8tM9xl/_old  2020-06-23 21:02:58.289528626 +0200
+++ /var/tmp/diff_new_pack.8tM9xl/_new  2020-06-23 21:02:58.293528639 +0200
@@ -24,7 +24,7 @@
 %define project github.com/cri-o/cri-o
 # Define macros for further referenced sources
 Name:   cri-o
-Version:1.18.1
+Version:1.18.2
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.8tM9xl/_old  2020-06-23 21:02:58.329528755 +0200
+++ /var/tmp/diff_new_pack.8tM9xl/_new  2020-06-23 21:02:58.329528755 +0200
@@ -2,8 +2,8 @@
   
 https://github.com/cri-o/cri-o
 git
-1.18.1
-v1.18.1
+1.18.2
+v1.18.2
 enable
   
   

++ _servicedata ++


https://github.com/cri-o/cri-o
  7f261aeebffed079b4475dde8b9d602b01973d33++
 cri-o-1.18.1.tar.xz -> cri-o-1.18.2.tar.xz ++
/work/SRC/openSUSE:Factory/cri-o/cri-o-1.18.1.tar.xz 
/work/SRC/openSUSE:Factory/.cri-o.new.2956/cri-o-1.18.2.tar.xz differ: char 26, 
line 1




commit cri-o for openSUSE:Factory

2020-05-20 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2020-05-20 18:37:00

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.2738 (New)


Package is "cri-o"

Wed May 20 18:37:00 2020 rev:51 rq:807001 version:1.18.1

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2020-05-05 
18:53:57.881228499 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.2738/cri-o.changes2020-05-20 
18:37:04.504182011 +0200
@@ -1,0 +2,25 @@
+Mon May 18 07:26:55 UTC 2020 - sgrun...@suse.com
+
+- Update to version 1.18.1:
+  - Feature
+- Add -–version-file-persist, a place to put the version file
+  in persistent storage. Now, crio wipe wipes containers if
+  -–version-file is not present (presumably it is on temporary
+  storage), and wipes images if both -–version-file and
+  -–version-file-persist are out of date (presumably there has
+  been an upgrade of cri-o’s minor version
+- Containers running init or systemd are now given a new
+  selinux label container_init_t, giving it selinux privileges
+  more appropriate for the workload
+  - Other (Bug, Cleanup or Flake)
+- Fix linkmode retrieval on crio version for static binaries
+- Fix a bug where CRI-O could not start a container if
+  CONFIG_CGROUP_HUGETLB was not set in the kernel
+- Re-add the behavior that string slices can be passed to the
+  CLI comma separated, for example --default-capabilities
+  CHOWN,KILL
+- Removed crio-wipe.service and crio-shutdown.service systemd
+  units from the static bundle since they are not required
+- Fix some crio version oddities
+
+---

Old:

  cri-o-1.18.0.tar.xz

New:

  cri-o-1.18.1.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.33Qu8J/_old  2020-05-20 18:37:05.240183554 +0200
+++ /var/tmp/diff_new_pack.33Qu8J/_new  2020-05-20 18:37:05.244183562 +0200
@@ -24,7 +24,7 @@
 %define project github.com/cri-o/cri-o
 # Define macros for further referenced sources
 Name:   cri-o
-Version:1.18.0
+Version:1.18.1
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.33Qu8J/_old  2020-05-20 18:37:05.280183638 +0200
+++ /var/tmp/diff_new_pack.33Qu8J/_new  2020-05-20 18:37:05.280183638 +0200
@@ -2,8 +2,8 @@
   
 https://github.com/cri-o/cri-o
 git
-1.18.0
-v1.18.0
+1.18.1
+v1.18.1
 enable
   
   

++ cri-o-1.18.0.tar.xz -> cri-o-1.18.1.tar.xz ++
/work/SRC/openSUSE:Factory/cri-o/cri-o-1.18.0.tar.xz 
/work/SRC/openSUSE:Factory/.cri-o.new.2738/cri-o-1.18.1.tar.xz differ: char 26, 
line 1




commit cri-o for openSUSE:Factory

2020-05-05 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2020-05-05 18:53:52

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.2738 (New)


Package is "cri-o"

Tue May  5 18:53:52 2020 rev:50 rq:799670 version:1.18.0

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2020-04-28 
22:29:41.325453555 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.2738/cri-o.changes2020-05-05 
18:53:57.881228499 +0200
@@ -1,0 +2,5 @@
+Wed Apr 29 06:30:14 UTC 2020 - Sascha Grunert 
+
+- Remove the `go >= 1.13` build requirement
+
+---



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.1trBBF/_old  2020-05-05 18:53:58.881230652 +0200
+++ /var/tmp/diff_new_pack.1trBBF/_new  2020-05-05 18:53:58.885230660 +0200
@@ -47,7 +47,6 @@
 BuildRequires:  libgpgme-devel
 BuildRequires:  libseccomp-devel
 BuildRequires:  golang(API) = 1.13
-BuildRequires:  go >= 1.13
 BuildRequires:  sed
 Requires:   patterns-base-apparmor
 Requires:   conntrack-tools




commit cri-o for openSUSE:Factory

2020-04-28 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2020-04-28 22:29:38

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.2738 (New)


Package is "cri-o"

Tue Apr 28 22:29:38 2020 rev:49 rq:798305 version:1.18.0

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2020-04-18 
00:30:45.934093952 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.2738/cri-o.changes2020-04-28 
22:29:41.325453555 +0200
@@ -1,0 +2,93 @@
+Mon Apr 27 14:41:13 UTC 2020 - Ralf Haferkamp 
+
+- Restore calls to %service_* macros that were accidently removed
+  with the last change
+
+---
+Tue Apr 23 13:59:08 UTC 2020 - Sascha Grunert 
+
+- Remove crio-wipe.service and crio-shutdown.service
+- Update to version 1.18.0:
+  - Deprecation
+- Drop support for golang < v1.13
+  - API Change
+- Removed version from default AppArmor profile name in config
+- CRI-O now runs containers without NET_RAW and SYS_CHROOT
+  capabilities by default. This can result in permission denied
+  errors when the container tries to do something that would
+  require either of these capabilities. For instance, using
+  `ping` requires NET_RAW, unless the container is given the
+  sysctl `net.ipv4.ip_forward`. Further, if you have a
+  container that runs buildah or configures RPMs, they may fail
+  without SYS_CHROOT. Ultimately, the dropped capabilities are
+  worth it, as the majority of containers don't need them. The
+  fewer capabilities CRI-O gives out by default, the more
+  secure it is by default.
+- When pinning namespaces, CRI-O now pins to
+  /var/run/$NS_NAMEns/$RAND_ID instead of
+  /var/run/crio/ns/$RAND_ID/$NS_NAME for better compatibility
+  with third party networking plugins
+  - Feature
+- Add `crio config -m/--migrate` option which supports
+  migrating a v1.17.0 configuration file to the latest version.
+- Add available image labels to image status info
+- Add cgroup namespace unsharing to pinns
+- Add live configuration reload to AppArmor profile option
+- Add live configuration reload to seccomp profile option
+- Add log context to container stats to improve logging
+- Added `--cni-default-network`/`cni_default_network` option to
+  specify the CNI network to select. The default value is
+  `crio`, but this option can be explicitly set to `""` to
+  pickup the first network found in
+  `--cni-config-dir`/`network_dir`.
+- Added `conmon`, `runc` and `cni-plugins` to the static
+  release bundle
+- Added `linkmode` (dynamic or static) output to `crio version`
+  subcommand
+- Added gRPC method names to log entries to increase
+  trace-ablity
+- Added live reload to `decryption_keys_path`
+- Added pinns binary to static bundle
+- Improve `crio --version` / `version` output to show more
+  details
+- Provide the possibility to set the default config path via
+  `make DEFAULTS_PATH=`
+- Take local images into account when pulling images prefixed
+  with `localhost/`
+- Added support for drop-in registries.conf configuration
+  files. Please refer to the registries.conf.d documentation
+  
(https://github.com/containers/image/blob/master/docs/containers-registries.conf.d.5.md)
+  for further details.
+- If a specified or the default hooks directory is not
+  available, then we warn the user but do not fail any more.
+  -  Documentation
+- Update documentation that the lowest possible value for the
+  ctr_stop_timeout is 30seconds. We also move the validation of
+  this fact into the config validation part of the library.
+- Added man page for crio.conf.d(5)
+  -  Other (Bug, Cleanup or Flake)
+- Empty sandbox labels are now serialized into proper JSON (`null`)
+- Fixed CRI-O to fail to start when `runc` is no configured
+  runtime and the `runc` binary is not in `$PATH`
+- Fixed SIGHUP reload for drop-in configuration files
+- Provide the latest release bundle via a Google Cloud Storage
+  Bucket at:
+  
https://console.cloud.google.com/storage/browser/k8s-conform-cri-o/artifacts
+- Removed annoying logs coming directly from lower level
+  runtimes like runc
+- Removed the musl libc build target from the static binary
+  bundle in favor of the existing glibc variant
+- Removed warning about non-absolute container log paths when
+  creating a container
+- CRI-O's version can be overriden at buildtime with
+  `VERSION=my.version.number make bin/crio`
+- ContainerStatus no longer waits for a container operation
+  (such as start or stop) to 

commit cri-o for openSUSE:Factory

2020-04-17 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2020-04-18 00:29:12

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.2738 (New)


Package is "cri-o"

Sat Apr 18 00:29:12 2020 rev:48 rq:794622 version:1.17.3

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2020-04-14 
16:17:54.455408389 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.2738/cri-o.changes2020-04-18 
00:30:45.934093952 +0200
@@ -1,0 +2,10 @@
+Thu Apr 16 15:24:00 UTC 2020 - Richard Brown 
+
+- criconfig: Require kubernetes-kubeadm-provider to be compatable with 
multi-version kubernetes packaging
+
+---
+Thu Apr 16 09:01:48 UTC 2020 - Michal Jura 
+
+- Update apparmor_profile with current cri-o version, bsc#1161056
+
+---



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.24LQaa/_old  2020-04-18 00:30:47.142096454 +0200
+++ /var/tmp/diff_new_pack.24LQaa/_new  2020-04-18 00:30:47.146096461 +0200
@@ -74,7 +74,7 @@
 
 %package kubeadm-criconfig
 Summary:CRI-O container runtime configuration for kubeadm
-Requires:   kubernetes-kubeadm
+Requires:   kubernetes-kubeadm-provider
 Requires(post): %fillup_prereq
 Supplements:cri-o
 Provides:   kubernetes-kubeadm-criconfig
@@ -89,6 +89,7 @@
 %build
 # Keep cgroupfs as the default cgroup manager for SLE15 builds
 %if 0%{?sle_version} >= 15 && !0%{?is_opensuse}
+sed -i "s|.*apparmor_profile =.*|apparmor_profile = 
\"crio-default-%{version}\"|" %{SOURCE3}
 sed -i "s|^cgroup_manager = \"systemd\"$|cgroup_manager = \"cgroupfs\"|g" 
%{SOURCE3}
 sed -i "s|--cgroup-driver=systemd|--cgroup-driver=cgroupfs|g" %{SOURCE5}
 %endif




commit cri-o for openSUSE:Factory

2020-04-14 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2020-04-14 15:08:15

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.2738 (New)


Package is "cri-o"

Tue Apr 14 15:08:15 2020 rev:47 rq:792930 version:1.17.3

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2020-03-27 
21:56:16.810757249 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new.2738/cri-o.changes2020-04-14 
16:17:54.455408389 +0200
@@ -1,0 +2,15 @@
+Fri Apr 10 09:58:30 UTC 2020 - Michal Jura 
+
+- Update to version 1.17.3:
+  * Bump version to 1.17.3
+  * Update c/image to v5.3.1
+  * sandbox: Make sure the label annotation is proper JSON
+  * container_server: Wrap a few more errors in LoadSandbox
+  * restore tests: verify some namespace lifecycle cases work
+  * fail on failed pinns
+  * pinns: pin to /var/run/*ns instead of /var/run/crio/ns/*
+  * Add the -d flag when installing runc for circle ci
+  * Add the mounts that are required by systemd
+  * bump to 1.17.2
+
+---

Old:

  cri-o-1.17.1.tar.xz

New:

  cri-o-1.17.3.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.Pqy3UW/_old  2020-04-14 16:17:55.383409053 +0200
+++ /var/tmp/diff_new_pack.Pqy3UW/_new  2020-04-14 16:17:55.383409053 +0200
@@ -24,7 +24,7 @@
 %define project github.com/cri-o/cri-o
 # Define macros for further referenced sources
 Name:   cri-o
-Version:1.17.1
+Version:1.17.3
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.Pqy3UW/_old  2020-04-14 16:17:55.431409088 +0200
+++ /var/tmp/diff_new_pack.Pqy3UW/_new  2020-04-14 16:17:55.431409088 +0200
@@ -1,15 +1,16 @@
 
-
-https://github.com/cri-o/cri-o
-git
-1.17.1
-v1.17.1
-
-
-cri-o-*.tar
-xz
-
-
-cri-o
-
+  
+https://github.com/cri-o/cri-o
+git
+1.17.3
+v1.17.3
+enable
+  
+  
+cri-o-*.tar
+xz
+  
+  
+cri-o
+  
 

++ cri-o-1.17.1.tar.xz -> cri-o-1.17.3.tar.xz ++
 71006 lines of diff (skipped)




commit cri-o for openSUSE:Factory

2020-03-27 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2020-03-27 21:56:06

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.3160 (New)


Package is "cri-o"

Fri Mar 27 21:56:06 2020 rev:46 rq:789008 version:1.17.1

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2020-03-19 
19:49:18.692149900 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new.3160/cri-o.changes2020-03-27 
21:56:16.810757249 +0100
@@ -1,0 +2,5 @@
+Fri Mar 27 12:25:19 UTC 2020 - Richard Brown 
+
+- Use new pause:3.2 image 
+
+---



Other differences:
--
++ crio.conf ++
--- /var/tmp/diff_new_pack.en4NhH/_old  2020-03-27 21:56:19.022758536 +0100
+++ /var/tmp/diff_new_pack.en4NhH/_new  2020-03-27 21:56:19.022758536 +0100
@@ -293,7 +293,7 @@
 
 # The image used to instantiate infra containers.
 # This option supports live configuration reload.
-pause_image = "registry.opensuse.org/kubic/pause:3.1"
+pause_image = "registry.opensuse.org/kubic/pause:3.2"
 
 # The path to a file containing credentials specific for pulling the 
pause_image from
 # above. The file is similar to that of /var/lib/kubelet/config.json




commit cri-o for openSUSE:Factory

2020-03-19 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2020-03-19 19:45:43

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.3160 (New)


Package is "cri-o"

Thu Mar 19 19:45:43 2020 rev:45 rq:785935 version:1.17.1

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2020-02-15 
22:25:00.439296327 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new.3160/cri-o.changes2020-03-19 
19:49:18.692149900 +0100
@@ -1,0 +2,14 @@
+Mon Mar 16 16:24:00 UTC 2020 - Sascha Grunert 
+
+- Update to v1.17.1:
+  * Drop conmonmon
+  * Update docs and completions for crio wipe --force
+  * wipe: Add a force flag for skipping version check
+  * Restore sandbox selinux labels directly from config.json
+  * klog: don't write to /tmp
+  * Pass down the integer value of the stop signal
+  * exec: Close pipe fds to prevent hangs
+  * Unwrap errors from label.Relabel() before checking for ENOTSUP
+  * oci: Handle timeouts correctly for probes
+
+---

Old:

  cri-o-1.17.0.tar.xz

New:

  cri-o-1.17.1.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.WmChQh/_old  2020-03-19 19:49:20.292150823 +0100
+++ /var/tmp/diff_new_pack.WmChQh/_new  2020-03-19 19:49:20.304150830 +0100
@@ -24,7 +24,7 @@
 %define project github.com/cri-o/cri-o
 # Define macros for further referenced sources
 Name:   cri-o
-Version:1.17.0
+Version:1.17.1
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.WmChQh/_old  2020-03-19 19:49:20.428150902 +0100
+++ /var/tmp/diff_new_pack.WmChQh/_new  2020-03-19 19:49:20.432150904 +0100
@@ -2,8 +2,8 @@
 
 https://github.com/cri-o/cri-o
 git
-1.17.0
-v1.17.0
+1.17.1
+v1.17.1
 
 
 cri-o-*.tar

++ cri-o-1.17.0.tar.xz -> cri-o-1.17.1.tar.xz ++
 8469 lines of diff (skipped)




commit cri-o for openSUSE:Factory

2020-02-15 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2020-02-15 22:24:48

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.26092 (New)


Package is "cri-o"

Sat Feb 15 22:24:48 2020 rev:44 rq:773627 version:1.17.0

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2020-01-23 
16:10:23.127617046 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new.26092/cri-o.changes   2020-02-15 
22:25:00.439296327 +0100
@@ -1,0 +2,38 @@
+Mon Feb 10 14:59:52 UTC 2020 - Sascha Grunert 
+
+- Put default configuration in /etc/crio/crio.conf.d/00-default.conf
+  in replacement for /etc/crio/crio.conf
+
+---
+Mon Feb 10 14:05:47 UTC 2020 - Sascha Grunert 
+
+- Uncomment default apparmor profile to always fallback to the
+  default one
+
+---
+Mon Feb 10 08:18:28 UTC 2020 - Sascha Grunert 
+
+- Remove prevent-local-loopback-teardown-rh1754154.patch which is
+  now included in upstream
+- Update to v1.17.0:
+  * Major Changes
+- Allow CRI-O to manage IPC and UTS namespaces, in addition to
+  Network
+- Add support for drop-in configuration files
+- Added image pull and network setup metrics
+- Image decryption support
+- Remove unneeded host_ip configuration value
+  * Minor Changes
+- Setup container environment variables before user
+- Move default version file location to a tmpfs
+- Failures to stop the network will now cause a stop sandbox
+  request to fail
+- Persist container exit codes across reboot
+- Add conmonmon: a conmon monitoring loop to protect against
+  conmon being OOM'd
+- Add namespaces{-_}dir CLI and config option
+- Add disk usage for ListContainerStats
+- Introduce new runtime field to restrict devices in privileged
+  mode
+
+---

Old:

  cri-o-1.16.1.tar.xz
  prevent-local-loopback-teardown-rh1754154.patch

New:

  cri-o-1.17.0.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.M9jgWw/_old  2020-02-15 22:25:01.563296935 +0100
+++ /var/tmp/diff_new_pack.M9jgWw/_new  2020-02-15 22:25:01.571296939 +0100
@@ -24,7 +24,7 @@
 %define project github.com/cri-o/cri-o
 # Define macros for further referenced sources
 Name:   cri-o
-Version:1.16.1
+Version:1.17.0
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0
@@ -38,7 +38,6 @@
 Source5:kubelet.env
 Source6:crio-wipe.service
 Source7:crio-shutdown.service
-Patch1: prevent-local-loopback-teardown-rh1754154.patch
 BuildRequires:  device-mapper-devel
 BuildRequires:  fdupes
 BuildRequires:  glib2-devel-static
@@ -86,7 +85,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 # Keep cgroupfs as the default cgroup manager for SLE15 builds
@@ -130,8 +128,8 @@
 # Binaries
 install -D -m 0755 bin/crio%{buildroot}/%{_bindir}/crio
 install -D -m 0755 bin/crio-status%{buildroot}/%{_bindir}/crio-status
+install -D -m 0755 bin/pinns%{buildroot}/%{_bindir}/pinns
 install -d %{buildroot}/%{_libexecdir}/crio/bin
-install -D -m 0755 bin/pause   %{buildroot}/%{_libexecdir}/crio/bin/pause
 # Completions
 install -D -m 0644 completions/bash/crio 
%{buildroot}/%{_datadir}/bash-completion/completions/crio
 install -D -m 0644 completions/zsh/_crio 
%{buildroot}%{_sysconfdir}/zsh_completion.d/_crio
@@ -145,7 +143,7 @@
 install -m 0644 docs/crio.conf.5 %{buildroot}/%{_mandir}/man5
 install -m 0644 docs/crio.8  %{buildroot}/%{_mandir}/man8
 # Configs
-install -D -m 0644 %{SOURCE3}   %{buildroot}/%{_sysconfdir}/crio/crio.conf
+install -D -m 0644 %{SOURCE3}   
%{buildroot}/%{_sysconfdir}/crio/crio.conf.d/00-default.conf
 install -D -m 0644 crio-umount.conf 
%{buildroot}/%{_datadir}/oci-umount/oci-umount.d/cri-umount.conf
 install -D -m 0644 %{SOURCE2}   %{buildroot}%{_fillupdir}/sysconfig.crio
 # Systemd
@@ -164,9 +162,9 @@
 # Binaries
 %{_bindir}/crio
 %{_bindir}/crio-status
+%{_bindir}/pinns
 %dir %{_libexecdir}/crio
 %dir %{_libexecdir}/crio/bin
-%{_libexecdir}/crio/bin/pause
 # Completions
 %{_datadir}/bash-completion/completions/crio
 %{_datadir}/bash-completion/completions/crio-status
@@ -184,7 +182,8 @@
 %license LICENSE
 # Configs
 %dir %{_sysconfdir}/crio
-%config(noreplace) %{_sysconfdir}/crio/crio.conf
+%dir %{_sysconfdir}/crio/crio.conf.d
+%config %{_sysconfdir}/crio/crio.conf.d/00-default.conf
 %dir %{_datadir}/oci-umount
 %dir %{_datadir}/oci-umount/oci-umount.d
 

commit cri-o for openSUSE:Factory

2020-01-23 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2020-01-23 16:09:45

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.26092 (New)


Package is "cri-o"

Thu Jan 23 16:09:45 2020 rev:43 rq:765788 version:1.16.1

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2020-01-19 
20:54:18.787951777 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new.26092/cri-o.changes   2020-01-23 
16:10:23.127617046 +0100
@@ -1,0 +2,5 @@
+Sat Jan 18 17:36:51 UTC 2020 - Sascha Grunert 
+
+- Fix invalid apparmor profile (bsc#1161179)
+
+---



Other differences:
--
++ crio.conf ++
--- /var/tmp/diff_new_pack.KwgaWi/_old  2020-01-23 16:10:24.971618138 +0100
+++ /var/tmp/diff_new_pack.KwgaWi/_new  2020-01-23 16:10:24.971618138 +0100
@@ -118,7 +118,7 @@
 
 # Used to change the name of the default AppArmor profile of CRI-O. The default
 # profile name is "crio-default-" followed by the version string of CRI-O.
-apparmor_profile = "crio-default-1.16.0"
+apparmor_profile = "crio-default-1.16.1"
 
 # Cgroup management implementation used for the runtime.
 cgroup_manager = "systemd"




commit cri-o for openSUSE:Factory

2020-01-19 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2020-01-19 20:53:47

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.26092 (New)


Package is "cri-o"

Sun Jan 19 20:53:47 2020 rev:42 rq:765280 version:1.16.1

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2020-01-13 
22:16:31.310379008 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new.26092/cri-o.changes   2020-01-19 
20:54:18.787951777 +0100
@@ -1,0 +2,13 @@
+Thu Jan 16 11:56:58 UTC 2020 - Sascha Grunert 
+
+- Include system proxy settings in service if present (bsc#1155323)
+
+---
+Thu Jan 16 11:30:27 UTC 2020 - Sascha Grunert 
+
+- Removed the usage of `name_` variables to reduce the error
+  proneness
+- Fixed systemd unit install locations for crio-wipe.service and
+  crio-shutdown.service (bsc#1161056)
+
+---



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.7hcril/_old  2020-01-19 20:54:20.399952624 +0100
+++ /var/tmp/diff_new_pack.7hcril/_new  2020-01-19 20:54:20.435952643 +0100
@@ -23,11 +23,6 @@
 
 %define project github.com/cri-o/cri-o
 # Define macros for further referenced sources
-%define name_source1 crio.service
-%define name_source2 sysconfig.crio
-%define name_source3 crio.conf
-%define name_source4 crio-wipe.service
-%define name_source5 crio-shutdown.service
 Name:   cri-o
 Version:1.16.1
 Release:0
@@ -36,13 +31,13 @@
 Url:https://github.com/cri-o/cri-o
 ExcludeArch:i586
 Source0:%{name}-%{version}.tar.xz
-Source1:%{name_source1}
-Source2:%{name_source2}
-Source3:%{name_source3}
+Source1:crio.service
+Source2:sysconfig.crio
+Source3:crio.conf
 Source4:cri-o-rpmlintrc
 Source5:kubelet.env
-Source6:%{name_source4}
-Source7:%{name_source5}
+Source6:crio-wipe.service
+Source7:crio-shutdown.service
 Patch1: prevent-local-loopback-teardown-rh1754154.patch
 BuildRequires:  device-mapper-devel
 BuildRequires:  fdupes
@@ -112,10 +107,10 @@
 make
 
 %pre
-%service_add_pre %{name_source1} %{name_source4} %{name_source5}
+%service_add_pre crio.service crio-wipe.service crio-shutdown.service
 
 %post
-%service_add_post %{name_source1} %{name_source4} %{name_source5}
+%service_add_post crio.service crio-wipe.service crio-shutdown.service
 # 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
@@ -124,10 +119,10 @@
 %fillup_only -n kubelet
 
 %preun
-%service_del_preun %{name_source1} %{name_source4} %{name_source5}
+%service_del_preun crio.service crio-wipe.service crio-shutdown.service
 
 %postun
-%service_del_postun %{name_source1} %{name_source4} %{name_source5}
+%service_del_postun crio.service crio-wipe.service crio-shutdown.service
 
 %install
 cd $HOME/go/src/%{project}
@@ -150,13 +145,13 @@
 install -m 0644 docs/crio.conf.5 %{buildroot}/%{_mandir}/man5
 install -m 0644 docs/crio.8  %{buildroot}/%{_mandir}/man8
 # Configs
-install -D -m 0644 %{SOURCE3}   
%{buildroot}/%{_sysconfdir}/crio/%{name_source3}
+install -D -m 0644 %{SOURCE3}   %{buildroot}/%{_sysconfdir}/crio/crio.conf
 install -D -m 0644 crio-umount.conf 
%{buildroot}/%{_datadir}/oci-umount/oci-umount.d/cri-umount.conf
-install -D -m 0644 %{SOURCE2}   %{buildroot}%{_fillupdir}/%{name_source2}
+install -D -m 0644 %{SOURCE2}   %{buildroot}%{_fillupdir}/sysconfig.crio
 # Systemd
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name_source1}
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name_source4}
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name_source5}
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/crio.service
+install -D -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/crio-wipe.service
+install -D -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/crio-shutdown.service
 # place kubelet.env in fillupdir
 install -D -m 0644 %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.kubelet
 # Symlinks to rc files
@@ -189,15 +184,15 @@
 %license LICENSE
 # Configs
 %dir %{_sysconfdir}/crio
-%config(noreplace) %{_sysconfdir}/crio/%{name_source3}
+%config(noreplace) %{_sysconfdir}/crio/crio.conf
 %dir %{_datadir}/oci-umount
 %dir %{_datadir}/oci-umount/oci-umount.d
 %{_datadir}/oci-umount/oci-umount.d/cri-umount.conf
-%{_fillupdir}/%{name_source2}
+%{_fillupdir}/sysconfig.crio
 # Systemd
-%{_unitdir}/%{name_source1}
-%{_unitdir}/%{name_source4}
-%{_unitdir}/%{name_source5}

commit cri-o for openSUSE:Factory

2020-01-13 Thread root
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.changes2020-01-13 
22:16:31.310379008 +0100
@@ -1,0 +2,11 @@
+Fri Jan 10 13:40:13 UTC 2020 - Richard Brown 
+
+- 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 - jmassaguer...@suse.com
+
+- 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} >= 15 && !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.0 +0100
+++ b/internal/lib/container_server.go  2020-01-10 15:17:40.705019004 +0100
@@ -341,10 +341,7 @@
netNsPath, err := configNetNsPath()
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
}
}



commit cri-o for openSUSE:Factory

2019-12-02 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-12-02 11:30:50

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.4691 (New)


Package is "cri-o"

Mon Dec  2 11:30:50 2019 rev:40 rq:751531 version:1.16.1

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2019-11-15 
22:33:31.224040564 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new.4691/cri-o.changes2019-12-02 
11:34:56.586457253 +0100
@@ -1,0 +2,25 @@
+Wed Nov 27 10:36:29 UTC 2019 - Sascha Grunert 
+
+- Update to v1.16.1:
+  * Add manifest list support
+  * Default to system.slice for conmon cgroup
+  * Don't set PodIPs on host network pods
+
+---
+Tue Nov 26 13:13:16 UTC 2019 - Dirk Mueller 
+
+- switch to libcontainers-common requires, as the other two are
+  provided by it already (avant-garde#1056)
+
+---
+Tue Nov 19 12:19:06 UTC 2019 - David Cassany 
+
+- Revert cgroup_manager from systemd to cgroupsfs for SLE15
+ 
+  k8s default is cgroupfs and in can be modified at runtime by the
+  `--kubelet-cgroups` flag. However this flag is deprecated and
+  avoinding it is currently preferred over introducing it. In order
+  to switch to systemd as the cgroups manager in SLE15 further analysis is
+  required to find a suitable configuration strategy. 
+
+---
@@ -85,0 +111,5 @@
+Thu Sep  5 08:35:05 UTC 2019 - David Cassany 
+
+- Updating to v1.15.1 included de fix for CVE-2019-10214 (bsc#1144065)
+
+---
@@ -411 +441 @@
-- Add apparmor-parser as dependency
+- Add apparmor-parser as dependency (bsc#1136403)
@@ -459,0 +490,8 @@
+Thu Mar 28 20:23:52 UTC 2019 - Daniel Orf 
+
+- Update go requirements to >= go1.11.3 to fix
+  * bsc#1118897 CVE-2018-16873
+go#29230 cmd/go: remote command execution during "go get -u"
+  * bsc#1118898 CVE-2018-16874
+
+---
@@ -630,0 +669,6 @@
+
+---
+Tue Jul 10 06:52:56 UTC 2018 - David Cassany 
+
+- Update to v1.10.6 included:
+  * bsc#1100838 fix race between container create and cadvisor asking for info

Old:

  cri-o-1.16.0.tar.xz

New:

  cri-o-1.16.1.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.3g0IqM/_old  2019-12-02 11:34:57.786456658 +0100
+++ /var/tmp/diff_new_pack.3g0IqM/_new  2019-12-02 11:34:57.786456658 +0100
@@ -29,7 +29,7 @@
 %define name_source4 crio-wipe.service
 %define name_source5 crio-shutdown.service
 Name:   cri-o
-Version:1.16.0
+Version:1.16.1
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0
@@ -54,15 +54,14 @@
 BuildRequires:  libgpgme-devel
 BuildRequires:  libseccomp-devel
 BuildRequires:  golang(API) >= 1.12
+BuildRequires:  sed
 Requires:   patterns-base-apparmor
 Requires:   conntrack-tools
 Requires:   cni
 Requires:   cni-plugins
 Requires:   iproute2
 Requires:   iptables
-Requires:   libcontainers-common
-Requires:   libcontainers-image
-Requires:   libcontainers-storage
+Requires:   libcontainers-common >= 0.0.1
 Requires:   runc >= 1.0.0~rc6
 Requires:   socat
 Requires:   conmon
@@ -93,6 +92,11 @@
 %setup -q
 
 %build
+# Keep cgroupfs as the default cgroup manager for SLE15 builds
+%if 0%{?sle_version} >= 15 && !0%{?is_opensuse}
+sed -i "s|^cgroup_manager = \"systemd\"$|cgroup_manager = \"cgroupfs\"|g" 
%{SOURCE3}
+%endif
+
 # We can't use symlinks here because go-list gets confused by symlinks, so we
 # have to copy the source to $HOME/go and then use that as the GOPATH.
 export GOPATH=$HOME/go

++ _service ++
--- /var/tmp/diff_new_pack.3g0IqM/_old  2019-12-02 11:34:57.822456640 +0100
+++ /var/tmp/diff_new_pack.3g0IqM/_new  2019-12-02 11:34:57.822456640 +0100
@@ -2,8 +2,8 @@
 
 https://github.com/cri-o/cri-o
 git
-1.16.0
-v1.16.0
+1.16.1
+v1.16.1
 
 
 cri-o-*.tar

++ cri-o-1.16.0.tar.xz -> cri-o-1.16.1.tar.xz ++
/work/SRC/openSUSE:Factory/cri-o/cri-o-1.16.0.tar.xz 
/work/SRC/openSUSE:Factory/.cri-o.new.4691/cri-o-1.16.1.tar.xz differ: char 26, 
line 1




commit cri-o for openSUSE:Factory

2019-11-15 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-11-15 22:33:28

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.26869 (New)


Package is "cri-o"

Fri Nov 15 22:33:28 2019 rev:39 rq:748819 version:1.16.0

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2019-11-12 
11:54:59.831316158 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new.26869/cri-o.changes   2019-11-15 
22:33:31.224040564 +0100
@@ -1,0 +2,48 @@
+Fri Nov 15 04:49:31 UTC 2019 - Sascha Grunert 
+
+- Use single service macro invocation
+- Add shell completions directories to files
+
+---
+Thu Nov 14 09:19:51 UTC 2019 - Sascha Grunert 
+
+- Add crio and crio-status shell completions
+- Add crio-wipe and crio-shutdown services
+- Update kubelet verbosity to `-v=2`
+- Update conmon cgroup to `system.slice`
+- Update crio.conf to match latest version
+- Update to v1.16.0:
+  * Major Changes
+* Add support for manifest lists
+* Dual stack IPv6 support
+* HUP reload of SystemRegistries
+* file_locking is no longer a supported option in the
+  configuration file
+* Hooks are no longer found implicitally.
+* conmon now lives in a separate repository and must be
+  downloaded separately.
+  * Minor
+* All OCI mounts are mounted as rw when a pod is privileged
+* CRI-O can now run on a cgroupv2 system (only with the runtime
+  crun)
+* Add environment variables to CLI flags
+* Add crio-status client to conveniently query status of crio
+  or a container
+* Conmon is now found in $PATH if a path isn't specified or is
+  empty
+* Add metrics to configuration file
+* Bandwidth burst can only be 4GB
+* If another container manager shares CRI-O's storage (like
+  podman), CRI-O no longer attempts to restore them
+* Increase validation for log_dir and runtime_type in
+  configuration
+* Allow usage of short container ID in ContainerStats
+* Make image volumes writeable by the container user
+* Various man page fixes
+* The crio-wipe script is now included in the crio binary (as
+  crio wipe), and only removes CRI-O containers and images.
+* Set some previously public packages as internal (client, lib,
+  oci, pkg, tools, version)
+* infra container now spawned as not privileged
+
+---

Old:

  cri-o-1.15.2.tar.xz

New:

  cri-o-1.16.0.tar.xz
  crio-shutdown.service
  crio-wipe.service



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.jfCLC0/_old  2019-11-15 22:33:32.256040111 +0100
+++ /var/tmp/diff_new_pack.jfCLC0/_new  2019-11-15 22:33:32.260040109 +0100
@@ -26,8 +26,10 @@
 %definename_source1 crio.service
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
+%define name_source4 crio-wipe.service
+%define name_source5 crio-shutdown.service
 Name:   cri-o
-Version:1.15.2
+Version:1.16.0
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0
@@ -39,6 +41,8 @@
 Source3:%{name_source3}
 Source4:cri-o-rpmlintrc
 Source5:kubelet.env
+Source6:%{name_source4}
+Source7:%{name_source5}
 BuildRequires:  device-mapper-devel
 BuildRequires:  fdupes
 BuildRequires:  glib2-devel-static
@@ -61,6 +65,7 @@
 Requires:   libcontainers-storage
 Requires:   runc >= 1.0.0~rc6
 Requires:   socat
+Requires:   conmon
 Recommends: katacontainers
 # Provide generic cri-runtime dependency (needed by kubernetes)
 Provides:   cri-runtime
@@ -100,10 +105,10 @@
 make
 
 %pre
-%service_add_pre %{name_source1}
+%service_add_pre %{name_source1} %{name_source4} %{name_source5}
 
 %post
-%service_add_post %{name_source1}
+%service_add_post %{name_source1} %{name_source4} %{name_source5}
 # 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
@@ -112,19 +117,26 @@
 %fillup_only -n kubelet
 
 %preun
-%service_del_preun %{name_source1}
+%service_del_preun %{name_source1} %{name_source4} %{name_source5}
 
 %postun
-%service_del_postun %{name_source1}
+%service_del_postun %{name_source1} %{name_source4} %{name_source5}
 
 %install
 cd $HOME/go/src/%{project}
 
 # Binaries
 install -D -m 0755 bin/crio%{buildroot}/%{_bindir}/crio
+install -D -m 0755 bin/crio-status%{buildroot}/%{_bindir}/crio-status
 install -d %{buildroot}/%{_libexecdir}/crio/bin

commit cri-o for openSUSE:Factory

2019-11-12 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-11-12 11:54:58

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.2990 (New)


Package is "cri-o"

Tue Nov 12 11:54:58 2019 rev:38 rq:747383 version:1.15.2

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2019-10-11 
17:14:32.197648471 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.2990/cri-o.changes2019-11-12 
11:54:59.831316158 +0100
@@ -1,0 +2,15 @@
+Mon Nov 11 15:04:57 UTC 2019 - Richard Brown 
+
+- Switch to `systemd` cgroup driver in kubelet config also 
+
+---
+Thu Oct 24 10:58:21 UTC 2019 - Sascha Grunert 
+
+- Switch to `systemd` cgroup manager in replacement for `cgroupfs`
+
+---
+Thu Oct 17 16:24:19 UTC 2019 - Richard Brown 
+
+- Remove obsolete Groups tag (fate#326485)
+
+---



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.X6QVel/_old  2019-11-12 11:55:01.743318195 +0100
+++ /var/tmp/diff_new_pack.X6QVel/_new  2019-11-12 11:55:01.767318220 +0100
@@ -31,7 +31,6 @@
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0
-Group:  System/Management
 Url:https://github.com/cri-o/cri-o
 ExcludeArch:i586
 Source0:%{name}-%{version}.tar.xz
@@ -76,7 +75,6 @@
 
 %package kubeadm-criconfig
 Summary:CRI-O container runtime configuration for kubeadm
-Group:  System/Management
 Requires:   kubernetes-kubeadm
 Requires(post): %fillup_prereq
 Supplements:cri-o

++ crio.conf ++
--- /var/tmp/diff_new_pack.X6QVel/_old  2019-11-12 11:55:02.715319231 +0100
+++ /var/tmp/diff_new_pack.X6QVel/_new  2019-11-12 11:55:02.751319269 +0100
@@ -118,7 +118,7 @@
 apparmor_profile = "crio-default-1.15.2"
 
 # Cgroup management implementation used for the runtime.
-cgroup_manager = "cgroupfs"
+cgroup_manager = "systemd"
 
 # List of default capabilities for containers. If it is empty or commented out,
 # only the capabilities defined in the containers json file by the user/kube
@@ -231,22 +231,22 @@
 #  runtime_path = "/path/to/the/runtime/handler/executable"
 #  runtime_type = "oci"
 #  runtime_root = "/path/to/the/runtime/root"
-# 
+#
 # Where:
 # - runtime-handler: name used to identify the runtime
-# - runtime_path (optional, string): absolute path to the runtime executable 
in 
+# - runtime_path (optional, string): absolute path to the runtime executable in
 #   the host filesystem. If omitted, the runtime-handler identifier should 
match
-#   the runtime executable name, and the runtime executable should be placed 
+#   the runtime executable name, and the runtime executable should be placed
 #   in $PATH.
-# - runtime_type (optional, string): type of runtime, one of: "oci", "vm". If 
+# - runtime_type (optional, string): type of runtime, one of: "oci", "vm". If
 #   omitted, an "oci" runtime is assumed.
-# - runtime_root (optional, string): root directory for storage of containers 
+# - runtime_root (optional, string): root directory for storage of containers
 #   state.
 
 [crio.runtime.runtimes.runc]
 
-# Kata Containers is an OCI runtime, where containers are run inside 
lightweight 
-# VMs. Kata provides additional isolation towards the host, minimizing the 
host attack 
+# Kata Containers is an OCI runtime, where containers are run inside 
lightweight
+# VMs. Kata provides additional isolation towards the host, minimizing the 
host attack
 # surface and mitigating the consequences of containers breakout.
 
 # Kata Containers with the default configured VMM

++ kubelet.env ++
--- /var/tmp/diff_new_pack.X6QVel/_old  2019-11-12 11:55:03.035319572 +0100
+++ /var/tmp/diff_new_pack.X6QVel/_new  2019-11-12 11:55:03.063319601 +0100
@@ -1 +1 @@
-KUBELET_EXTRA_ARGS="--container-runtime=remote 
--container-runtime-endpoint=unix:///var/run/crio/crio.sock 
--runtime-request-timeout=15m"
+KUBELET_EXTRA_ARGS="--container-runtime=remote 
--container-runtime-endpoint=unix:///var/run/crio/crio.sock 
--runtime-request-timeout=15m --cgroup-driver=systemd"




commit cri-o for openSUSE:Factory

2019-10-11 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-10-11 17:14:30

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.2352 (New)


Package is "cri-o"

Fri Oct 11 17:14:30 2019 rev:37 rq:736260 version:1.15.2

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2019-09-20 
14:47:54.598945748 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.2352/cri-o.changes2019-10-11 
17:14:32.197648471 +0200
@@ -1,0 +2,5 @@
+Mon Oct  7 10:34:42 UTC 2019 - Sascha Grunert 
+
+- Fix default apparmor profile to match the latest version
+
+---



Other differences:
--
++ crio.conf ++
--- /var/tmp/diff_new_pack.EZa49P/_old  2019-10-11 17:14:32.881646719 +0200
+++ /var/tmp/diff_new_pack.EZa49P/_new  2019-10-11 17:14:32.881646719 +0200
@@ -115,7 +115,7 @@
 
 # Used to change the name of the default AppArmor profile of CRI-O. The default
 # profile name is "crio-default-" followed by the version string of CRI-O.
-apparmor_profile = "crio-default-1.15.1"
+apparmor_profile = "crio-default-1.15.2"
 
 # Cgroup management implementation used for the runtime.
 cgroup_manager = "cgroupfs"




commit cri-o for openSUSE:Factory

2019-09-20 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-09-20 14:47:45

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.7948 (New)


Package is "cri-o"

Fri Sep 20 14:47:45 2019 rev:36 rq:730745 version:1.15.2

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2019-09-11 
10:23:22.283488591 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.7948/cri-o.changes2019-09-20 
14:47:54.598945748 +0200
@@ -1,0 +2,8 @@
+Tue Sep 10 06:45:24 UTC 2019 - Sascha Grunert 
+
+- Update to v1.15.2:
+  * Use HTTP2MatchHeaderFieldSendSettings for incoming gRPC connections
+  * Fix 32 bit builds
+  * crio-wipe: Fix int compare in lib.bash
+
+---

Old:

  cri-o-1.15.1.tar.xz

New:

  cri-o-1.15.2.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.W7xskA/_old  2019-09-20 14:47:55.482945572 +0200
+++ /var/tmp/diff_new_pack.W7xskA/_new  2019-09-20 14:47:55.490945571 +0200
@@ -27,7 +27,7 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.15.1
+Version:1.15.2
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.W7xskA/_old  2019-09-20 14:47:55.602945548 +0200
+++ /var/tmp/diff_new_pack.W7xskA/_new  2019-09-20 14:47:55.602945548 +0200
@@ -2,8 +2,8 @@
 
 https://github.com/cri-o/cri-o
 git
-1.15.1
-v1.15.1
+1.15.2
+v1.15.2
 
 
 cri-o-*.tar

++ cri-o-1.15.1.tar.xz -> cri-o-1.15.2.tar.xz ++
/work/SRC/openSUSE:Factory/cri-o/cri-o-1.15.1.tar.xz 
/work/SRC/openSUSE:Factory/.cri-o.new.7948/cri-o-1.15.2.tar.xz differ: char 27, 
line 1




commit cri-o for openSUSE:Factory

2019-09-11 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-09-11 10:23:19

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.7948 (New)


Package is "cri-o"

Wed Sep 11 10:23:19 2019 rev:35 rq:728727 version:1.15.1

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2019-09-02 
13:22:29.557344697 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.7948/cri-o.changes2019-09-11 
10:23:22.283488591 +0200
@@ -1,0 +2,20 @@
+Thu Sep  5 15:01:52 UTC 2019 - Marco Vedovati 
+
+- Add katacontainers as a recommended package, and include it as an
+  additional OCI runtime in the configuration.
+- Document the format of the [crio.runtime.runtimes] table entries,
+  and remove clutter from the current runc entry.
+
+---
+Thu Sep  5 07:35:05 UTC 2019 - Sascha Grunert 
+
+- Update to v1.15.1:
+  * Bump container storage to v1.12.6
+  * Allow building with go1.10
+  * Allow default IP route to not be present
+  * Update libpod to the latest version
+  * Require crio-wipe for crio service file
+  * Disable crio-wipe in systemd by default
+  * Change default apparmor profile to actually contain the version
+
+---

Old:

  cri-o-1.15.0.tar.xz

New:

  cri-o-1.15.1.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.oPGD5k/_old  2019-09-11 10:23:23.015488500 +0200
+++ /var/tmp/diff_new_pack.oPGD5k/_new  2019-09-11 10:23:23.015488500 +0200
@@ -27,7 +27,7 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.15.0
+Version:1.15.1
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0
@@ -62,6 +62,7 @@
 Requires:   libcontainers-storage
 Requires:   runc >= 1.0.0~rc6
 Requires:   socat
+Recommends: katacontainers
 # Provide generic cri-runtime dependency (needed by kubernetes)
 Provides:   cri-runtime
 # disable stripping of binaries

++ _service ++
--- /var/tmp/diff_new_pack.oPGD5k/_old  2019-09-11 10:23:23.047488496 +0200
+++ /var/tmp/diff_new_pack.oPGD5k/_new  2019-09-11 10:23:23.047488496 +0200
@@ -2,8 +2,8 @@
 
 https://github.com/cri-o/cri-o
 git
-1.15.0
-v1.15.0
+1.15.1
+v1.15.1
 
 
 cri-o-*.tar

++ cri-o-1.15.0.tar.xz -> cri-o-1.15.1.tar.xz ++
/work/SRC/openSUSE:Factory/cri-o/cri-o-1.15.0.tar.xz 
/work/SRC/openSUSE:Factory/.cri-o.new.7948/cri-o-1.15.1.tar.xz differ: char 26, 
line 1

++ crio.conf ++
--- /var/tmp/diff_new_pack.oPGD5k/_old  2019-09-11 10:23:23.095488491 +0200
+++ /var/tmp/diff_new_pack.oPGD5k/_new  2019-09-11 10:23:23.099488491 +0200
@@ -115,7 +115,7 @@
 
 # Used to change the name of the default AppArmor profile of CRI-O. The default
 # profile name is "crio-default-" followed by the version string of CRI-O.
-apparmor_profile = "crio-default-1.15.0"
+apparmor_profile = "crio-default-1.15.1"
 
 # Cgroup management implementation used for the runtime.
 cgroup_manager = "cgroupfs"
@@ -225,12 +225,38 @@
 # The runtime to use is picked based on the runtime_handler provided by the 
CRI.
 # If no runtime_handler is provided, the runtime will be picked based on the 
level
 # of trust of the workload.
+# Each entry in the table should follow this format:
+#
+#[crio.runtime.runtimes.runtime-handler]
+#  runtime_path = "/path/to/the/runtime/handler/executable"
+#  runtime_type = "oci"
+#  runtime_root = "/path/to/the/runtime/root"
+# 
+# Where:
+# - runtime-handler: name used to identify the runtime
+# - runtime_path (optional, string): absolute path to the runtime executable 
in 
+#   the host filesystem. If omitted, the runtime-handler identifier should 
match
+#   the runtime executable name, and the runtime executable should be placed 
+#   in $PATH.
+# - runtime_type (optional, string): type of runtime, one of: "oci", "vm". If 
+#   omitted, an "oci" runtime is assumed.
+# - runtime_root (optional, string): root directory for storage of containers 
+#   state.
 
 [crio.runtime.runtimes.runc]
-runtime_path = ""
-runtime_type = "oci"
-runtime_root = "/run/runc"
 
+# Kata Containers is an OCI runtime, where containers are run inside 
lightweight 
+# VMs. Kata provides additional isolation towards the host, minimizing the 
host attack 
+# surface and mitigating the consequences of containers breakout.
+
+# Kata Containers with the default configured VMM
+#[crio.runtime.runtimes.kata-runtime]
+
+# Kata Containers with the QEMU VMM
+#[crio.runtime.runtimes.kata-qemu]
+
+# Kata Containers with the Firecracker 

commit cri-o for openSUSE:Factory

2019-09-02 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-09-02 13:22:27

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.7948 (New)


Package is "cri-o"

Mon Sep  2 13:22:27 2019 rev:34 rq:727037 version:1.15.0

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2019-08-10 
23:44:22.803632269 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.7948/cri-o.changes2019-09-02 
13:22:29.557344697 +0200
@@ -1,0 +2,6 @@
+Thu Aug 29 09:25:39 UTC 2019 - Sascha Grunert 
+
+- Update crio.conf to:
+  * set manage_network_ns_lifecycle per default to true
+
+---



Other differences:
--
++ crio.conf ++
--- /var/tmp/diff_new_pack.3o8Yce/_old  2019-09-02 13:22:30.517344516 +0200
+++ /var/tmp/diff_new_pack.3o8Yce/_new  2019-09-02 13:22:30.521344516 +0200
@@ -219,7 +219,7 @@
 
 # ManageNetworkNSLifecycle determines whether we pin and remove network 
namespace
 # and manage its lifecycle.
-manage_network_ns_lifecycle = false
+manage_network_ns_lifecycle = true
 
 # The "crio.runtime.runtimes" table defines a list of OCI compatible runtimes.
 # The runtime to use is picked based on the runtime_handler provided by the 
CRI.




commit cri-o for openSUSE:Factory

2019-08-10 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-08-10 23:44:17

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.9556 (New)


Package is "cri-o"

Sat Aug 10 23:44:17 2019 rev:33 rq:721687 version:1.15.0

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2019-07-26 
12:37:40.778010368 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.9556/cri-o.changes2019-08-10 
23:44:22.803632269 +0200
@@ -1,0 +2,7 @@
+Tue Aug  6 14:25:18 UTC 2019 - Sascha Grunert 
+
+- Update crio.conf to:
+  * use `127.0.0.1` as streaming address
+  * use any ephemeral port for streaming server
+
+---



Other differences:
--
++ crio.conf ++
--- /var/tmp/diff_new_pack.e7d9MH/_old  2019-08-10 23:44:23.447632154 +0200
+++ /var/tmp/diff_new_pack.e7d9MH/_new  2019-08-10 23:44:23.451632153 +0200
@@ -48,10 +48,10 @@
 listen = "/var/run/crio/crio.sock"
 
 # IP address on which the stream server will listen.
-stream_address = ""
+stream_address = "127.0.0.1"
 
 # The port on which the stream server will listen.
-stream_port = "10010"
+stream_port = "0"
 
 # Enable encrypted TLS transport of the stream server.
 stream_enable_tls = false




commit cri-o for openSUSE:Factory

2019-07-26 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-07-26 12:37:39

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.4126 (New)


Package is "cri-o"

Fri Jul 26 12:37:39 2019 rev:32 rq:718499 version:1.15.0

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2019-07-15 
22:43:28.503909997 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.4126/cri-o.changes2019-07-26 
12:37:40.778010368 +0200
@@ -1,0 +2,15 @@
+Thu Jul 25 09:20:42 UTC 2019 - Richard Brown 
+
+- Update crio.conf to use correct pause_command
+
+---
+Thu Jul 18 10:13:04 UTC 2019 - Richard Brown 
+
+- Update crio.conf to use better versioned pause container 
+
+---
+Wed Jul 17 14:53:38 UTC 2019 - Richard Brown 
+
+- Update crio.conf to use official kubic pause container 
+
+---



Other differences:
--
++ crio.conf ++
--- /var/tmp/diff_new_pack.Gw8ZGb/_old  2019-07-26 12:37:42.346009335 +0200
+++ /var/tmp/diff_new_pack.Gw8ZGb/_new  2019-07-26 12:37:42.346009335 +0200
@@ -250,7 +250,7 @@
 
 # The image used to instantiate infra containers.
 # This option supports live configuration reload.
-pause_image = "k8s.gcr.io/pause:3.1"
+pause_image = "registry.opensuse.org/kubic/pause:3.1"
 
 # The path to a file containing credentials specific for pulling the 
pause_image from
 # above. The file is similar to that of /var/lib/kubelet/config.json
@@ -259,7 +259,7 @@
 
 # The command to run to have a container stay in the paused state.
 # This option supports live configuration reload.
-pause_command = "/pause"
+pause_command = "/usr/bin/pause"
 
 # Path to the file which decides what sort of policy we use when deciding
 # whether or not to trust an image that we've pulled. It is not recommended 
that




commit cri-o for openSUSE:Factory

2019-07-15 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-07-15 22:43:26

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.1887 (New)


Package is "cri-o"

Mon Jul 15 22:43:26 2019 rev:31 rq:713498 version:1.15.0

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2019-06-12 
13:04:18.669233704 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.1887/cri-o.changes2019-07-15 
22:43:28.503909997 +0200
@@ -1,0 +2,283 @@
+Wed Jul  3 09:40:18 UTC 2019 - Sascha Grunert 
+
+- Update CRI-O to v1.15.0:
+  * update readme for currently supported branches
+  * Update deps for k8s 1.15.0
+  * Remove invalid unit test
+  * Remove unnecessary indirect dependency gopopulate
+  * go.mod: drop github.com/containerd/cgroups
+  * cgroups: use libpod/pkg/cgroups
+  * go.mod: update libpod and godbus/dbus
+  * Move the creation of sourceCtx in Server.PullImage out of the loop
+  * Remove the imageAuthFile parameter to RuntimeServer.CreateContainer
+  * Set SystemContext.AuthFilePath in global Server.systemContext
+  * Set SystemContext.DockerRegistryUserAgent in global Server.systemContext
+  * Base copy.Options.{Source,Destination}Ctx both on the input systemContext
+  * Expect a non-nil copy.Options in ImageServer.PullImage
+  * Use a types.SystemContext instead of copy.Options in PrepareImage
+  * Use an explicit DockerInsecureSkipTLSVerify = types.OptionalBoolTrue
+  * Split imageService.remoteImageReference from prepareReference
+  * Simplify the handling of PullImageRequest.auth
+  * Build copy.Options.SourceCtx from Server.systemContext
+  * Add a buildImageResult helper to avoid duplicating the code
+  * Call buildImageCacheItem in ImageStatus
+  * Don't redundantly look up an already available store.Image
+  * Don't use path.join for docker references
+  * Remove redundant manifest parsing to get config digest
+  * Remove redundant calls to types.ImageSource.Size
+  * When looking up a local image by transport:name reference, use the 
tag/digest as well
+  * Use reference.Named.String() instead of open-coding it
+  * Use reference.ParseNormalizedNamed for parsing storage.Image.Names
+  * Don't modify the caller-provided SystemContext in server.New
+  * Remove `seccomp.json` and fallback to internal defaults
+  * Fix mockGetRef, and deal with all of the fallout
+  * Return mockSequence from mockListImage and mockLoop, use global inOrder 
everywhere
+  * Remove ImageServer.RemoveImage
+  * Rename mockToCreate to mockCreateContainerOrPodSandboxImageExists
+  * Add mockStorageImageSourceGetSize and mockNewImage
+  * Don't split the first gomock expecation into a BeforeEach
+  * Add mockGetStoreImage and mockResolveImage
+  * Add a shared mockParseStoreReference
+  * Add mockStorageReferenceStringWithinTransport and use it instead of 
open-coded sequences
+  * Add an inOrder helper
+  * Create a separate MockController for every test
+  * Remove duplicate Dockerfile's
+  * Discover runtimePath from $PATH environment
+  * Use GlobalAuthFile, incl. for the pause image if PauseImageAuthFile is not 
set
+  * Don't discard copy.Options.SourceCtx when credentials are provided
+  * Don't set non-default copy.Options in imageService.PullImage if it is nil
+  * Remove the *copy.Options parameter to 
RuntimeService.Create{PodSandbox,Container}
+  * Add global_auth_file option to crio.image config
+  * Remove the types.SystemContext parameter where no longer necessary
+  * Don't read registries.conf for the defaults of --registry and 
--insecure-registry
+  * Add state of infracontainer to disk when stopped
+  * Use repository logo instead of rawgit
+  * Exclude 'vendor' for git-validation checks
+  * Bump up minMemoryLimit to 12Mb
+  * enable inline exec and attach test
+  * Mark file_locking deprecated
+  * Disable file locking by default
+  * Add release bundle target
+  * Update dependency containerd/cgroups
+  * crio-wipe: fix readme nits
+  * conmon: force unlink attach socket
+  * Add junit test files to .gitignore
+  * Use *config.Config within OCI runtime
+  * Move lib.Config to a dedicated package
+  * Refactor sandbox and container name reservation
+  * Update dependencies
+  * Remove travis in favor of CircleCI
+  * Vendor Kubernetes v1.15.0
+  * Fix e2e_features_* selinux denials
+  * add vrothberg to OWNERS file
+  * Add documentation about the HTTP API
+  * Default to runc is default_runtime is not set
+  * Set default run root if not specified
+  * Fix redundant if in lib/rename.go
+  * Add codecov upload step to CircleCI config
+  * Add flake attempts to critest integration testing
+  * Add CircleCI badge
+  * Add live reload feature to pause configuration
+  * Update dependencies
+  * Rebase containers/image to 2.0.0, buildah to 1.8.4, libpod to 1.4.1
+  

commit cri-o for openSUSE:Factory

2019-06-12 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-06-12 13:04:08

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.4811 (New)


Package is "cri-o"

Wed Jun 12 13:04:08 2019 rev:30 rq:706320 version:1.14.1

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2019-05-22 
10:49:59.055372357 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.4811/cri-o.changes2019-06-12 
13:04:18.669233704 +0200
@@ -1,0 +2,5 @@
+Fri May 24 06:51:47 UTC 2019 - Sascha Grunert 
+
+- Add apparmor-parser as dependency
+
+---



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.puNVYe/_old  2019-06-12 13:04:19.425233386 +0200
+++ /var/tmp/diff_new_pack.puNVYe/_new  2019-06-12 13:04:19.433233383 +0200
@@ -54,6 +54,7 @@
 BuildRequires:  libgpgme-devel
 BuildRequires:  libseccomp-devel
 BuildRequires:  golang(API) >= 1.12
+Requires:   apparmor-parser
 Requires:   conntrack-tools
 Requires:   cni
 Requires:   cni-plugins




commit cri-o for openSUSE:Factory

2019-05-22 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-05-22 10:49:55

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.5148 (New)


Package is "cri-o"

Wed May 22 10:49:55 2019 rev:29 rq:703679 version:1.14.1

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2019-04-22 
12:23:30.404891835 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.5148/cri-o.changes2019-05-22 
10:49:59.055372357 +0200
@@ -1,0 +2,18 @@
+Thu May 16 07:28:09 UTC 2019 - Guillaume GARDET 
+
+- Add _constraints to avoid OOM
+
+---
+Thu May  9 14:24:05 UTC 2019 - Sascha Grunert 
+
+- Update cri-o to v1.14.1
+  * Add min memory limit check to sandbox_run_linux.go
+  * Fix crash when network namespace is not setup
+  * Log oom_handling_score failure to debug
+  * Fix possible out of bounds access during log parsing
+  * Fix sandbox segfault with manage_network_ns_lifecycle
+- Add registry-mirror.patch
+- Update repository paths from `kubernetes-sigs` to `cri-o`
+- Remove unnecessary ostree dependency
+
+---

Old:

  cri-o-1.14.0.tar.xz

New:

  _constraints
  cri-o-1.14.1.tar.xz
  registry-mirror.patch



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.X01ycN/_old  2019-05-22 10:50:00.983371786 +0200
+++ /var/tmp/diff_new_pack.X01ycN/_new  2019-05-22 10:50:00.983371786 +0200
@@ -21,22 +21,18 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
-%define project github.com/kubernetes-sigs/cri-o
-# Build with libostree-devel in Tumbleweed, Leap 15+ and SLES 15+
-%if 0%{?suse_version} >= 1500
-%define with_libostree 1
-%endif
+%define project github.com/cri-o/cri-o
 # Define macros for further referenced sources
 %definename_source1 crio.service
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.14.0
+Version:1.14.1
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0
 Group:  System/Management
-Url:https://github.com/kubernetes-sigs/cri-o
+Url:https://github.com/cri-o/cri-o
 ExcludeArch:i586
 Source0:%{name}-%{version}.tar.xz
 Source1:%{name_source1}
@@ -44,6 +40,7 @@
 Source3:%{name_source3}
 Source4:cri-o-rpmlintrc
 Source5:kubelet.env
+Patch0: registry-mirror.patch
 BuildRequires:  device-mapper-devel
 BuildRequires:  fdupes
 BuildRequires:  git-core
@@ -71,9 +68,6 @@
 Provides:   cri-runtime
 # disable stripping of binaries
 %{go_nostrip}
-%if 0%{?with_libostree}
-BuildRequires:  libostree-devel
-%endif
 
 %description
 CRI-O provides an integration path between OCI conformant runtimes
@@ -95,6 +89,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # We can't use symlinks here because go-list gets confused by symlinks, so we
@@ -106,10 +101,6 @@
 cd $HOME/go/src/%{project}
 
 export BUILDTAGS="seccomp apparmor containers_image_ostree_stub"
-%if 0%{?with_libostree}
-export BUILDTAGS="seccomp apparmor"
-echo "Compiling with libostree support"
-%endif
 
 # Build crio
 go build -tags "$BUILDTAGS" \
@@ -130,9 +121,6 @@
 cd $HOME/go/src/%{project}
 export GOPATH=$HOME/go
 export BUILDTAGS="seccomp apparmor containers_image_ostree_stub"
-%if 0%{?with_libostree}
-export BUILDTAGS="seccomp apparmor"
-%endif
 
 PKG_LIST=$(go list -tags "${BUILDTAGS}" ./... | \
grep -v %{project}/vendor} | \

++ _constraints ++


  

  2500

  

++ _service ++
--- /var/tmp/diff_new_pack.X01ycN/_old  2019-05-22 10:50:01.027371773 +0200
+++ /var/tmp/diff_new_pack.X01ycN/_new  2019-05-22 10:50:01.031371772 +0200
@@ -1,9 +1,9 @@
 
 
-https://github.com/kubernetes-sigs/cri-o
+https://github.com/cri-o/cri-o
 git
-1.14.0
-v1.14.0
+1.14.1
+v1.14.1
 
 
 cri-o-*.tar

++ cri-o-1.14.0.tar.xz -> cri-o-1.14.1.tar.xz ++
 30230 lines of diff (skipped)

++ crio.service ++
--- /var/tmp/diff_new_pack.X01ycN/_old  2019-05-22 10:50:03.675370990 +0200
+++ /var/tmp/diff_new_pack.X01ycN/_new  2019-05-22 10:50:03.675370990 +0200
@@ -1,6 +1,6 @@
 [Unit]
 Description=Open Container Initiative Daemon
-Documentation=https://github.com/kubernetes-sigs/cri-o
+Documentation=https://github.com/cri-o/cri-o
 After=network.target lwm2-monitor.service SuSEfirewall2.service
 
 [Service]

++ registry-mirror.patch ++
 7705 lines (skipped)




commit cri-o for openSUSE:Factory

2019-04-22 Thread root
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.changes2019-04-22 
12:23:30.404891835 +0200
@@ -1,0 +2,7 @@
+Thu Apr 18 16:45:33 UTC 2019 - Michal Rostecki 
+
+- 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"]




commit cri-o for openSUSE:Factory

2019-04-15 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-04-15 11:51:35

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.17052 (New)


Package is "cri-o"

Mon Apr 15 11:51:35 2019 rev:27 rq:693682 version:1.14.0

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2019-04-04 
12:03:39.897398077 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new.17052/cri-o.changes   2019-04-15 
11:51:39.070524746 +0200
@@ -1,0 +2,7 @@
+Fri Apr 12 08:31:53 UTC 2019 - Sascha Grunert 
+
+- Update the configuration to fallback to the storage driver
+  specified in libcontainers-common (`/etc/containers/storage.conf`)
+- Update go version to >= 1.12 to be in sync with upstream 
+
+---



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.1vy7lc/_old  2019-04-15 11:51:40.754525638 +0200
+++ /var/tmp/diff_new_pack.1vy7lc/_new  2019-04-15 11:51:40.790525657 +0200
@@ -56,8 +56,7 @@
 BuildRequires:  libbtrfs-devel
 BuildRequires:  libgpgme-devel
 BuildRequires:  libseccomp-devel
-BuildRequires:  golang(API) >= 1.11
-BuildRequires:  go >= 1.11.1
+BuildRequires:  golang(API) >= 1.12
 Requires:   conntrack-tools
 Requires:   cni
 Requires:   cni-plugins

++ crio.conf ++
--- /var/tmp/diff_new_pack.1vy7lc/_old  2019-04-15 11:51:41.114525829 +0200
+++ /var/tmp/diff_new_pack.1vy7lc/_new  2019-04-15 11:51:41.118525831 +0200
@@ -20,7 +20,7 @@
 
 # Storage driver used to manage the storage of images and containers. Please
 # refer to containers-storage.conf(5) to see all available storage drivers.
-storage_driver = "btrfs"
+#storage_driver = "btrfs"
 
 # List to pass options to the storage driver. Please refer to
 # containers-storage.conf(5) to see all available storage options.




commit cri-o for openSUSE:Factory

2019-04-04 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-04-04 12:03:10

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.3908 (New)


Package is "cri-o"

Thu Apr  4 12:03:10 2019 rev:26 rq:690560 version:1.14.0

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2019-03-27 
16:11:21.571668209 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new.3908/cri-o.changes2019-04-04 
12:03:39.897398077 +0200
@@ -1,0 +2,14 @@
+Mon Apr  1 20:53:10 UTC 2019 - Flavio Castelli 
+
+- Introduce new runtime dependency conntrack-tools: the conntrack
+  package is required to avoid failures in network connection cleanup.
+
+---
+Fri Mar 29 18:27:18 UTC 2019 - Flavio Castelli 
+
+- Update cri-o to v1.14.0
+  * Fix possible out of bounds access during log parsing
+- Update default configuration file: crio.network.plugin_dir is now
+  a list instead of being a string
+
+---

Old:

  cri-o-1.13.3.tar.xz

New:

  cri-o-1.14.0.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.YtWnPJ/_old  2019-04-04 12:03:44.489399550 +0200
+++ /var/tmp/diff_new_pack.YtWnPJ/_new  2019-04-04 12:03:44.489399550 +0200
@@ -31,7 +31,7 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.13.3
+Version:1.14.0
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0
@@ -58,6 +58,7 @@
 BuildRequires:  libseccomp-devel
 BuildRequires:  golang(API) >= 1.11
 BuildRequires:  go >= 1.11.1
+Requires:   conntrack-tools
 Requires:   cni
 Requires:   cni-plugins
 Requires:   iproute2

++ _service ++
--- /var/tmp/diff_new_pack.YtWnPJ/_old  2019-04-04 12:03:44.517399559 +0200
+++ /var/tmp/diff_new_pack.YtWnPJ/_new  2019-04-04 12:03:44.521399560 +0200
@@ -2,8 +2,8 @@
 
 https://github.com/kubernetes-sigs/cri-o
 git
-1.13.3
-v1.13.3
+1.14.0
+v1.14.0
 
 
 cri-o-*.tar

++ cri-o-1.13.3.tar.xz -> cri-o-1.14.0.tar.xz ++
 574716 lines of diff (skipped)

++ crio.conf ++
--- /var/tmp/diff_new_pack.YtWnPJ/_old  2019-04-04 12:03:46.637400239 +0200
+++ /var/tmp/diff_new_pack.YtWnPJ/_new  2019-04-04 12:03:46.637400239 +0200
@@ -194,13 +194,13 @@
 # regarding the proper termination of the container.
 ctr_stop_timeout = 0
 
-  # The "crio.runtime.runtimes" table defines a list of OCI compatible 
runtimes.
-  # The runtime to use is picked based on the runtime_handler provided by the 
CRI.
-  # If no runtime_handler is provided, the runtime will be picked based on the 
level
-  # of trust of the workload.
+# The "crio.runtime.runtimes" table defines a list of OCI compatible runtimes.
+# The runtime to use is picked based on the runtime_handler provided by the 
CRI.
+# If no runtime_handler is provided, the runtime will be picked based on the 
level
+# of trust of the workload.
 
-  [crio.runtime.runtimes.runc]
-  runtime_path = "/usr/sbin/runc"
+[crio.runtime.runtimes.runc]
+runtime_path = "/usr/sbin/runc"
 
 
 
@@ -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"]




commit cri-o for openSUSE:Factory

2019-03-27 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-03-27 16:11:19

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.25356 (New)


Package is "cri-o"

Wed Mar 27 16:11:19 2019 rev:25 rq:685952 version:1.13.3

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2019-02-27 
21:11:56.911193673 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new.25356/cri-o.changes   2019-03-27 
16:11:21.571668209 +0100
@@ -1,0 +2,12 @@
+Mon Mar 18 08:25:28 UTC 2019 - Sascha Grunert 
+
+- Update cri-o to v1.13.3
+  * Always set gid if returned from container user files
+  * server: delete the container if it cannot be restored
+  * Bump github.com/containers/storage to v1.11
+  * Add support for host ip configuration
+  * Pause credentials 1.13
+  * Allow device mounting to work in privileged mode
+  * Fix detach non tty
+
+---

Old:

  cri-o-1.13.1.tar.xz

New:

  cri-o-1.13.3.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.oJFn0h/_old  2019-03-27 16:11:22.191668050 +0100
+++ /var/tmp/diff_new_pack.oJFn0h/_new  2019-03-27 16:11:22.195668049 +0100
@@ -31,7 +31,7 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.13.1
+Version:1.13.3
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.oJFn0h/_old  2019-03-27 16:11:22.219668043 +0100
+++ /var/tmp/diff_new_pack.oJFn0h/_new  2019-03-27 16:11:22.219668043 +0100
@@ -2,8 +2,8 @@
 
 https://github.com/kubernetes-sigs/cri-o
 git
-1.13.1
-v1.13.1
+1.13.3
+v1.13.3
 
 
 cri-o-*.tar

++ cri-o-1.13.1.tar.xz -> cri-o-1.13.3.tar.xz ++
 2043 lines of diff (skipped)




commit cri-o for openSUSE:Factory

2019-02-27 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2019-02-27 21:11:55

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.28833 (New)


Package is "cri-o"

Wed Feb 27 21:11:55 2019 rev:24 rq:679428 version:1.13.1

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-12-21 
08:18:29.645734229 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new.28833/cri-o.changes   2019-02-27 
21:11:56.911193673 +0100
@@ -1,0 +2,9 @@
+Tue Feb 26 17:11:40 UTC 2019 - Richard Brown 
+
+- Update cri-o to v1.13.1
+  * container: fix potential segfault on setup failure
+  * container_create: fix race with sandbox being stopped
+  * oci: read conmon process status
+  * oci: Extend container stop timeout 
+
+---

Old:

  cri-o-1.13.0.tar.xz

New:

  cri-o-1.13.1.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.o7ABJQ/_old  2019-02-27 21:11:57.587193536 +0100
+++ /var/tmp/diff_new_pack.o7ABJQ/_new  2019-02-27 21:11:57.591193536 +0100
@@ -31,7 +31,7 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.13.0
+Version:1.13.1
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.o7ABJQ/_old  2019-02-27 21:11:57.619193530 +0100
+++ /var/tmp/diff_new_pack.o7ABJQ/_new  2019-02-27 21:11:57.619193530 +0100
@@ -2,8 +2,8 @@
 
 https://github.com/kubernetes-sigs/cri-o
 git
-1.13.0
-v1.13.0
+1.13.1
+v1.13.1
 
 
 cri-o-*.tar

++ cri-o-1.13.0.tar.xz -> cri-o-1.13.1.tar.xz ++
 28332 lines of diff (skipped)




commit cri-o for openSUSE:Factory

2018-12-20 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-12-21 08:18:28

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.28833 (New)


Package is "cri-o"

Fri Dec 21 08:18:28 2018 rev:23 rq:658861 version:1.13.0

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-12-10 
12:28:19.838527438 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new.28833/cri-o.changes   2018-12-21 
08:18:29.645734229 +0100
@@ -1,0 +2,6 @@
+Fri Dec 14 10:00:17 UTC 2018 - Sascha Grunert 
+
+- Update cri-o deprecated configuration and documentation to match
+  upstream
+
+---



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.shYNxv/_old  2018-12-21 08:18:30.477733451 +0100
+++ /var/tmp/diff_new_pack.shYNxv/_new  2018-12-21 08:18:30.481733447 +0100
@@ -91,7 +91,7 @@
 Conflicts:  docker-kubic-kubeadm-criconfig
 
 %description kubeadm-criconfig
-CRI-O container runtime configuration for kubeadm
+This package provides the CRI-O container runtime configuration for kubeadm
 
 %prep
 %setup -q

++ _service ++
--- /var/tmp/diff_new_pack.shYNxv/_old  2018-12-21 08:18:30.521733409 +0100
+++ /var/tmp/diff_new_pack.shYNxv/_new  2018-12-21 08:18:30.521733409 +0100
@@ -2,8 +2,8 @@
 
 https://github.com/kubernetes-sigs/cri-o
 git
-1.12.1
-v1.12.1
+1.13.0
+v1.13.0
 
 
 cri-o-*.tar

++ cri-o-rpmlintrc ++
--- /var/tmp/diff_new_pack.shYNxv/_old  2018-12-21 08:18:30.545733387 +0100
+++ /var/tmp/diff_new_pack.shYNxv/_new  2018-12-21 08:18:30.545733387 +0100
@@ -4,3 +4,7 @@
 addFilter (".* W: statically-linked-binary /usr/lib/crio/bin/pause")
 addFilter (".* W: position-independent-executable-suggested 
/usr/lib/crio/bin/conmon")
 addFilter (".* W: position-independent-executable-suggested 
/usr/lib/crio/bin/pause")
+addFilter (".* W: unstripped-binary-or-object /usr/bin/crio")
+addFilter (".* W: unstripped-binary-or-object /usr/lib/crio/bin/conmon")
+addFilter (".* W: unstripped-binary-or-object /usr/lib/crio/bin/pause")
+addFilter ("no-version-in-last-changelog")

++ crio.conf ++
--- /var/tmp/diff_new_pack.shYNxv/_old  2018-12-21 08:18:30.569733365 +0100
+++ /var/tmp/diff_new_pack.shYNxv/_new  2018-12-21 08:18:30.573733361 +0100
@@ -1,129 +1,112 @@
-# The "crio" table contains all of the server options.
-[crio]
 
-# CRI-O reads its storage defaults from the containers/storage configuration
-# file, /etc/containers/storage.conf. Modify storage.conf if you want to
-# change default storage for all tools that use containers/storage.  If you
-# want to modify just crio, you can change the storage configuration in this
-# file.
+# The CRI-O configuration file specifies all of the available configuration
+# options and command-line flags for the crio(8) OCI Kubernetes Container 
Runtime
+# daemon, but in a TOML format that can be more easily modified and versioned.
+#
+# Please refer to crio.conf(5) for details of all configuration options.
+
+# CRI-O reads its storage defaults from the containers-storage.conf(5) file
+# located at /etc/containers/storage.conf. Modify this storage configuration if
+# you want to change the system's defaults. If you want to modify storage just
+# for CRI-O, you can change the storage configuration options here.
+[crio]
 
-# root is a path to the "root directory". CRIO stores all of its data,
-# including container images, in this directory.
+# Path to the "root directory". CRI-O stores all of its data, including
+# containers images, in this directory.
 #root = "/var/lib/containers/storage"
 
-# run is a path to the "run directory". CRIO stores all of its state
-# in this directory.
+# Path to the "run directory". CRI-O stores all of its state in this directory.
 #runroot = "/var/run/containers/storage"
 
-# storage_driver select which storage driver is used to manage storage
-# of images and containers.
+# Storage driver used to manage the storage of images and containers. Please
+# refer to containers-storage.conf(5) to see all available storage drivers.
 storage_driver = "btrfs"
 
-# storage_option is used to pass an option to the storage driver.
+# List to pass options to the storage driver. Please refer to
+# containers-storage.conf(5) to see all available storage options.
 #storage_option = [
 #]
 
-# file_locking is whether file-based locking will be used instead of
-# in-memory locking
+# If set to false, in-memory locking will be used instead of file-based 
locking.
 file_locking = true
 
-# file_locking_path is the file used for file-based locking
+# Path to the lock file.
 file_locking_path = "/run/crio.lock"
 
-# The "crio.api" table contains 

commit cri-o for openSUSE:Factory

2018-12-10 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-12-10 12:28:18

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.19453 (New)


Package is "cri-o"

Mon Dec 10 12:28:18 2018 rev:22 rq:656022 version:1.13.0

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-11-20 
22:28:46.874729004 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new.19453/cri-o.changes   2018-12-10 
12:28:19.838527438 +0100
@@ -1,0 +2,6 @@
+Fri Dec  7 10:55:38 UTC 2018 - Richard Brown 
+
+- Update cri-o to v1.13.0:
+  * Support kubernetes 1.13 
+
+---

Old:

  cri-o-1.12.1.tar.xz

New:

  cri-o-1.13.0.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.JOiPax/_old  2018-12-10 12:28:20.670526606 +0100
+++ /var/tmp/diff_new_pack.JOiPax/_new  2018-12-10 12:28:20.674526602 +0100
@@ -31,7 +31,7 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.12.1
+Version:1.13.0
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0
@@ -56,7 +56,8 @@
 BuildRequires:  libbtrfs-devel
 BuildRequires:  libgpgme-devel
 BuildRequires:  libseccomp-devel
-BuildRequires:  golang(API) >= 1.10
+BuildRequires:  golang(API) >= 1.11
+BuildRequires:  go >= 1.11.1
 Requires:   cni
 Requires:   cni-plugins
 Requires:   iproute2
@@ -64,7 +65,7 @@
 Requires:   libcontainers-common
 Requires:   libcontainers-image
 Requires:   libcontainers-storage
-Requires:   runc >= 1.0.0~rc4
+Requires:   runc >= 1.0.0~rc6
 Requires:   socat
 # Provide generic cri-runtime dependency (needed by kubernetes)
 Provides:   cri-runtime

++ cri-o-1.12.1.tar.xz -> cri-o-1.13.0.tar.xz ++
 95638 lines of diff (skipped)




commit cri-o for openSUSE:Factory

2018-11-20 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-11-20 22:28:38

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new.19453 (New)


Package is "cri-o"

Tue Nov 20 22:28:38 2018 rev:21 rq:650125 version:1.12.1

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-11-13 
16:22:32.234980158 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new.19453/cri-o.changes   2018-11-20 
22:28:46.874729004 +0100
@@ -1,0 +2,11 @@
+Mon Nov 19 08:07:35 UTC 2018 - Valentin Rothberg 
+
+- Update cri-o to v1.12.1:
+  * Remove nodev from mounts
+  * vendor: update storage for a panic fix
+  * container_create: fix dev mounts and remove nodev from /dev mounts
+  * Use CurrentContainerStatus in list CRI calls
+  * oci: Add CurrentContainerStatus API
+  * conmon: fsync the log file
+
+---

Old:

  cri-o-1.12.0.tar.xz

New:

  cri-o-1.12.1.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.VDd59l/_old  2018-11-20 22:28:48.954727768 +0100
+++ /var/tmp/diff_new_pack.VDd59l/_new  2018-11-20 22:28:48.954727768 +0100
@@ -31,7 +31,7 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.12.0
+Version:1.12.1
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.VDd59l/_old  2018-11-20 22:28:48.994727745 +0100
+++ /var/tmp/diff_new_pack.VDd59l/_new  2018-11-20 22:28:48.994727745 +0100
@@ -2,8 +2,8 @@
 
 https://github.com/kubernetes-sigs/cri-o
 git
-1.12.0
-v1.12.0
+1.12.1
+v1.12.1
 
 
 cri-o-*.tar

++ cri-o-1.12.0.tar.xz -> cri-o-1.12.1.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cri-o-1.12.0/Makefile new/cri-o-1.12.1/Makefile
--- old/cri-o-1.12.0/Makefile   2018-10-18 11:54:08.0 +0200
+++ new/cri-o-1.12.1/Makefile   2018-11-12 23:05:14.0 +0100
@@ -106,7 +106,7 @@
./bin/crio --config="" config --default > crio.conf
 
 release-note:
-   @$(GOPATH)/bin/containerd-release -n $(release)
+   @$(GOPATH)/bin/release-tool -n $(release)
 
 conmon/config.h: cmd/crio-config/config.go oci/oci.go
$(GO) build -i $(LDFLAGS) -o bin/crio-config $(PROJECT)/cmd/crio-config
@@ -221,8 +221,8 @@
 install.tools: .install.gitvalidation .install.gometalinter .install.md2man 
.install.release
 
 .install.release:
-   if [ ! -x "$(GOPATH)/bin/containerd-release" ]; then \
-   go get -u 
github.com/containerd/containerd/cmd/containerd-release; \
+   if [ ! -x "$(GOPATH)/bin/release-tool" ]; then \
+   go get -u github.com/containerd/project/cmd/release-tool; \
fi
 
 .install.gitvalidation: .gopathok
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cri-o-1.12.0/conmon/conmon.c 
new/cri-o-1.12.1/conmon/conmon.c
--- old/cri-o-1.12.0/conmon/conmon.c2018-10-18 11:54:08.0 +0200
+++ new/cri-o-1.12.1/conmon/conmon.c2018-11-12 23:05:14.0 +0100
@@ -156,6 +156,13 @@
exit(EXIT_FAILURE); \
} while (0)
 
+#define pwarn(s) \
+   do { \
+   fprintf(stderr, "[conmon:w]: %s %s\n", s, strerror(errno)); \
+   if (opt_syslog) \
+   syslog(LOG_INFO, "conmon %.20s : %s %s\n", 
opt_cid, s, strerror(errno)); \
+   } while (0)
+
 #define nexit(s) \
do { \
fprintf(stderr, "[conmon:e] %s\n", s); \
@@ -398,6 +405,11 @@
 {
_cleanup_free_ char *opt_log_path_tmp = g_strdup_printf("%s.tmp", 
opt_log_path);
 
+   /* Sync the logs to disk */
+   if (fsync(log_fd) < 0) {
+   pwarn("Failed to sync log file on reopen");
+   }
+
/* Close the current log_fd */
close(log_fd);
 
@@ -1723,6 +1735,13 @@
;
}
 
+   /* Sync the logs to disk */
+   if (log_fd > 0) {
+   if (fsync(log_fd) < 0) {
+   pwarn("Failed to sync log file before exit");
+   }
+   }
+
int exit_status = -1;
const char *exit_message = NULL;
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cri-o-1.12.0/oci/oci.go new/cri-o-1.12.1/oci/oci.go
--- old/cri-o-1.12.0/oci/oci.go 2018-10-18 11:54:08.0 +0200
+++ new/cri-o-1.12.1/oci/oci.go 2018-11-12 23:05:14.0 +0100
@@ -897,6 +897,11 @@
return c.state
 }
 
+// CurrentContainerStatus returns the state of a 

commit cri-o for openSUSE:Factory

2018-11-13 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-11-13 16:22:28

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Tue Nov 13 16:22:28 2018 rev:20 rq:646997 version:1.12.0

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-11-06 
13:48:42.248715877 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-11-13 
16:22:32.234980158 +0100
@@ -1,0 +2,7 @@
+Wed Nov  7 13:33:14 UTC 2018 - Valentin Rothberg 
+
+- Set NOFILE and NPROC limit to 1048576 to align with Docker/containerd
+  and the upstream unit file.
+  Fix bsc#1112980
+
+---



Other differences:
--
++ crio.service ++
--- /var/tmp/diff_new_pack.vOqL0C/_old  2018-11-13 16:22:32.862979060 +0100
+++ /var/tmp/diff_new_pack.vOqL0C/_new  2018-11-13 16:22:32.862979060 +0100
@@ -11,8 +11,8 @@
 ExecReload=/bin/kill -s HUP $MAINPID
 
 TasksMax=infinity
-LimitNOFILE=infinity
-LimitNPROC=infinity
+LimitNOFILE=1048576
+LimitNPROC=1048576
 LimitCORE=infinity
 
 # Set delegate yes so that systemd does not reset the cgroups of containers.




commit cri-o for openSUSE:Factory

2018-11-06 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-11-06 13:48:38

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Tue Nov  6 13:48:38 2018 rev:19 rq:643136 version:1.12.0

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-10-11 
11:45:01.866818934 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-11-06 
13:48:42.248715877 +0100
@@ -1,0 +2,21 @@
+Fri Oct 19 06:59:18 UTC 2018 - Valentin Rothberg 
+
+- Update cri-o to v1.12.0:
+  * docs: tweak crio and crio.conf man pages
+  * config: provide a default runtime and deprecate the runtime option
+  * cri: Implement runtime handler support
+  * *: implement default ulimits for containers
+  * Fix manpage to correctly state default storage driver
+  * crio.conf(5): update manpage to the latest state
+  * Remove sysctl parsing code from cri-o
+  * Add default_systcls option to crio.conf
+  * Image Volumes should be bind mounted as private
+  * Create LICENSE
+  * conmon: fix segfault when --log-level is not specified
+  * Add log-level option to conmon and crio.conf
+  * Remove "--log-level debug" from service file
+  * conmon: close extra files before exit
+  * Block use of /proc/acpi from inside containers
+  * conmon: do not use an empty env when running the exit command
+
+---

Old:

  cri-o-1.11.2.tar.xz
  go-1.11-compat-backport.patch

New:

  cri-o-1.12.0.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.IZWXEv/_old  2018-11-06 13:48:43.396714322 +0100
+++ /var/tmp/diff_new_pack.IZWXEv/_new  2018-11-06 13:48:43.396714322 +0100
@@ -21,7 +21,7 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
-%define project github.com/kubernetes-incubator/cri-o
+%define project github.com/kubernetes-sigs/cri-o
 # Build with libostree-devel in Tumbleweed, Leap 15+ and SLES 15+
 %if 0%{?suse_version} >= 1500
 %define with_libostree 1
@@ -31,12 +31,12 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.11.2
+Version:1.12.0
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0
 Group:  System/Management
-Url:https://github.com/kubernetes-incubator/cri-o
+Url:https://github.com/kubernetes-sigs/cri-o
 ExcludeArch:i586
 Source0:%{name}-%{version}.tar.xz
 Source1:%{name_source1}
@@ -44,7 +44,6 @@
 Source3:%{name_source3}
 Source4:cri-o-rpmlintrc
 Source5:kubelet.env
-Patch0: go-1.11-compat-backport.patch
 BuildRequires:  device-mapper-devel
 BuildRequires:  fdupes
 BuildRequires:  git-core
@@ -57,7 +56,7 @@
 BuildRequires:  libbtrfs-devel
 BuildRequires:  libgpgme-devel
 BuildRequires:  libseccomp-devel
-BuildRequires:  golang(API) >= 1.8
+BuildRequires:  golang(API) >= 1.10
 Requires:   cni
 Requires:   cni-plugins
 Requires:   iproute2
@@ -95,7 +94,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 # We can't use symlinks here because go-list gets confused by symlinks, so we

++ _service ++
--- /var/tmp/diff_new_pack.IZWXEv/_old  2018-11-06 13:48:43.440714263 +0100
+++ /var/tmp/diff_new_pack.IZWXEv/_new  2018-11-06 13:48:43.440714263 +0100
@@ -1,9 +1,9 @@
 
 
-https://github.com/kubernetes-incubator/cri-o
+https://github.com/kubernetes-sigs/cri-o
 git
-1.11.2
-v1.11.2
+1.12.0
+v1.12.0
 
 
 cri-o-*.tar

++ cri-o-1.11.2.tar.xz -> cri-o-1.12.0.tar.xz ++
 164998 lines of diff (skipped)




commit cri-o for openSUSE:Factory

2018-10-11 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-10-11 11:44:48

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Thu Oct 11 11:44:48 2018 rev:18 rq:640756 version:1.11.2

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-09-05 
13:45:10.673926359 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-10-11 
11:45:01.866818934 +0200
@@ -1,0 +2,35 @@
+Mon Oct  8 15:06:24 UTC 2018 - Jeff Kowalczyk 
+
+- Add go-1.11-compat-backport.patch for go1.11 compatibility.
+  * Tested with golang(API) == 1.10 and golang(API) == 1.11, OK
+  * Upstream git master commit
+
https://github.com/kubernetes-sigs/cri-o/commit/0bd30872028b5ed2d0eb7febb39f034b5f2da72a
+contains 1 hunk adding missing argument in format string of
+calls to:
+
+# github.com/kubernetes-incubator/cri-o/lib
+lib/container_server.go:309: Debugf call needs 1 arg but has 2 args
+lib/container_server.go:317: Debugf call needs 1 arg but has 2 args
+...
+FAIL   github.com/kubernetes-incubator/cri-o/lib [build failed]
+
+Calls in question:
+
+logrus.Debugf("loaded new pod sandbox %s", sandboxID, err)
+logrus.Debugf("loaded new pod container %s", containerID, err)
+
+require another argument to the string format (": %v" per upstream):
+
+logrus.Debugf("loaded new pod sandbox %s: %v", sandboxID, err)
+logrus.Debugf("loaded new pod container %s: %v", containerID, err)
+
+Patch contents not available in upstream cri-o released versions:
+cri-o-1.11.3
+cri-o-1.11.4
+cri-o-1.11.5
+cri-o-1.11.6
+
+Filed upstream issue requesting patch contents in released version:
+https://github.com/kubernetes-sigs/cri-o/issues/1827
+
+---

New:

  go-1.11-compat-backport.patch



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.EUCerY/_old  2018-10-11 11:45:03.466816898 +0200
+++ /var/tmp/diff_new_pack.EUCerY/_new  2018-10-11 11:45:03.470816893 +0200
@@ -44,6 +44,7 @@
 Source3:%{name_source3}
 Source4:cri-o-rpmlintrc
 Source5:kubelet.env
+Patch0: go-1.11-compat-backport.patch
 BuildRequires:  device-mapper-devel
 BuildRequires:  fdupes
 BuildRequires:  git-core
@@ -94,6 +95,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 # We can't use symlinks here because go-list gets confused by symlinks, so we

++ go-1.11-compat-backport.patch ++
--- lib/container_server.go.orig2018-08-16 14:34:51.0 -0700
+++ lib/container_server.go 2018-10-05 12:28:47.081370224 -0700
@@ -306,7 +306,7 @@ func (c *ContainerServer) Update() error
if err = c.LoadSandbox(sandboxID); err != nil {
logrus.Warnf("could not load new pod sandbox %s: %v, 
ignoring", sandboxID, err)
} else {
-   logrus.Debugf("loaded new pod sandbox %s", sandboxID, 
err)
+   logrus.Debugf("loaded new pod sandbox %s: %v", 
sandboxID, err)
}
}
for containerID := range newPodContainers {
@@ -314,7 +314,7 @@ func (c *ContainerServer) Update() error
if err = c.LoadContainer(containerID); err != nil {
logrus.Warnf("could not load new sandbox container %s: 
%v, ignoring", containerID, err)
} else {
-   logrus.Debugf("loaded new pod container %s", 
containerID, err)
+   logrus.Debugf("loaded new pod container %s: %v", 
containerID, err)
}
}
return nil



commit cri-o for openSUSE:Factory

2018-09-05 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-09-05 13:45:09

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Wed Sep  5 13:45:09 2018 rev:17 rq:630742 version:1.11.2

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-08-15 
10:38:24.912293926 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-09-05 
13:45:10.673926359 +0200
@@ -1,0 +2,47 @@
+Tue Aug 21 10:15:15 UTC 2018 - rbr...@suse.com
+
+- cri-o-kubeadm-criconfig: correct conflicts with docker-kubic 
+
+---
+Tue Aug 21 09:34:24 UTC 2018 - rbr...@suse.com
+
+- cri-o-kubeadm-criconfig: Remove /etc/kubernetes/runtime.conf,
+  replace with /etc/sysconfig/kublet
+
+---
+Mon Aug 20 08:19:09 UTC 2018 - vrothb...@suse.com
+
+- Update crio.conf to be as close to the default one as possible:
+  * Extend crio.conf with all previously missing options; crio.conf(5) isn't
+mentioning all of them which soon will be fixed.
+  * Uncomment options to use /etc/containers/{registries,storage}.conf where
+appropriate.
+
+- Remove Fix-AppArmor-build.patch as the build issue is fixed with v1.11.2.
+
+- Update cri-o to v1.11.2:
+  * Fix AppArmor build
+  * Image Volumes should be bind mounted as private
+  * container_create: Set a minimum memory limit
+  * Add log-level option to conmon and crio.conf
+  * server/container_create: error out if capability is unknown
+
+---
+Fri Aug 17 12:25:48 UTC 2018 - vrothb...@suse.com
+
+- Add "docker.io" to the registries list in the crio.conf to enable
+  pulling of unqualified images by default.
+
+---
+Thu Aug 16 11:52:43 UTC 2018 - rbr...@suse.com
+
+- ExcludeArch i586 (does not build, nor makes sense for that arch)
+
+---
+Tue Aug 14 16:38:53 UTC 2018 - rbr...@suse.com
+
+- Make crio default, docker as alternative runtime (boo#1104821)
+- Configure kubernetes CRI runtime with $runtime-kubeadm-criconfig
+  packages 
+
+---

Old:

  Fix-AppArmor-build.patch
  cri-o-1.11.1.tar.xz

New:

  cri-o-1.11.2.tar.xz
  kubelet.env



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.PKtmbJ/_old  2018-09-05 13:45:11.689927871 +0200
+++ /var/tmp/diff_new_pack.PKtmbJ/_new  2018-09-05 13:45:11.693927878 +0200
@@ -31,19 +31,19 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.11.1
+Version:1.11.2
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0
 Group:  System/Management
 Url:https://github.com/kubernetes-incubator/cri-o
+ExcludeArch:i586
 Source0:%{name}-%{version}.tar.xz
 Source1:%{name_source1}
 Source2:%{name_source2}
 Source3:%{name_source3}
 Source4:cri-o-rpmlintrc
-# Upstream PR: https://github.com/kubernetes-incubator/cri-o/pull/1718
-Patch0: Fix-AppArmor-build.patch
+Source5:kubelet.env
 BuildRequires:  device-mapper-devel
 BuildRequires:  fdupes
 BuildRequires:  git-core
@@ -66,6 +66,8 @@
 Requires:   libcontainers-storage
 Requires:   runc >= 1.0.0~rc4
 Requires:   socat
+# Provide generic cri-runtime dependency (needed by kubernetes)
+Provides:   cri-runtime
 # disable stripping of binaries
 %{go_nostrip}
 %if 0%{?with_libostree}
@@ -78,9 +80,20 @@
 Interface (CRI) using OCI conformant runtimes. The scope of CRI-O is tied to
 the scope of the CRI.
 
+%package kubeadm-criconfig
+Summary:CRI-O container runtime configuration for kubeadm
+Group:  System/Management
+Requires:   kubernetes-kubeadm
+Requires(post): %fillup_prereq
+Supplements:cri-o
+Provides:   kubernetes-kubeadm-criconfig
+Conflicts:  docker-kubic-kubeadm-criconfig
+
+%description kubeadm-criconfig
+CRI-O container runtime configuration for kubeadm
+
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 # We can't use symlinks here because go-list gets confused by symlinks, so we
@@ -131,6 +144,9 @@
 %post
 %service_add_post %{name_source1}
 
+%post kubeadm-criconfig
+%fillup_only -n kubelet
+
 %preun
 %service_del_preun %{name_source1}
 
@@ -157,6 +173,8 @@
 install -D -m 0644 %{SOURCE2}   %{buildroot}%{_fillupdir}/%{name_source2}
 # Systemd
 install -D -m 0644 

commit cri-o for openSUSE:Factory

2018-08-15 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-08-15 10:38:23

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Wed Aug 15 10:38:23 2018 rev:16 rq:629197 version:1.11.1

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-07-10 
16:17:58.257300211 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-08-15 
10:38:24.912293926 +0200
@@ -1,0 +2,19 @@
+Tue Aug 14 09:03:49 UTC 2018 - rbr...@suse.com
+
+- Use btrfs storage driver to be consistant with other supported
+  runtimes 
+
+---
+Thu Aug  2 08:52:41 UTC 2018 - vrothb...@suse.com
+
+- Do not provide `/etc/crictl.yaml` anymore.  Although being shipped by
+  upstream this package belongs into the `cri-tools` package.
+  bsc#1104598
+
+- add Fix-AppArmor-build.patch to temporarily fix apparmor builds
+
+- Update cri-o to v1.11.1:
+  * server: Don't make additional copy of config.json
+  * cri-tools: Use release-1.11 branch
+
+---

Old:

  cri-o-1.10.6.tar.xz

New:

  Fix-AppArmor-build.patch
  cri-o-1.11.1.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.f2varG/_old  2018-08-15 10:38:25.696295356 +0200
+++ /var/tmp/diff_new_pack.f2varG/_new  2018-08-15 10:38:25.696295356 +0200
@@ -31,7 +31,7 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.10.6
+Version:1.11.1
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0
@@ -42,6 +42,8 @@
 Source2:%{name_source2}
 Source3:%{name_source3}
 Source4:cri-o-rpmlintrc
+# Upstream PR: https://github.com/kubernetes-incubator/cri-o/pull/1718
+Patch0: Fix-AppArmor-build.patch
 BuildRequires:  device-mapper-devel
 BuildRequires:  fdupes
 BuildRequires:  git-core
@@ -78,6 +80,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # We can't use symlinks here because go-list gets confused by symlinks, so we
@@ -101,10 +104,10 @@
  %{project}/cmd/crio
 
 # Build conmon
-make conmon
+make bin/conmon
 
 # Build pause
-make pause
+make bin/pause
 
 # Build manpages
 make %{?_smp_mflags} docs
@@ -151,7 +154,6 @@
 install -D -m 0644 %{SOURCE3}   
%{buildroot}/%{_sysconfdir}/crio/%{name_source3}
 install -D -m 0644 seccomp.json 
%{buildroot}/%{_sysconfdir}/crio/seccomp.json
 install -D -m 0644 crio-umount.conf 
%{buildroot}/%{_datadir}/oci-umount/oci-umount.d/cri-umount.conf
-install -D -m 0644 crictl.yaml  %{buildroot}/%{_sysconfdir}/crictl.yaml
 install -D -m 0644 %{SOURCE2}   %{buildroot}%{_fillupdir}/%{name_source2}
 # Systemd
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name_source1}
@@ -180,7 +182,6 @@
 %dir %{_datadir}/oci-umount
 %dir %{_datadir}/oci-umount/oci-umount.d
 %{_datadir}/oci-umount/oci-umount.d/cri-umount.conf
-%config(noreplace) %{_sysconfdir}/crictl.yaml
 %{_fillupdir}/%{name_source2}
 # Systemd
 %{_unitdir}/%{name_source1}

++ Fix-AppArmor-build.patch ++
>From eb1a05f57dd01771862884de9ee737b98fe26e44 Mon Sep 17 00:00:00 2001
From: Valentin Rothberg 
Date: Thu, 2 Aug 2018 11:38:34 +0200
Subject: [PATCH] Fix AppArmor build

Signed-off-by: Valentin Rothberg 
---
 pkg/apparmor/apparmor_supported.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/apparmor/apparmor_supported.go 
b/pkg/apparmor/apparmor_supported.go
index 49360470de31..be29ed024d99 100644
--- a/pkg/apparmor/apparmor_supported.go
+++ b/pkg/apparmor/apparmor_supported.go
@@ -10,8 +10,8 @@ import (
"os"
"path"
"strings"
+   "text/template"
 
-   "github.com/docker/docker/pkg/templates"
"github.com/opencontainers/runc/libcontainer/apparmor"
 )
 
@@ -108,7 +108,7 @@ func IsLoaded(name string) (bool, error) {
 
 // generateDefault creates an apparmor profile from ProfileData.
 func (p *profileData) generateDefault(out io.Writer) error {
-   compiled, err := templates.NewParse("apparmor_profile", baseTemplate)
+   compiled, err := template.New("apparmor_profile").Parse(baseTemplate)
if err != nil {
return err
}
-- 
2.16.4

++ _service ++
--- /var/tmp/diff_new_pack.f2varG/_old  2018-08-15 10:38:25.732295422 +0200
+++ /var/tmp/diff_new_pack.f2varG/_new  2018-08-15 10:38:25.732295422 +0200
@@ -2,8 +2,8 @@
 
 https://github.com/kubernetes-incubator/cri-o
 git
-1.10.6
-v1.10.6
+1.11.1
+v1.11.1
 
 
 cri-o-*.tar

++ cri-o-1.10.6.tar.xz -> 

commit cri-o for openSUSE:Factory

2018-07-10 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-07-10 16:17:00

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Tue Jul 10 16:17:00 2018 rev:15 rq:621831 version:1.10.6

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-07-02 
23:33:47.829223525 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-07-10 
16:17:58.257300211 +0200
@@ -1,0 +2,6 @@
+Tue Jul 10 05:52:56 UTC 2018 - vrothb...@suse.com
+
+- Update cri-o to v1.10.6:
+  * mask /proc/{acpi,keys}
+
+---

Old:

  cri-o-1.10.5.tar.xz

New:

  cri-o-1.10.6.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.Npldm6/_old  2018-07-10 16:17:58.917299190 +0200
+++ /var/tmp/diff_new_pack.Npldm6/_new  2018-07-10 16:17:58.917299190 +0200
@@ -31,7 +31,7 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.10.5
+Version:1.10.6
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.Npldm6/_old  2018-07-10 16:17:58.949299141 +0200
+++ /var/tmp/diff_new_pack.Npldm6/_new  2018-07-10 16:17:58.953299135 +0200
@@ -2,8 +2,8 @@
 
 https://github.com/kubernetes-incubator/cri-o
 git
-1.10.5
-v1.10.5
+1.10.6
+v1.10.6
 
 
 cri-o-*.tar

++ cri-o-1.10.5.tar.xz -> cri-o-1.10.6.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cri-o-1.10.5/server/container_create.go 
new/cri-o-1.10.6/server/container_create.go
--- old/cri-o-1.10.5/server/container_create.go 2018-06-30 01:36:59.0 
+0200
+++ new/cri-o-1.10.6/server/container_create.go 2018-07-09 16:57:15.0 
+0200
@@ -973,7 +973,9 @@
if containerConfig.GetLinux().GetSecurityContext() != nil &&

!containerConfig.GetLinux().GetSecurityContext().Privileged {
for _, mp := range []string{
+   "/proc/acpi",
"/proc/kcore",
+   "/proc/keys",
"/proc/latency_stats",
"/proc/timer_list",
"/proc/timer_stats",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cri-o-1.10.5/version/version.go 
new/cri-o-1.10.6/version/version.go
--- old/cri-o-1.10.5/version/version.go 2018-06-30 01:36:59.0 +0200
+++ new/cri-o-1.10.6/version/version.go 2018-07-09 16:57:15.0 +0200
@@ -1,4 +1,4 @@
 package version
 
 // Version is the version of the build.
-const Version = "1.10.5"
+const Version = "1.10.6"




commit cri-o for openSUSE:Factory

2018-07-02 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-07-02 23:33:22

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Mon Jul  2 23:33:22 2018 rev:14 rq:620166 version:1.10.5

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-06-29 
22:35:42.398037949 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-07-02 
23:33:47.829223525 +0200
@@ -1,0 +2,7 @@
+Mon Jul  2 06:03:24 UTC 2018 - vrothb...@suse.com
+
+- Update cri-o to v1.10.5:
+  * Reduce amount of logs being printed by default
+  * Update to latest ocicni
+
+---

Old:

  cri-o-1.10.4.tar.xz

New:

  cri-o-1.10.5.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.MwbZpu/_old  2018-07-02 23:33:48.509222683 +0200
+++ /var/tmp/diff_new_pack.MwbZpu/_new  2018-07-02 23:33:48.513222678 +0200
@@ -31,7 +31,7 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.10.4
+Version:1.10.5
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.MwbZpu/_old  2018-07-02 23:33:48.545222638 +0200
+++ /var/tmp/diff_new_pack.MwbZpu/_new  2018-07-02 23:33:48.545222638 +0200
@@ -2,8 +2,8 @@
 
 https://github.com/kubernetes-incubator/cri-o
 git
-1.10.4
-v1.10.4
+1.10.5
+v1.10.5
 
 
 cri-o-*.tar

++ cri-o-1.10.4.tar.xz -> cri-o-1.10.5.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cri-o-1.10.4/cmd/crio/selinux_unsupported.go 
new/cri-o-1.10.5/cmd/crio/selinux_unsupported.go
--- old/cri-o-1.10.4/cmd/crio/selinux_unsupported.go2018-06-26 
15:06:11.0 +0200
+++ new/cri-o-1.10.5/cmd/crio/selinux_unsupported.go2018-06-30 
01:36:59.0 +0200
@@ -5,5 +5,5 @@
 import "github.com/sirupsen/logrus"
 
 func disableSELinux() {
-   logrus.Infof("there is no selinux to disable")
+   logrus.Debugf("there is no selinux to disable")
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cri-o-1.10.4/conmon/conmon.c 
new/cri-o-1.10.5/conmon/conmon.c
--- old/cri-o-1.10.4/conmon/conmon.c2018-06-26 15:06:11.0 +0200
+++ new/cri-o-1.10.5/conmon/conmon.c2018-06-30 01:36:59.0 +0200
@@ -997,7 +997,9 @@
 static void
 container_exit_cb (G_GNUC_UNUSED GPid pid, int status, G_GNUC_UNUSED gpointer 
user_data)
 {
-   ninfof("container %d exited with status %d", pid, status);
+   if (status != 0) {
+   ninfof("container %d exited with status %d", pid, status);
+   }
container_status = status;
container_pid = -1;
g_main_loop_quit (main_loop);
@@ -1535,7 +1537,6 @@
if (signal(SIGCHLD, on_sigchld) == SIG_ERR)
pexit("Failed to set handler for SIGCHLD");
 
-   ninfof("about to waitpid: %d", create_pid);
if (csname != NULL) {
guint terminal_watch = g_unix_fd_add (console_socket_fd, 
G_IO_IN, terminal_accept_cb, csname);
/* Process any SIGCHLD we may have missed before the signal 
handler was in place.  */
@@ -1620,13 +1621,13 @@
 
g_main_loop_run (main_loop);
 
-   /* Drain stdout and stderr */
-   if (masterfd_stdout != -1) {
+   /* Drain stdout and stderr only if a timeout doesn't occur */
+   if (masterfd_stdout != -1 && !timed_out) {
g_unix_set_fd_nonblocking(masterfd_stdout, TRUE, NULL);
while (read_stdio(masterfd_stdout, STDOUT_PIPE, NULL))
;
}
-   if (masterfd_stderr != -1) {
+   if (masterfd_stderr != -1 && !timed_out) {
g_unix_set_fd_nonblocking(masterfd_stderr, TRUE, NULL);
while (read_stdio(masterfd_stderr, STDERR_PIPE, NULL))
;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cri-o-1.10.4/oci/oci.go new/cri-o-1.10.5/oci/oci.go
--- old/cri-o-1.10.4/oci/oci.go 2018-06-26 15:06:11.0 +0200
+++ new/cri-o-1.10.5/oci/oci.go 2018-06-30 01:36:59.0 +0200
@@ -229,7 +229,7 @@
 
// Move conmon to specified cgroup
if r.cgroupManager == SystemdCgroupsManager {
-   logrus.Infof("Running conmon under slice %s and unitName %s", 
cgroupParent, createUnitName("crio-conmon", c.id))
+   logrus.Debugf("Running conmon under slice %s and unitName %s", 
cgroupParent, createUnitName("crio-conmon", c.id))
   

commit cri-o for openSUSE:Factory

2018-06-29 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-06-29 22:35:24

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Fri Jun 29 22:35:24 2018 rev:13 rq:619578 version:1.10.4

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-06-13 
15:39:51.079542747 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-06-29 
22:35:42.398037949 +0200
@@ -1,0 +2,44 @@
+Wed Jun 27 05:42:58 UTC 2018 - vrothb...@suse.com
+
+- Update cri-o to v1.10.4:
+  * network: Fix manage NetworkNS lifecycle
+  * sandbox_run: fix selinux relabel sharing
+  * container_create: more selinux relabel fixes
+  * container_create: correctly relabel mounts when asked
+
+---
+Mon Jun 18 05:53:32 UTC 2018 - vrothb...@suse.com
+
+- Update cri-o to v1.10.3:
+  * container_portforward: add support for short pod IDs
+  * container_create: no privileged container if not privileged sandbox
+  * container_create: always mount sysfs as rw for privileged containers
+  * container_create: set rw for privileged containers
+  * conmon: on a flush error discard the iov buffer
+
+---
+Fri Jun 15 08:35:42 UTC 2018 - vrothb...@suse.com
+
+- Update cri-o to v1.10.2:
+  * various improvements to conmon
+  * oci: avoid race on container stop
+  * image: Let size be calculated dynamically
+  * Add support for short IDs for exec and attach
+  * Make network namespace lifecycle management optional
+  * container_exec: Fix terminal setting for exec
+  * oci: Force kill the container process only if nothing else worked
+  * Add extra info to verbose requests to PodSandboxStatus
+  * Make conmon and crio share the same constants
+  * conmon: catch SIGTERM, SIGINT and SIQUIT
+  * Invalidate cache by building fresh one and replacing previous all at once
+  * Enable per pod PID namespace setting
+  * Make the /opt/cni mount rw
+  * conmon: add new option --version
+  * oci: Copy-edits for waitContainerStop chControl comment
+  * system container: add /var/tmp as RW
+  * container_status: expose LogPath as requested by the CRI
+  * container_create: only bind mount /etc/hosts if not provided by k8s
+  * kubernetes: Simplify and freshen the required-files table
+  * Report an warning when no stages are defined for a hook
+
+---

Old:

  cri-o-1.9.13.tar.xz

New:

  cri-o-1.10.4.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.lsezq2/_old  2018-06-29 22:35:42.790037609 +0200
+++ /var/tmp/diff_new_pack.lsezq2/_new  2018-06-29 22:35:42.790037609 +0200
@@ -31,7 +31,7 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.9.13
+Version:1.10.4
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.lsezq2/_old  2018-06-29 22:35:42.818037585 +0200
+++ /var/tmp/diff_new_pack.lsezq2/_new  2018-06-29 22:35:42.822037581 +0200
@@ -2,8 +2,8 @@
 
 https://github.com/kubernetes-incubator/cri-o
 git
-1.9.13
-v1.9.13
+1.10.4
+v1.10.4
 
 
 cri-o-*.tar

++ cri-o-1.9.13.tar.xz -> cri-o-1.10.4.tar.xz ++
 159345 lines of diff (skipped)




commit cri-o for openSUSE:Factory

2018-06-13 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-06-13 15:39:37

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Wed Jun 13 15:39:37 2018 rev:12 rq:616027 version:1.9.13

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-06-08 
23:18:00.150565998 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-06-13 
15:39:51.079542747 +0200
@@ -1,0 +2,6 @@
+Mon Jun 11 12:36:08 UTC 2018 - vrothb...@suse.com
+
+- Use actual tag for v1.9.13.  Upstream missed to set a tag and the
+  last revision mistakenly set it to v1.9.14-dev instead of v1.9.13.
+
+---



Other differences:
--
++ _service ++
--- /var/tmp/diff_new_pack.NhKZXt/_old  2018-06-13 15:39:52.731481960 +0200
+++ /var/tmp/diff_new_pack.NhKZXt/_new  2018-06-13 15:39:52.759480930 +0200
@@ -3,7 +3,7 @@
 https://github.com/kubernetes-incubator/cri-o
 git
 1.9.13
-f8fd5992b8a5ab79982e216bc5da88f606e52525
+v1.9.13
 
 
 cri-o-*.tar

++ cri-o-1.9.13.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cri-o-1.9.13/version/version.go 
new/cri-o-1.9.13/version/version.go
--- old/cri-o-1.9.13/version/version.go 2018-06-06 18:06:53.0 +0200
+++ new/cri-o-1.9.13/version/version.go 2018-06-06 16:28:01.0 +0200
@@ -1,4 +1,4 @@
 package version
 
 // Version is the version of the build.
-const Version = "1.9.14-dev"
+const Version = "1.9.13"




commit cri-o for openSUSE:Factory

2018-06-08 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-06-08 23:17:55

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Fri Jun  8 23:17:55 2018 rev:11 rq:614859 version:1.9.13

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-06-05 
12:53:45.231786981 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-06-08 
23:18:00.150565998 +0200
@@ -1,0 +2,8 @@
+Thu Jun  7 06:22:41 UTC 2018 - vrothb...@suse.com
+
+- Update cri-o to v1.9.13:
+  * runtime_status: report correct network status
+  * container_status: expose LogPath as requested by the CRI
+bsc#1095154
+
+---

Old:

  cri-o-1.9.11.tar.xz

New:

  cri-o-1.9.13.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.FMUGzR/_old  2018-06-08 23:18:01.058533201 +0200
+++ /var/tmp/diff_new_pack.FMUGzR/_new  2018-06-08 23:18:01.066532912 +0200
@@ -31,7 +31,7 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.9.11
+Version:1.9.13
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.FMUGzR/_old  2018-06-08 23:18:01.106531467 +0200
+++ /var/tmp/diff_new_pack.FMUGzR/_new  2018-06-08 23:18:01.110531322 +0200
@@ -2,8 +2,8 @@
 
 https://github.com/kubernetes-incubator/cri-o
 git
-1.9.11
-v1.9.11
+1.9.13
+f8fd5992b8a5ab79982e216bc5da88f606e52525
 
 
 cri-o-*.tar

++ cri-o-1.9.11.tar.xz -> cri-o-1.9.13.tar.xz ++
 7655 lines of diff (skipped)




commit cri-o for openSUSE:Factory

2018-06-05 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-06-05 12:53:44

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Tue Jun  5 12:53:44 2018 rev:10 rq:614174 version:1.9.11

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-05-06 
15:02:11.447435311 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-06-05 
12:53:45.231786981 +0200
@@ -1,0 +2,10 @@
+Tue Jun  5 08:26:28 UTC 2018 - dcass...@suse.com
+
+- Refactor %license usage to a simpler form
+
+---
+Mon Jun  4 14:33:03 UTC 2018 - dcass...@suse.com
+
+- Make use of %license macro
+
+---



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.Z7Dg0W/_old  2018-06-05 12:53:45.843764566 +0200
+++ /var/tmp/diff_new_pack.Z7Dg0W/_new  2018-06-05 12:53:45.847764419 +0200
@@ -171,6 +171,8 @@
 # Manpages
 %{_mandir}/man5/crio.conf.5*
 %{_mandir}/man8/crio.8*
+# License
+%license LICENSE
 # Configs
 %dir %{_sysconfdir}/crio
 %config(noreplace) %{_sysconfdir}/crio/%{name_source3}




commit cri-o for openSUSE:Factory

2018-05-06 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-05-06 15:01:57

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Sun May  6 15:01:57 2018 rev:9 rq:604028 version:1.9.11

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-04-13 
12:51:43.563300760 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-05-06 
15:02:11.447435311 +0200
@@ -1,0 +2,5 @@
+Fri May  4 14:17:57 CEST 2018 - n...@suse.de
+
+- use correct path for runc
+
+---



Other differences:
--
++ crio.conf ++
--- /var/tmp/diff_new_pack.qLxINH/_old  2018-05-06 15:02:12.219406976 +0200
+++ /var/tmp/diff_new_pack.qLxINH/_new  2018-05-06 15:02:12.219406976 +0200
@@ -42,7 +42,7 @@
 # This is a mandatory setting as this runtime will be the default one
 # and will also be used for untrusted container workloads if
 # runtime_untrusted_workload is not set.
-runtime = "/usr/bin/runc"
+runtime = "/usr/sbin/runc"
 
 # runtime_untrusted_workload is the OCI compatible runtime used for untrusted
 # container workloads. This is an optional setting, except if




commit cri-o for openSUSE:Factory

2018-04-13 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-04-13 12:51:14

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Fri Apr 13 12:51:14 2018 rev:8 rq:595981 version:1.9.11

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-04-11 
14:05:29.307214570 +0200
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-04-13 
12:51:43.563300760 +0200
@@ -1,0 +2,7 @@
+Thu Apr 12 12:47:07 UTC 2018 - fcaste...@suse.com
+
+- Put cri-o deamon under the podruntime slice. This the recommended
+  deployment to allow fine resource control on Kubernetes.
+  bsc#1086185
+
+---



Other differences:
--
++ crio.service ++
--- /var/tmp/diff_new_pack.8f8Tqr/_old  2018-04-13 12:51:44.391270762 +0200
+++ /var/tmp/diff_new_pack.8f8Tqr/_new  2018-04-13 12:51:44.391270762 +0200
@@ -23,5 +23,9 @@
 TimeoutStartSec=0
 Restart=on-abnormal
 
+# Place cri-o under the podruntime slice, this is part of the recommended
+# deployment to allow fine resource control on Kubernetes
+Slice=podruntime.slice
+
 [Install]
 WantedBy=multi-user.target




commit cri-o for openSUSE:Factory

2018-04-11 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-04-11 14:03:40

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Wed Apr 11 14:03:40 2018 rev:7 rq:595521 version:1.9.11

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-03-16 
10:45:20.452170052 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-04-11 
14:05:29.307214570 +0200
@@ -1,0 +2,14 @@
+Wed Apr 11 06:44:34 UTC 2018 - vrothb...@suse.com
+
+- Update cri-o to v1.9.11:
+  * oci: avoid race on container stop
+  * server/sandbox_stop: Pass context through StopAllPodSandboxes
+  * conmon: Add container ID to syslog
+  * Add logging support for base condition in debug
+  * Simplify filter block
+  * Specifying a filter with no filtering expressions is now idempotent
+  * Add methods for listing and fetching container stats
+  * Implement the stats for the image_fs_info command
+  * Return error for container exec
+
+---

Old:

  cri-o-1.9.10.tar.xz

New:

  cri-o-1.9.11.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.541LYB/_old  2018-04-11 14:05:31.247144011 +0200
+++ /var/tmp/diff_new_pack.541LYB/_new  2018-04-11 14:05:31.247144011 +0200
@@ -31,7 +31,7 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.9.10
+Version:1.9.11
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.541LYB/_old  2018-04-11 14:05:31.287142556 +0200
+++ /var/tmp/diff_new_pack.541LYB/_new  2018-04-11 14:05:31.287142556 +0200
@@ -2,8 +2,8 @@
 
 https://github.com/kubernetes-incubator/cri-o
 git
-1.9.10
-v1.9.10
+1.9.11
+v1.9.11
 
 
 cri-o-*.tar

++ cri-o-1.9.10.tar.xz -> cri-o-1.9.11.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cri-o-1.9.10/cmd/crio/main.go 
new/cri-o-1.9.11/cmd/crio/main.go
--- old/cri-o-1.9.10/cmd/crio/main.go   2018-03-12 17:46:45.0 +0100
+++ new/cri-o-1.9.11/cmd/crio/main.go   2018-04-09 20:22:42.0 +0200
@@ -164,11 +164,12 @@
continue
}
*signalled = true
+   ctx := context.Background()
gserver.GracefulStop()
-   hserver.Shutdown(context.Background())
+   hserver.Shutdown(ctx)
sserver.StopStreamServer()
sserver.StopExitMonitor()
-   if err := sserver.Shutdown(); err != nil {
+   if err := sserver.Shutdown(ctx); err != nil {
logrus.Warnf("error shutting down main service 
%v", err)
}
return
@@ -408,6 +409,7 @@
}
 
app.Action = func(c *cli.Context) error {
+   ctx := context.Background()
if c.GlobalBool("profile") {
profilePort := c.GlobalInt("profile-port")
profileEndpoint := fmt.Sprintf("localhost:%v", 
profilePort)
@@ -454,7 +456,7 @@
 
s := grpc.NewServer()
 
-   service, err := server.New(config)
+   service, err := server.New(ctx, config)
if err != nil {
logrus.Fatal(err)
}
@@ -522,7 +524,7 @@
case <-serverCloseCh:
}
 
-   service.Shutdown()
+   service.Shutdown(ctx)
 
<-streamServerCloseCh
logrus.Debug("closed stream server")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cri-o-1.9.10/conmon/conmon.c 
new/cri-o-1.9.11/conmon/conmon.c
--- old/cri-o-1.9.10/conmon/conmon.c2018-03-12 17:46:45.0 +0100
+++ new/cri-o-1.9.11/conmon/conmon.c2018-04-09 20:22:42.0 +0200
@@ -28,32 +28,6 @@
 
 #include "cmsg.h"
 
-#define pexit(fmt, ...)
  \
-   do {
 \
-   fprintf(stderr, "[conmon:e]: " fmt " %m\n", ##__VA_ARGS__); 
 \
-   syslog(LOG_ERR, "conmon : " fmt ": %m\n", 
##__VA_ARGS__); \
-   exit(EXIT_FAILURE); 
 \
-   } while (0)
-
-#define nexit(fmt, ...)  

commit cri-o for openSUSE:Factory

2018-03-16 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-03-16 10:44:23

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Fri Mar 16 10:44:23 2018 rev:6 rq:587563 version:1.9.10

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-03-13 
10:23:51.434160159 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-03-16 
10:45:20.452170052 +0100
@@ -1,0 +2,14 @@
+Thu Mar 15 15:21:50 UTC 2018 - vrothb...@suse.com
+
+- Require cni and cni-plugins to enable container networking.
+  feature#crio
+
+---
+Thu Mar 15 06:43:33 UTC 2018 - vrothb...@suse.com
+
+- Update cri-o to v1.9.10:
+  * conmon: Avoid strlen in logging path
+  * conmon: Remove info logs
+  * container_exec: Fix terminal setting for exec
+
+---

Old:

  cri-o-1.9.9.tar.xz

New:

  cri-o-1.9.10.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.4kDvK1/_old  2018-03-16 10:45:21.520131596 +0100
+++ /var/tmp/diff_new_pack.4kDvK1/_new  2018-03-16 10:45:21.524131452 +0100
@@ -31,7 +31,7 @@
 %definename_source2 sysconfig.crio
 %definename_source3 crio.conf
 Name:   cri-o
-Version:1.9.9
+Version:1.9.10
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0
@@ -55,6 +55,8 @@
 BuildRequires:  libgpgme-devel
 BuildRequires:  libseccomp-devel
 BuildRequires:  golang(API) >= 1.8
+Requires:   cni
+Requires:   cni-plugins
 Requires:   iproute2
 Requires:   iptables
 Requires:   libcontainers-common

++ _service ++
--- /var/tmp/diff_new_pack.4kDvK1/_old  2018-03-16 10:45:21.580129436 +0100
+++ /var/tmp/diff_new_pack.4kDvK1/_new  2018-03-16 10:45:21.580129436 +0100
@@ -2,8 +2,8 @@
 
 https://github.com/kubernetes-incubator/cri-o
 git
-1.9.9
-v1.9.9
+1.9.10
+v1.9.10
 
 
 cri-o-*.tar

++ cri-o-1.9.9.tar.xz -> cri-o-1.9.10.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cri-o-1.9.9/conmon/conmon.c 
new/cri-o-1.9.10/conmon/conmon.c
--- old/cri-o-1.9.9/conmon/conmon.c 2018-03-08 10:50:58.0 +0100
+++ new/cri-o-1.9.10/conmon/conmon.c2018-03-12 17:46:45.0 +0100
@@ -212,9 +212,6 @@
if (data == NULL)
return 1;
 
-   if (len < 0)
-   len = strlen ((char *)data);
-
if (buf->iovcnt == WRITEV_BUFFER_N_IOV &&
writev_buffer_flush (fd, buf) < 0)
return -1;
@@ -336,7 +333,6 @@
 * a timestamp.
 */
if ((opt_log_size_max > 0) && (bytes_written + 
bytes_to_be_written) > opt_log_size_max) {
-   ninfo("Creating new log file");
bytes_written = 0;
 
/* Close the existing fd */
@@ -355,19 +351,19 @@
}
 
/* Output the timestamp */
-   if (writev_buffer_append_segment(fd, , tsbuf, -1) < 0) {
+   if (writev_buffer_append_segment(fd, , tsbuf, TSBUFLEN - 
1) < 0) {
nwarn("failed to write (timestamp, stream) to log");
goto next;
}
 
/* Output log tag for partial or newline */
if (partial) {
-   if (writev_buffer_append_segment(fd, , "P ", -1) < 
0) {
+   if (writev_buffer_append_segment(fd, , "P ", 2) < 
0) {
nwarn("failed to write partial log tag");
goto next;
}
} else {
-   if (writev_buffer_append_segment(fd, , "F ", -1) < 
0) {
+   if (writev_buffer_append_segment(fd, , "F ", 2) < 
0) {
nwarn("failed to write end log tag");
goto next;
}
@@ -381,7 +377,7 @@
 
/* Output a newline for partial */
if (partial) {
-   if (writev_buffer_append_segment(fd, , "\n", -1) < 
0) {
+   if (writev_buffer_append_segment(fd, , "\n", 1) < 
0) {
nwarn("failed to write newline to log");
goto next;
}
@@ -398,8 +394,6 @@
nwarn("failed to flush buffer to log");
}
 
-   ninfo("Total bytes written: %"PRId64"", bytes_written);
-
return 0;
 

commit cri-o for openSUSE:Factory

2018-03-13 Thread root
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 @@
 %definename_source2 sysconfig.crio
 %definename_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 @@
 
 https://github.com/kubernetes-incubator/cri-o
 git
-1.9.8
-v1.9.8
+1.9.9
+v1.9.9
 
 
 cri-o-*.tar

++ 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.0 
+0100
+++ new/cri-o-1.9.9/server/sandbox_stop.go  2018-03-08 10:50:58.0 
+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.0 +0100
+++ new/cri-o-1.9.9/version/version.go  2018-03-08 10:50:58.0 +0100
@@ -1,4 +1,4 @@
 package version
 
 // Version is the version of the build.
-const Version = "1.9.8"
+const Version = "1.9.9"




commit cri-o for openSUSE:Factory

2018-03-09 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-03-09 10:45:08

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Fri Mar  9 10:45:08 2018 rev:4 rq:584228 version:1.9.8

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-03-06 
10:47:37.327559846 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-03-09 
10:45:43.976543372 +0100
@@ -1,0 +2,7 @@
+Thu Mar  8 09:25:41 UTC 2018 - vrothb...@suse.com
+
+- Remove the crio-shutdown.service.  It does not have any effect when
+  shutting down crio and also isn't shipped on Fedora.
+  - crio-shutdown.service
+
+---

Old:

  crio-shutdown.service



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.unTg3p/_old  2018-03-09 10:45:44.760515134 +0100
+++ /var/tmp/diff_new_pack.unTg3p/_new  2018-03-09 10:45:44.764514990 +0100
@@ -28,9 +28,8 @@
 %endif
 # Define macros for further referenced sources
 %definename_source1 crio.service
-%definename_source2 crio-shutdown.service
-%definename_source3 sysconfig.crio
-%definename_source4 crio.conf
+%definename_source2 sysconfig.crio
+%definename_source3 crio.conf
 Name:   cri-o
 Version:1.9.8
 Release:0
@@ -42,8 +41,7 @@
 Source1:%{name_source1}
 Source2:%{name_source2}
 Source3:%{name_source3}
-Source4:%{name_source4}
-Source5:cri-o-rpmlintrc
+Source4:cri-o-rpmlintrc
 BuildRequires:  device-mapper-devel
 BuildRequires:  fdupes
 BuildRequires:  git-core
@@ -123,16 +121,16 @@
 go test -buildmode=pie -tags "$BUILDTAGS" $PKG_LIST
 
 %pre
-%service_add_pre %{name_source1} %{name_source2}
+%service_add_pre %{name_source1}
 
 %post
-%service_add_post %{name_source1} %{name_source2}
+%service_add_post %{name_source1}
 
 %preun
-%service_del_preun %{name_source1} %{name_source2}
+%service_del_preun %{name_source1}
 
 %postun
-%service_del_postun %{name_source1} %{name_source2}
+%service_del_postun %{name_source1}
 
 %install
 cd $HOME/go/src/%{project}
@@ -148,18 +146,16 @@
 install -m 0644 docs/crio.conf.5 %{buildroot}/%{_mandir}/man5
 install -m 0644 docs/crio.8  %{buildroot}/%{_mandir}/man8
 # Configs
-install -D -m 0644 %{SOURCE4}   
%{buildroot}/%{_sysconfdir}/crio/%{name_source4}
+install -D -m 0644 %{SOURCE3}   
%{buildroot}/%{_sysconfdir}/crio/%{name_source3}
 install -D -m 0644 seccomp.json 
%{buildroot}/%{_sysconfdir}/crio/seccomp.json
 install -D -m 0644 crio-umount.conf 
%{buildroot}/%{_datadir}/oci-umount/oci-umount.d/cri-umount.conf
 install -D -m 0644 crictl.yaml  %{buildroot}/%{_sysconfdir}/crictl.yaml
-install -D -m 0644 %{SOURCE3}   %{buildroot}%{_fillupdir}/%{name_source3}
+install -D -m 0644 %{SOURCE2}   %{buildroot}%{_fillupdir}/%{name_source2}
 # Systemd
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name_source1}
-install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name_source2}
 # Symlinks to rc files
 install -d -m 0755 %{buildroot}%{_sbindir}
 ln -sf service %{buildroot}%{_sbindir}/rccrio
-ln -sf service %{buildroot}%{_sbindir}/rccrio-shutdown
 
 %fdupes %{buildroot}/%{_prefix}
 
@@ -175,17 +171,15 @@
 %{_mandir}/man8/crio.8*
 # Configs
 %dir %{_sysconfdir}/crio
-%config(noreplace) %{_sysconfdir}/crio/%{name_source4}
+%config(noreplace) %{_sysconfdir}/crio/%{name_source3}
 %config %{_sysconfdir}/crio/seccomp.json
 %dir %{_datadir}/oci-umount
 %dir %{_datadir}/oci-umount/oci-umount.d
 %{_datadir}/oci-umount/oci-umount.d/cri-umount.conf
 %config(noreplace) %{_sysconfdir}/crictl.yaml
-%{_fillupdir}/%{name_source3}
+%{_fillupdir}/%{name_source2}
 # Systemd
 %{_unitdir}/%{name_source1}
-%{_unitdir}/%{name_source2}
 %{_sbindir}/rccrio
-%{_sbindir}/rccrio-shutdown
 
 %changelog




commit cri-o for openSUSE:Factory

2018-03-06 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-03-06 10:47:36

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Tue Mar  6 10:47:36 2018 rev:3 rq:582930 version:1.9.8

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-02-22 
15:02:27.553975389 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-03-06 
10:47:37.327559846 +0100
@@ -1,0 +2,53 @@
+Mon Mar  5 12:50:03 UTC 2018 - vrothb...@suse.com
+
+- crio.conf: update default socket to /var/run/crio/crio.sock as suggested
+  by upstream.
+
+---
+Mon Mar  5 10:10:16 UTC 2018 - vrothb...@suse.com
+
+- Update cri-o to v1.9.8:
+  * system_containers: Update mounts
+  * execsync: Set terminal to true when we pass -t to conmon
+  * Make network namespace pinning optional
+  * Add context to net ns symlink removal errors
+  * Make the /opt/cni mount rw
+  * sandbox_stop: close/remove the netns _after_ stopping the containers
+  * sandbox net: set netns closed after actaully closing it
+
+---
+Mon Mar  5 10:07:54 UTC 2018 - vrothb...@suse.com
+
+- Configuration files should generally be tagged as %config(noreplace) in order
+  to keep the modified config files and to avoid losing data when the package
+  is being updated.
+
+---
+Sat Mar  3 13:38:57 UTC 2018 - vrothb...@suse.com
+
+- Remove empty filter rule from cri-o-rpmlintrc, which was mistakenly
+  masking a few warnings, some of which have been fixed, others need
+  to be filtered.  conmon and pause are not compiled with -fpie anymore
+  to align with what upstream does; linking fails when done properly.
+
+---
+Fri Mar  2 18:12:59 UTC 2018 - fcaste...@suse.com
+
+- Update minimum version of the Go compiler required
+
+---
+Fri Mar  2 18:07:54 UTC 2018 - fcaste...@suse.com
+
+- Add missing runtime dependencies: socat, iptables, iproute
+
+---
+Wed Feb 28 11:35:27 UTC 2018 - vrothb...@suse.com
+
+- Change the installation path of conmon and pause from
+  /usr/lib/crio to /usr/lib/crio/bin in order to align with upstream
+  requirements.
+
+- Update crio.conf to the reflect the new path of conmon and set the correct
+  path of CNI plugins (i.e., /usr/lib/cni).
+
+---

Old:

  cri-o-1.9.6.tar.xz
  crio.sysconfig

New:

  cri-o-1.9.8.tar.xz
  sysconfig.crio



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.xIwUIM/_old  2018-03-06 10:47:39.851468672 +0100
+++ /var/tmp/diff_new_pack.xIwUIM/_new  2018-03-06 10:47:39.851468672 +0100
@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %define project github.com/kubernetes-incubator/cri-o
 # Build with libostree-devel in Tumbleweed, Leap 15+ and SLES 15+
 %if 0%{?suse_version} >= 1500
@@ -24,10 +29,10 @@
 # Define macros for further referenced sources
 %definename_source1 crio.service
 %definename_source2 crio-shutdown.service
-%definename_source3 crio
+%definename_source3 sysconfig.crio
 %definename_source4 crio.conf
 Name:   cri-o
-Version:1.9.6
+Version:1.9.8
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0
@@ -36,7 +41,7 @@
 Source0:%{name}-%{version}.tar.xz
 Source1:%{name_source1}
 Source2:%{name_source2}
-Source3:%{name_source3}.sysconfig
+Source3:%{name_source3}
 Source4:%{name_source4}
 Source5:cri-o-rpmlintrc
 BuildRequires:  device-mapper-devel
@@ -51,11 +56,14 @@
 BuildRequires:  libbtrfs-devel
 BuildRequires:  libgpgme-devel
 BuildRequires:  libseccomp-devel
-BuildRequires:  golang(API) >= 1.7
+BuildRequires:  golang(API) >= 1.8
+Requires:   iproute2
+Requires:   iptables
 Requires:   libcontainers-common
 Requires:   libcontainers-image
 Requires:   libcontainers-storage
 Requires:   runc >= 1.0.0~rc4
+Requires:   socat
 # disable stripping of binaries
 %{go_nostrip}
 %if 0%{?with_libostree}
@@ -93,10 +101,10 @@
  %{project}/cmd/crio
 
 # Build conmon
-CFLAGS="-fpie" make -C conmon
+make conmon
 
 # Build pause

commit cri-o for openSUSE:Factory

2018-02-22 Thread root
Hello community,

here is the log from the commit of package cri-o for openSUSE:Factory checked 
in at 2018-02-22 15:02:23

Comparing /work/SRC/openSUSE:Factory/cri-o (Old)
 and  /work/SRC/openSUSE:Factory/.cri-o.new (New)


Package is "cri-o"

Thu Feb 22 15:02:23 2018 rev:2 rq:578812 version:1.9.6

Changes:

--- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes  2018-02-19 
13:01:12.385560974 +0100
+++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-02-22 
15:02:27.553975389 +0100
@@ -1,0 +2,13 @@
+Tue Feb 20 15:27:01 UTC 2018 - vrothb...@suse.com
+
+- Update cri-o to v1.9.6:
+  * vendor: update c/image to handle text/plain from registries
+Fixes cases where text/plain s1 schemes are mistakenly converted
+to MIME.
+
+---
+Sun Feb 18 12:42:18 UTC 2018 - jeng...@inai.de
+
+- Let description say what the package really does.
+
+---

Old:

  cri-o-1.9.5.tar.xz

New:

  cri-o-1.9.6.tar.xz



Other differences:
--
++ cri-o.spec ++
--- /var/tmp/diff_new_pack.CweUQO/_old  2018-02-22 15:02:28.821929776 +0100
+++ /var/tmp/diff_new_pack.CweUQO/_new  2018-02-22 15:02:28.825929632 +0100
@@ -27,12 +27,12 @@
 %definename_source3 crio
 %definename_source4 crio.conf
 Name:   cri-o
-Version:1.9.5
+Version:1.9.6
 Release:0
 Summary:OCI-based implementation of Kubernetes Container Runtime 
Interface
 License:Apache-2.0
 Group:  System/Management
-URL:https://github.com/kubernetes-incubator/cri-o
+Url:https://github.com/kubernetes-incubator/cri-o
 Source0:%{name}-%{version}.tar.xz
 Source1:%{name_source1}
 Source2:%{name_source2}
@@ -45,13 +45,13 @@
 BuildRequires:  glib2-devel-static
 BuildRequires:  glibc-devel-static
 BuildRequires:  go-go-md2man
-BuildRequires:  golang(API) >= 1.7
 BuildRequires:  golang-packaging
 BuildRequires:  libapparmor-devel
 BuildRequires:  libassuan-devel
 BuildRequires:  libbtrfs-devel
 BuildRequires:  libgpgme-devel
 BuildRequires:  libseccomp-devel
+BuildRequires:  golang(API) >= 1.7
 Requires:   libcontainers-common
 Requires:   libcontainers-image
 Requires:   libcontainers-storage
@@ -63,7 +63,7 @@
 %endif
 
 %description
-CRI-O is meant to provide an integration path between OCI conformant runtimes
+CRI-O provides an integration path between OCI conformant runtimes
 and the kubelet. Specifically, it implements the Kubelet Container Runtime
 Interface (CRI) using OCI conformant runtimes. The scope of CRI-O is tied to
 the scope of the CRI.

++ _service ++
--- /var/tmp/diff_new_pack.CweUQO/_old  2018-02-22 15:02:28.865928194 +0100
+++ /var/tmp/diff_new_pack.CweUQO/_new  2018-02-22 15:02:28.869928050 +0100
@@ -2,8 +2,8 @@
 
 https://github.com/kubernetes-incubator/cri-o
 git
-1.9.5
-v1.9.5
+1.9.6
+v1.9.6
 
 
 cri-o-*.tar

++ cri-o-1.9.5.tar.xz -> cri-o-1.9.6.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cri-o-1.9.5/Makefile new/cri-o-1.9.6/Makefile
--- old/cri-o-1.9.5/Makefile2018-02-15 18:55:25.0 +0100
+++ new/cri-o-1.9.6/Makefile2018-02-20 10:50:14.0 +0100
@@ -113,7 +113,7 @@
docker run -e STORAGE_OPTIONS="--storage-driver=vfs" -e TESTFLAGS -e 
TRAVIS -t --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${CRIO_IMAGE} make 
localintegration
 
 testunit:
-   $(GO) test -tags "$(BUILDTAGS)" -cover $(PACKAGES)
+   $(GO) test -tags "$(BUILDTAGS) containers_image_ostree_stub" -cover 
$(PACKAGES)
 
 localintegration: clean binaries test-binaries
./test/test_runner.sh ${TESTFLAGS}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/cri-o-1.9.5/vendor/github.com/containers/image/copy/manifest.go 
new/cri-o-1.9.6/vendor/github.com/containers/image/copy/manifest.go
--- old/cri-o-1.9.5/vendor/github.com/containers/image/copy/manifest.go 
2018-02-15 18:55:25.0 +0100
+++ new/cri-o-1.9.6/vendor/github.com/containers/image/copy/manifest.go 
2018-02-20 10:50:14.0 +0100
@@ -46,6 +46,11 @@
if err != nil { // This should have been cached?!
return "", nil, errors.Wrap(err, "Error reading manifest")
}
+   normalizedSrcType := manifest.NormalizedMIMEType(srcType)
+   if srcType != normalizedSrcType {
+   logrus.Debugf("Source manifest MIME type %s, treating it as 
%s", srcType, normalizedSrcType)
+   srcType = normalizedSrcType
+   }
 
if forceManifestMIMEType != "" {
destSupportedManifestMIMETypes =