Skip to content

Commit

Permalink
[cri-o] add cri-0 1.23.x
Browse files Browse the repository at this point in the history
  • Loading branch information
cristicalin committed Mar 3, 2022
1 parent 51821a8 commit 8d91f49
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 4 deletions.
4 changes: 2 additions & 2 deletions roles/container-engine/cri-o/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions roles/container-engine/cri-o/vars/amazon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
2 changes: 2 additions & 0 deletions roles/container-engine/cri-o/vars/centos-7.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
crio_versioned_pkg:
"1.23":
- "cri-o-1.23.*"
"1.22":
- "cri-o-1.22.*"
"1.21":
Expand Down
2 changes: 2 additions & 0 deletions roles/container-engine/cri-o/vars/centos-8.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
crio_versioned_pkg:
"1.23":
- "cri-o-1.23.*"
"1.22":
- "cri-o-1.22.*"
"1.21":
Expand Down
3 changes: 3 additions & 0 deletions roles/container-engine/cri-o/vars/debian.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/container-engine/cri-o/vars/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ crio_packages:
- cri-tools

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') }}"
3 changes: 3 additions & 0 deletions roles/container-engine/cri-o/vars/ubuntu.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 8d91f49

Please sign in to comment.