Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump crio version to 1.19 #6758

Merged
merged 2 commits into from
Oct 13, 2020
Merged

bump crio version to 1.19 #6758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed9c096
bump crio version to 1.19
hafe Sep 27, 2020
a5a314c
update crio info in docs
hafe Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [etcd](https://github.com/coreos/etcd) v3.4.3
- [docker](https://www.docker.com/) v19.03 (see note)
- [containerd](https://containerd.io/) v1.3.7
- [cri-o](http://cri-o.io/) v1.17 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS)
- [cri-o](http://cri-o.io/) v1.19 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS)
- Network Plugin
- [cni-plugins](https://github.com/containernetworking/plugins) v0.8.6
- [calico](https://github.com/projectcalico/calico) v3.16.1
Expand Down
3 changes: 1 addition & 2 deletions docs/cri-o.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
Kubespray supports basic functionality for using CRI-O as the default container runtime in a cluster.

* Kubernetes supports CRI-O on v1.11.1 or later.
* Helm and other tools may not function as normal due to dependency on Docker.
* `scale.yml` and `upgrade-cluster.yml` are not supported on clusters using CRI-O.

_To use CRI-O instead of Docker, set the following variables:_
_To use the CRI-O container runtime set the following variables:_

## all.yml

Expand Down
4 changes: 2 additions & 2 deletions roles/container-engine/cri-o/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ 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.19": "1.19"
"1.18": "1.18"
"1.17": "1.17"
"1.16": "1.16"

crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.17') }}"
crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.19') }}"
17 changes: 12 additions & 5 deletions roles/container-engine/cri-o/tasks/crio_repo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
crio_kubic_debian_repo_name: "{{ ((ansible_distribution == 'Ubuntu') | ternary('x','')) ~ ansible_distribution ~ '_' ~ ansible_distribution_version }}"
when: ansible_os_family == "Debian"

- name: Add CRI-O kubic repo key
- name: Add CRI-O kubic apt repo key
apt_key:
url: "https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/{{ crio_kubic_debian_repo_name }}/Release.key"
state: present
Expand All @@ -15,14 +15,21 @@
retries: 4
delay: "{{ retry_stagger | d(3) }}"

- name: Add CRI-O kubic repo
- name: Add CRI-O kubic apt repo
apt_repository:
repo: "deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/{{ crio_kubic_debian_repo_name }}/ /"
state: present
filename: devel:kubic:libcontainers:stable
filename: devel-kubic-libcontainers-stable
when: crio_kubic_debian_repo_name is defined

- name: Add CRI-O kubic repo
- name: Add CRI-O kubic cri-o apt repo
apt_repository:
repo: "deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_version }}/{{ crio_kubic_debian_repo_name }}/ /"
state: present
filename: devel-kubic-libcontainers-stable-cri-o
when: crio_kubic_debian_repo_name is defined

- name: Add CRI-O kubic yum repo
yum_repository:
name: devel_kubic_libcontainers_stable
description: Stable Releases of Upstream github.com/containers packages (CentOS_$releasever)
Expand All @@ -31,7 +38,7 @@
gpgkey: http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_$releasever/repodata/repomd.xml.key
when: ansible_distribution in ["CentOS"]

- name: Add CRI-O kubic repo
- name: Add CRI-O kubic yum repo
yum_repository:
name: "devel_kubic_libcontainers_stable_cri-o_{{ crio_version }}"
description: "CRI-O {{ crio_version }} (CentOS_$releasever)"
Expand Down
4 changes: 2 additions & 2 deletions roles/container-engine/cri-o/vars/debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---

crio_packages:
- "cri-o-{{ crio_version }}"
- runc
- "cri-o"
- "cri-o-runc"

crio_runc_path: /usr/sbin/runc
7 changes: 7 additions & 0 deletions roles/container-engine/cri-o/vars/fedora.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@ crio_packages:
- cri-tools

crio_conmon: /usr/libexec/crio/conmon

# TODO: remove crio_kubernetes_version_matrix and crio_version once Fedora supports 1.19
crio_kubernetes_version_matrix:
"1.18": "1.18"
"1.17": "1.17"

crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.17') }}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be better to add # NOTE: Need to specify 1.17 for fedora instead of the default 1.19 due to test failure or something because it is a little tricky to specify different version here from the default one.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok will do

8 changes: 2 additions & 6 deletions roles/container-engine/cri-o/vars/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
---

crio_packages:
- "cri-o-{{ crio_version }}"
- "cri-o"
- "cri-o-runc"

crio_runc_path: /usr/sbin/runc

crio_kubernetes_version_matrix:
"1.18": "1.17"
"1.17": "1.17"
"1.16": "1.16"