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

Jump to bottom

fix broken ubuntu containerd engine #5002

Merged
merged 1 commit into from Jul 30, 2019
Merged

fix broken ubuntu containerd engine #5002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion roles/container-engine/containerd/tasks/main.yml
View file
Open in desktop
Expand Up @@ -101,7 +101,7 @@

- name: Check if runc is installed
stat:
path: /usr/sbin/runc
path: "{{ runc_binary }}"
Copy link
Contributor

Choose a reason for hiding this comment

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

I added a default in my PR (https://github.com/kubernetes-sigs/kubespray/pull/5015/files#diff-6de31f202b896e5bda48a50cd465d94aR77). I think this is a good idea because otherwise Suse deployments will fail since the variables for suse doesn't contain a runc_binary variable: https://github.com/kubernetes-sigs/kubespray/blob/master/roles/container-engine/containerd/vars/suse.yml

Ad soon as your PR is merged I would rebase mine.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

default has been already defined in defaults/main.yml.

You don't need redefine default.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, I missed this one, thanks !

register: runc_stat

- name: Install runc package if necessary
Expand Down
3 changes: 3 additions & 0 deletions roles/container-engine/containerd/vars/ubuntu-amd64.yml
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
containerd_versioned_pkg:
'latest': "{{ containerd_package }}"
'1.2.4': "{{ containerd_package }}=1.2.4-1"
Copy link
Contributor

Choose a reason for hiding this comment

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

I would also add 1.2.5 to support the same versions as the RedHat family.

'1.2.6': "{{ containerd_package }}=1.2.6-3"
'stable': "{{ containerd_package }}=1.2.4-1"
'edge': "{{ containerd_package }}=1.2.4-1"

Expand All @@ -25,3 +26,5 @@ containerd_repo_info:
deb {{ containerd_ubuntu_repo_base_url }}
{{ ansible_distribution_release|lower }}
{{ containerd_ubuntu_repo_component }}

runc_binary: /usr/bin/runc