From 439b8f338f16a2f37fe800ecef716b2088f72feecaffdc7c92589a4754314e5e Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrown@suse.com>
Date: Mon, 25 Mar 2019 09:59:49 +0000
Subject: [PATCH] Accepting request 688128 from home:sgrunert

- Update cri-tools to v1.14.0:
  * CRI CLI (crictl)
    * Adds imagefsinfo subcommand for CRI ImageFSInfo() method.
    * Adds support to filter containers by image.
    * Fixes a bug when removing multiple containers.
    * Reduces the default connection timeout value.
    * Fixes the exit code for crictl exec.
    * Updated the instructions fro godep.
    * Adds support of -q for crictl info.
    * Adds support of zsh completion.
    * Upgrades kubernetes version to 1.14.
  * CRI validation testing (critest)
    *  Adds a benchmark testcase for measuring the time of creating pod and a
       container.
    *  Changes streaming tests to omit newlines on echo
    *  Adds support of critest for Windows container runtime.
    *  Updates test environment to xenial and fixes docker installation.
    *  Updates Go version to 1.12.

OBS-URL: https://build.opensuse.org/request/show/688128
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/cri-tools?expand=0&rev=7
---
 _service                |  4 ++--
 cri-tools-1.13.0.tar.xz |  3 ---
 cri-tools-1.14.0.tar.xz |  3 +++
 cri-tools.changes       | 22 ++++++++++++++++++++++
 cri-tools.spec          | 11 +++++++----
 5 files changed, 34 insertions(+), 9 deletions(-)
 delete mode 100644 cri-tools-1.13.0.tar.xz
 create mode 100644 cri-tools-1.14.0.tar.xz

diff --git a/_service b/_service
index 74551a1..3d6f1a9 100644
--- a/_service
+++ b/_service
@@ -4,8 +4,8 @@
 <param name="url">https://github.com/kubernetes-sigs/cri-tools.git</param>
 <param name="scm">git</param>
 <param name="filename">cri-tools</param>
-<param name="versionformat">1.13.0</param>
-<param name="revision">v1.13.0</param>
+<param name="versionformat">1.14.0</param>
+<param name="revision">v1.14.0</param>
 </service>
 
 <service name="recompress" mode="disabled">
diff --git a/cri-tools-1.13.0.tar.xz b/cri-tools-1.13.0.tar.xz
deleted file mode 100644
index 39c1858..0000000
--- a/cri-tools-1.13.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f539d42b4283f466239f9504d5620c04fb7f73b1f3861c855fedcd63b1409e0
-size 1481804
diff --git a/cri-tools-1.14.0.tar.xz b/cri-tools-1.14.0.tar.xz
new file mode 100644
index 0000000..67cb6a4
--- /dev/null
+++ b/cri-tools-1.14.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1220b297922fbb505add1577ee31d1337db5196f3cc09b997fcdd6a0622c7b37
+size 1932768
diff --git a/cri-tools.changes b/cri-tools.changes
index ab2febc..c00e171 100644
--- a/cri-tools.changes
+++ b/cri-tools.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Mon Mar 25 08:00:25 UTC 2019 - Sascha Grunert <sgrunert@suse.com>
+
+- Update cri-tools to v1.14.0:
+  * CRI CLI (crictl)
+    * Adds imagefsinfo subcommand for CRI ImageFSInfo() method.
+    * Adds support to filter containers by image.
+    * Fixes a bug when removing multiple containers.
+    * Reduces the default connection timeout value.
+    * Fixes the exit code for crictl exec.
+    * Updated the instructions fro godep.
+    * Adds support of -q for crictl info.
+    * Adds support of zsh completion.
+    * Upgrades kubernetes version to 1.14.
+  * CRI validation testing (critest)
+    *  Adds a benchmark testcase for measuring the time of creating pod and a
+       container.
+    *  Changes streaming tests to omit newlines on echo
+    *  Adds support of critest for Windows container runtime.
+    *  Updates test environment to xenial and fixes docker installation.
+    *  Updates Go version to 1.12.
+
 -------------------------------------------------------------------
 Mon Dec 17 08:14:45 UTC 2018 - Sascha Grunert <sgrunert@suse.com>
 
diff --git a/cri-tools.spec b/cri-tools.spec
index 2600566..7b30730 100644
--- a/cri-tools.spec
+++ b/cri-tools.spec
@@ -20,7 +20,7 @@
 %define name_source1    crictl.yaml
 
 Name:           cri-tools
-Version:        1.13.0
+Version:        1.14.0
 Release:        0
 Summary:        CLI and validation tools for Kubelet Container Runtime Interface
 License:        Apache-2.0
@@ -75,8 +75,9 @@ do
 done
 rename '.md' '.1' docs/*
 
-# generate bash-completion
-./bin/crictl completion > crictl-completion
+# generate auto-completions
+./bin/crictl completion bash > crictl-completion-bash
+./bin/crictl completion zsh > crictl-completion-zsh
 
 %install
 cd $HOME/go/src/%{project}
@@ -86,7 +87,8 @@ install -d %{buildroot}/%{_mandir}/man1
 install -D -m 0644 docs/crictl.1 %{buildroot}/%{_mandir}/man1/crictl.1
 install -D -m 0644 docs/benchmark.1 %{buildroot}/%{_mandir}/man1/critest-benchmark.1
 install -D -m 0644 docs/validation.1 %{buildroot}/%{_mandir}/man1/critest-validation.1
-install -D -m 0644 crictl-completion %{buildroot}/%{_datadir}/bash-completion/completions/crictl
+install -D -m 0644 crictl-completion-bash %{buildroot}/%{_datadir}/bash-completion/completions/crictl
+install -D -m 0644 crictl-completion-zsh %{buildroot}/%{_datadir}/zsh/site-functions/_crictl
 install -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name_source1}
 
 %files
@@ -94,6 +96,7 @@ install -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name_source1}
 %{_bindir}/critest
 %{_mandir}/man1/*
 %{_datadir}/bash-completion/completions/crictl
+%{_datadir}/zsh
 %config(noreplace) %{_sysconfdir}/%{name_source1}
 %license LICENSE