From 0e70b38d06f5bc3b43b2dbbabad1fb2a274dafa3 Mon Sep 17 00:00:00 2001
From: Salvador Fuentes <salvador.fuentes@intel.com>
Date: Tue, 5 Nov 2019 13:57:02 -0600
Subject: [PATCH 1/2] versions: Update kubernetes and cri-o to 1.16

Update k8s supported version from 1.15.3 to 1.16.2
and cri-o from 1.15.0 to 1.16.0

Fixes: #2166.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
---
 versions.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions.yaml b/versions.yaml
index 2e2015394b..ed42ca990b 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -199,7 +199,7 @@ externals:
     description: |
       OCI-based Kubernetes Container Runtime Interface implementation
     url: "https://github.com/cri-o/cri-o"
-    version: "v1.15.0"
+    version: "v1.16.0"
     meta:
       openshift: "6273bea4c9ed788aeb3d051ebf2d030060c05b6c"
       crictl: 1.0.0-beta.2
@@ -240,7 +240,7 @@ externals:
     uscan-url: >-
       https://github.com/kubernetes/kubernetes/tags
       .*/v?([\d\.]+)\.tar\.gz
-    version: "1.15.3-00"
+    version: "1.16.2-00"
 
   openshift:
     description: |

From 69ab09273dc3c1d7cf32c116e45ab93db7ecaa8e Mon Sep 17 00:00:00 2001
From: Salvador Fuentes <salvador.fuentes@intel.com>
Date: Wed, 6 Nov 2019 10:16:38 -0600
Subject: [PATCH 2/2] versions: Add cri-tools and conmon to the versions.yaml

cri-tools version was managed in the tests repository, but as
we define here cri-o, containerd and kubernetes versions, it
make sense to have the cri-tools version defined in this repo.

conmon has now to be installed/built separately. So add it
to the list.

Depends-on: github.com/kata-containers/tests#2057

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
---
 versions.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/versions.yaml b/versions.yaml
index ed42ca990b..28f6d79467 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -195,6 +195,11 @@ externals:
     url: "https://github.com/containernetworking/plugins"
     commit: "485be65581341430f9106a194a98f0f2412245fb"
 
+  conmon:
+    description: "An OCI container runtime monitor"
+    url: "https://github.com/containers/conmon"
+    version: "v2.0.1"
+
   crio:
     description: |
       OCI-based Kubernetes Container Runtime Interface implementation
@@ -211,6 +216,11 @@ externals:
     tarball_url: "https://storage.googleapis.com/cri-containerd-release"
     version: "1.2.7"
 
+  critools:
+    description: "CLI tool for Container Runtime Interface (CRI)"
+    url: "https://github.com/kubernetes-sigs/cri-tools"
+    version: "1.16.1"
+
   docker:
     description: "Moby project container manager"
     notes: "Docker Swarm requires an older version of Docker."