From c4a642636ba5cd941a817bc2ed4ba22d8d62c5b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
Date: Thu, 12 Aug 2021 10:48:43 +0200
Subject: [PATCH 1/2] versions: Update k8s & critools to v1.22
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Let's test our `main` branch against the latest version of k8s.  In
order to do the bump, let's also update critools version accordingly.

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

Fixes: #2433

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
---
 versions.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions.yaml b/versions.yaml
index 6b542082f6..f8e226c4b3 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -194,7 +194,7 @@ externals:
   critools:
     description: "CLI tool for Container Runtime Interface (CRI)"
     url: "https://github.com/kubernetes-sigs/cri-tools"
-    version: "1.21.0"
+    version: "1.22.0"
 
   kubernetes:
     description: "Kubernetes project container manager"
@@ -204,7 +204,7 @@ externals:
     uscan-url: >-
       https://github.com/kubernetes/kubernetes/tags
       .*/v?([\d\.]+)\.tar\.gz
-    version: "1.21.1-00"
+    version: "1.22.0-00"
 
   runc:
     description: "OCI CLI reference runtime implementation"

From d45c86de295a449a1fc05b33fcdd6defd7595ab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
Date: Thu, 12 Aug 2021 10:56:35 +0200
Subject: [PATCH 2/2] versions: Update CRI-O to its 1.22 release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As kubernetes version has been bumped to 1.22, let's bump the CRI-O
version accordingly.

Related: #2434

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
---
 versions.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.yaml b/versions.yaml
index f8e226c4b3..fc15c7d49f 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -179,7 +179,7 @@ externals:
     description: |
       OCI-based Kubernetes Container Runtime Interface implementation
     url: "https://github.com/cri-o/cri-o"
-    branch: "release-1.21"
+    branch: "release-1.22"
 
   cri-containerd:
     description: |