From 08bfa43cbd701f72e65a9126861cc762acf20645 Mon Sep 17 00:00:00 2001 From: Alex Kalenyuk Date: Mon, 30 Dec 2024 18:13:15 +0200 Subject: [PATCH 1/2] Revert "crio: pin cri-o to previous minor version for each provider (#1320)" This reverts commit 6c4fa8f1395d262fe6a902f46ea4a981e86d65a6. Signed-off-by: Alex Kalenyuk --- cluster-provision/k8s/1.30/k8s_provision.sh | 3 +-- cluster-provision/k8s/1.31/k8s_provision.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cluster-provision/k8s/1.30/k8s_provision.sh b/cluster-provision/k8s/1.30/k8s_provision.sh index 7a2f98d769..33e6653df2 100755 --- a/cluster-provision/k8s/1.30/k8s_provision.sh +++ b/cluster-provision/k8s/1.30/k8s_provision.sh @@ -74,8 +74,7 @@ gpgcheck=0 enabled=1 EOF -#FIXME: Pinned to cri-o v1.30.6 due to issue with conformance tests with v1.30.7 -dnf install -y cri-o-1.30.6 +dnf install -y cri-o systemctl enable --now crio diff --git a/cluster-provision/k8s/1.31/k8s_provision.sh b/cluster-provision/k8s/1.31/k8s_provision.sh index a03989333e..fd074a28a1 100755 --- a/cluster-provision/k8s/1.31/k8s_provision.sh +++ b/cluster-provision/k8s/1.31/k8s_provision.sh @@ -74,8 +74,7 @@ gpgcheck=0 enabled=1 EOF -#FIXME: Pinned to cri-o v1.31.1 due to issue with conformance tests with v1.31.2 -dnf install -y cri-o-1.31.1 +dnf install -y cri-o systemctl enable --now crio From 94883af60b49f6e6d12e6bdf52dbb063a80f465f Mon Sep 17 00:00:00 2001 From: Alex Kalenyuk Date: Mon, 30 Dec 2024 18:13:46 +0200 Subject: [PATCH 2/2] cri-o freeze revert to previously non existing 1.32 provider Signed-off-by: Alex Kalenyuk --- cluster-provision/k8s/1.32/k8s_provision.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cluster-provision/k8s/1.32/k8s_provision.sh b/cluster-provision/k8s/1.32/k8s_provision.sh index a03989333e..fd074a28a1 100755 --- a/cluster-provision/k8s/1.32/k8s_provision.sh +++ b/cluster-provision/k8s/1.32/k8s_provision.sh @@ -74,8 +74,7 @@ gpgcheck=0 enabled=1 EOF -#FIXME: Pinned to cri-o v1.31.1 due to issue with conformance tests with v1.31.2 -dnf install -y cri-o-1.31.1 +dnf install -y cri-o systemctl enable --now crio