From be101ac1efed0249f137ec44b9e8894677fbbe58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 13 Apr 2021 20:09:44 +0200 Subject: [PATCH 1/7] versions: Remove CRI-O meta dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CRI-O meta dependencies (crictl and openshift) are a left over from the OCP 3.x era. Currently we don't need those as we have Kata Containers onboard with the OpenShift CI, and we don't test OCP 3.x in any way nowadays. Signed-off-by: Fabiano Fidêncio --- versions.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/versions.yaml b/versions.yaml index c7c6e5c213..fb97cd2b0e 100644 --- a/versions.yaml +++ b/versions.yaml @@ -180,9 +180,6 @@ externals: OCI-based Kubernetes Container Runtime Interface implementation url: "https://github.com/cri-o/cri-o" version: "v1.18.4-4-g6dee3891e" - meta: - openshift: "6273bea4c9ed788aeb3d051ebf2d030060c05b6c" - crictl: 1.0.0-beta.2 cri-containerd: description: | From 516f4ec06eeba2aa608accf16856d5c3c3e017a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 13 Apr 2021 20:14:27 +0200 Subject: [PATCH 2/7] versions: Remove OpenShift entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tested between Kata Containers and OpenShift are already being done via the OpenShift CI. This entry is only related to the OpenShift 3.x, which is not tested anymore via our CI in any possible way. Signed-off-by: Fabiano Fidêncio --- versions.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/versions.yaml b/versions.yaml index fb97cd2b0e..030a3c6e52 100644 --- a/versions.yaml +++ b/versions.yaml @@ -213,17 +213,6 @@ externals: .*/v?([\d\.]+)\.tar\.gz version: "1.18.9-00" - openshift: - description: | - Distribution of Kubernetes optimized for continuous application - development and multi-tenant deployment. - url: "https://github.com/openshift/origin" - uscan-url: >- - https://github.com/openshift/origin/tags - .*/v?([\d\.]+)\.tar\.gz - version: "v3.10.0" - commit: "dd10d17" - runc: description: "OCI CLI reference runtime implementation" url: "https://github.com/opencontainers/runc" From d15f84c956ce69945e6e4fbe02fae32569f486fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 13 Apr 2021 20:17:05 +0200 Subject: [PATCH 3/7] versions: Remove Docker entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's been some time already, since https://github.com/kata-containers/tests/pull/3272, that we don't depend on a specific version of docker. Signed-off-by: Fabiano Fidêncio --- versions.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/versions.yaml b/versions.yaml index 030a3c6e52..b487980c0d 100644 --- a/versions.yaml +++ b/versions.yaml @@ -195,14 +195,6 @@ externals: url: "https://github.com/kubernetes-sigs/cri-tools" version: "1.18.0" - docker: - description: "Moby project container manager" - notes: "Docker Swarm requires an older version of Docker." - url: "https://github.com/moby/moby" - version: "v18.06-ce" - meta: - swarm-version: "1.12.1" - kubernetes: description: "Kubernetes project container manager" url: "https://github.com/kubernetes/kubernetes" From 8e5df723022e7da94aa925b63f319ed609fea545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 13 Apr 2021 20:04:25 +0200 Subject: [PATCH 4/7] versions: Bump kubernetes version to 1.21.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.21.0 is the latest k8s release. Fixes: #1685 Signed-off-by: Fabiano Fidêncio --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index b487980c0d..1cd397b978 100644 --- a/versions.yaml +++ b/versions.yaml @@ -203,7 +203,7 @@ externals: uscan-url: >- https://github.com/kubernetes/kubernetes/tags .*/v?([\d\.]+)\.tar\.gz - version: "1.18.9-00" + version: "1.21.0-00" runc: description: "OCI CLI reference runtime implementation" From e33f207b7d6d13cb9533d260a197b9eb42737f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 13 Apr 2021 20:12:30 +0200 Subject: [PATCH 5/7] versions: Bump critools version to 1.21.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's bump critools version to the same version of the kubernetes. Fixes: #1686 Signed-off-by: Fabiano Fidêncio --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index 1cd397b978..5d81a5439d 100644 --- a/versions.yaml +++ b/versions.yaml @@ -193,7 +193,7 @@ externals: critools: description: "CLI tool for Container Runtime Interface (CRI)" url: "https://github.com/kubernetes-sigs/cri-tools" - version: "1.18.0" + version: "1.21.0" kubernetes: description: "Kubernetes project container manager" From 9c333b2c794206129656ae4976fffe43f10e02c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 13 Apr 2021 20:11:07 +0200 Subject: [PATCH 6/7] versions: Bump CRI-O version to 1.21.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For CRI-O, let's rely on the "release-1.21" branch, as this is the branch getting backports for the 1.21.x cycle. Relying on the branch avoids our needs to keep bumping it every now and then. Fixes: #1688 Signed-off-by: Fabiano Fidêncio --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index 5d81a5439d..9a9f4042e9 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" - version: "v1.18.4-4-g6dee3891e" + branch: "release-1.21" cri-containerd: description: | From ea9936e0049d256c8c1a00b9bd0245ceb2e64ce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 14 Apr 2021 01:33:32 +0200 Subject: [PATCH 7/7] versions: Bump runc to v1.0.0-rc93 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's bump runc to its latest release. Signed-off-by: Fabiano Fidêncio --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index 9a9f4042e9..88c5209cce 100644 --- a/versions.yaml +++ b/versions.yaml @@ -213,7 +213,7 @@ externals: uscan-url: >- https://github.com/opencontainers/runc/tags .*/v?(\d\S+)\.tar\.gz - version: "v1.0.0-rc5" + version: "v1.0.0-rc93" musl: description: |