diff --git a/roles/container-engine/cri-o/defaults/main.yml b/roles/container-engine/cri-o/defaults/main.yml index 422bddfaf4771bf83e00d83f668e7d29315505ea..2b5ddd379ab72bedd946761539c9174dfe793c7a 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 f2a45e03011e11deed5a09ff8d3d1920572effb0..51cb228c99accd4525bd4c0722669154057e98dc 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 99c3cbe8ca7be35e5f1343a4f0ce9dd16fa830ae..423c3322e404040ba213b46090c95e5fbd4f86b8 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 99c3cbe8ca7be35e5f1343a4f0ce9dd16fa830ae..423c3322e404040ba213b46090c95e5fbd4f86b8 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 c8694c5baa822a17f63da698baf7d46e54fc529e..d91ebe1c5843c11e1eec65c6ee89eed851c5d22a 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 c155ea093705e317d67db732c6b1c08a32498f36..b97e0599f6dad47aa621f576841683e4e4e2b426 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