From b4a61370c857a4a1e7448c328dd7463fd1ff8e55 Mon Sep 17 00:00:00 2001
From: Cristian Calin <6627509+cristicalin@users.noreply.github.com>
Date: Mon, 7 Mar 2022 15:39:07 +0200
Subject: [PATCH] [cri-o] add cri-0 1.23.x (#8599)
---
roles/container-engine/cri-o/defaults/main.yml | 4 ++--
roles/container-engine/cri-o/vars/amazon.yml | 2 ++
roles/container-engine/cri-o/vars/centos-7.yml | 2 ++
roles/container-engine/cri-o/vars/centos-8.yml | 2 ++
roles/container-engine/cri-o/vars/debian.yml | 3 +++
roles/container-engine/cri-o/vars/ubuntu.yml | 3 +++
6 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/roles/container-engine/cri-o/defaults/main.yml b/roles/container-engine/cri-o/defaults/main.yml
index 422bddfaf..2b5ddd379 100644
--- a/roles/container-engine/cri-o/defaults/main.yml
+++ b/roles/container-engine/cri-o/defaults/main.yml
@@ -38,11 +38,11 @@ crio_stream_port: "10010"
crio_required_version: "{{ kube_version | regex_replace('^v(?P<major>\\d+).(?P<minor>\\d+).(?P<patch>\\d+)$', '\\g<major>.\\g<minor>') }}"
crio_kubernetes_version_matrix:
- "1.23": "1.22"
+ "1.23": "1.23"
"1.22": "1.22"
"1.21": "1.21"
-crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.22') }}"
+crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.23') }}"
# The crio_runtimes variable defines a list of OCI compatible runtimes.
crio_runtimes:
diff --git a/roles/container-engine/cri-o/vars/amazon.yml b/roles/container-engine/cri-o/vars/amazon.yml
index f2a45e030..51cb228c9 100644
--- a/roles/container-engine/cri-o/vars/amazon.yml
+++ b/roles/container-engine/cri-o/vars/amazon.yml
@@ -3,6 +3,8 @@
crio_storage_driver: "overlay"
crio_versioned_pkg:
+ "1.23":
+ - "cri-o-1.23.*"
"1.22":
- "cri-o-1.22.*"
"1.21":
diff --git a/roles/container-engine/cri-o/vars/centos-7.yml b/roles/container-engine/cri-o/vars/centos-7.yml
index 99c3cbe8c..423c3322e 100644
--- a/roles/container-engine/cri-o/vars/centos-7.yml
+++ b/roles/container-engine/cri-o/vars/centos-7.yml
@@ -1,5 +1,7 @@
---
crio_versioned_pkg:
+ "1.23":
+ - "cri-o-1.23.*"
"1.22":
- "cri-o-1.22.*"
"1.21":
diff --git a/roles/container-engine/cri-o/vars/centos-8.yml b/roles/container-engine/cri-o/vars/centos-8.yml
index 99c3cbe8c..423c3322e 100644
--- a/roles/container-engine/cri-o/vars/centos-8.yml
+++ b/roles/container-engine/cri-o/vars/centos-8.yml
@@ -1,5 +1,7 @@
---
crio_versioned_pkg:
+ "1.23":
+ - "cri-o-1.23.*"
"1.22":
- "cri-o-1.22.*"
"1.21":
diff --git a/roles/container-engine/cri-o/vars/debian.yml b/roles/container-engine/cri-o/vars/debian.yml
index c8694c5ba..d91ebe1c5 100644
--- a/roles/container-engine/cri-o/vars/debian.yml
+++ b/roles/container-engine/cri-o/vars/debian.yml
@@ -1,5 +1,8 @@
---
crio_versioned_pkg:
+ "1.23":
+ - "cri-o=1.23*"
+ - cri-o-runc
"1.22":
- "cri-o=1.22*"
- cri-o-runc
diff --git a/roles/container-engine/cri-o/vars/ubuntu.yml b/roles/container-engine/cri-o/vars/ubuntu.yml
index c155ea093..b97e0599f 100644
--- a/roles/container-engine/cri-o/vars/ubuntu.yml
+++ b/roles/container-engine/cri-o/vars/ubuntu.yml
@@ -1,5 +1,8 @@
---
crio_versioned_pkg:
+ "1.23":
+ - "cri-o=1.23*"
+ - cri-o-runc
"1.22":
- "cri-o=1.22*"
- cri-o-runc
--
GitLab