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.

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

Update support for Amazon Linux 2 #8425

Merged
merged 1 commit into from
Jan 29, 2020

Conversation

hakman
Copy link
Member

@hakman hakman commented Jan 28, 2020

Amazon Linux 2 support is broken with Docker packages for CentOS, because of the missing container-selinux dependency. Even if this is added from the CentOS repo, it is missing its own dependencies. Sadly, this is not something that can be easily fixed.

The good news is that Amazon Linux 2 has SELinux disabled by default, so the container-selinux package is not needed. Static binaries for containerd or Docker should run just fine.

#8199 adds support for static binaries for latest containerd and can be used to setup a Kubernetes cluster on Amazon Linux 2 with minor changes.

This PR adds the following changes:

  • separates Amazon Linux from CentOS and RHEL to not require installing container-selinux
  • updates default containerd version to 1.3.2 (noting to worry, this is targeted for 1.18)
  • adds simpler aliases for well known accounts

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 28, 2020
@hakman
Copy link
Member Author

hakman commented Jan 28, 2020

/cc @rifelpet

@hakman
Copy link
Member Author

hakman commented Jan 28, 2020

/assign @justinsb

@justinsb
Copy link
Member

Thanks @hakman - it does feel like there are a few possibly unrelated changes in this PR (introducing Amazon System Linux 2, changing the containerd version, recognizing more aliases), and in general this might in future cause problems with cherry-picks, so it's probably a good idea to split them up into separate PRs. (They're also easier to review so we should be able to merge them faster ;-) )

But in this case they're relatively related, so we should just merge:

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 29, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman, 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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 29, 2020
@hakman
Copy link
Member Author

hakman commented Jan 29, 2020

Indeed, the new aliases could have been a separate PR. Thanks @justinsb :)

@k8s-ci-robot k8s-ci-robot merged commit 2509919 into kubernetes:master Jan 29, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Jan 29, 2020
@hakman hakman deleted the fix-amazon-linux branch January 30, 2020 02:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants