Use raw tarfile for AmazonLinux2 + Containerd 1.2.10 #9032
Conversation
k8s-ci-robot
added
cncf-cla: yes
|
Should fix e.g. https://k8s-testgrid.appspot.com/google-aws#kops-grid-flannel-amzn2-k16 . I think k16 && amzn2 will always fail right now. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: justinsb The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
area/nodeup
approved
|
cc @hakman |
nodeup/pkg/model/docker.go
Outdated
| @@ -439,11 +439,12 @@ var dockerVersions = []packageVersion{ | |||
| }, | |||
| }, | |||
|
|
|||
| // 18.09.9 - CentOS / Rhel7 | |||
| // 18.09.9 - CentOS7 / Rhel7 | |||
| // (relies on container-selinux, so not suitable for amazonlinux2) | |||
There was a problem hiding this comment.
I don't think this will help much in the future.
| // (relies on container-selinux, so not suitable for amazonlinux2) |
There was a problem hiding this comment.
Because 18.09 goes away, or because container-selinux will be supported on amazonlinux2?
If it's the confusing phrasing, re-reading, I definitely agree... perhaps "(we can't use this package on amazonlinux2, because it relies on container-selinux)"
There was a problem hiding this comment.
With this fix we create a separate section for Amazon Linux 2. I think it is enough. Maybe add the comment to the Amazon Linux 2 section?
Starting 1.18, we use only the static package and there is no need for extra explanations.
There was a problem hiding this comment.
Ah gotcha. I'll add the comment there!
|
/wip |
The rpm containerd 1.2.10 package depends on container-selinux, which isn't available on amazonlinux2. We can't just skip it, because we can't install the package without its dependencies. Instead, install from a binary package (tar.gz). We do the same for dockker 18.09.9 and 19.03.4, as these would otherwise depend on containerd 1.2.10. Co-authored-by: Ciprian Hacman <ciprianhacman@gmail.com>
|
/lgtm |
k8s-ci-robot
added
the
lgtm
The rpm containerd 1.2.10 package depends on containerd-selinux, which
isn't available on amazonlinux2. We can't just skip it, because we
can't install the package without its dependencies.
Instead, install from a binary package.