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

Expose nodegroup container runtime configuration #4051

Merged
merged 7 commits into from
Aug 6, 2021

Conversation

Skarlso
Copy link
Contributor

@Skarlso Skarlso commented Aug 4, 2021

Description

Closes #3979

Checklist

  • Added tests that cover your change (if possible)
  • Added/modified documentation as required (such as the README.md, or the userdocs directory)
  • Manually tested
  • Made sure the title of the PR is a good description that can go into the release notes
  • (Core team) Added labels for change area (e.g. area/nodegroup) and kind (e.g. kind/improvement)

BONUS POINTS checklist: complete for good vibes and maybe prizes?! 🤯

  • Backfilled missing tests for code in same general area 🎉
  • Refactored something and made the world a better place 🌟

@Skarlso Skarlso added the kind/feature New feature or request label Aug 4, 2021
@Skarlso Skarlso force-pushed the expose_containerd branch 3 times, most recently from 5838720 to b81d698 Compare August 5, 2021 06:29
@Skarlso Skarlso force-pushed the expose_containerd branch from b81d698 to cbe00f6 Compare August 5, 2021 06:47
@Skarlso Skarlso marked this pull request as ready for review August 5, 2021 07:39
@Callisto13 Callisto13 changed the title Exposing container runtime to node configuration Expose container runtime nodegroup configuration Aug 5, 2021
@Callisto13 Callisto13 changed the title Expose container runtime nodegroup configuration Expose nodegroup container runtime configuration Aug 5, 2021
@Callisto13
Copy link
Contributor

And don't forget the docs 😜 In which we should highlight that we are not exposing a flag for this thing, just config

@Skarlso Skarlso force-pushed the expose_containerd branch from 2476fda to 9fdcb98 Compare August 5, 2021 18:22
@cw-sakamoto
Copy link
Contributor

Thanks for the great PR!!

If setting containerRuntime to containerd, I think you don't need the following command, is that correct?
https://github.com/weaveworks/eksctl/blob/50659eb7c041f12e5a481225db40b7ae11662be7/pkg/nodebootstrap/bindata/assets/bootstrap.al2.sh#L24

@Skarlso
Copy link
Contributor Author

Skarlso commented Aug 6, 2021

Thanks for the great PR!!

If setting containerRuntime to containerd, I think you don't need the following command, is that correct?
https://github.com/weaveworks/eksctl/blob/50659eb7c041f12e5a481225db40b7ae11662be7/pkg/nodebootstrap/bindata/assets/bootstrap.al2.sh#L24

Hi! :)

Yes, normally, I would agree, however, there is an issue here awslabs/amazon-eks-ami#698 (comment) that some people reported that this is breaking CI and their flow in some way. I thought about leaving this in there in that case. But I'm not a 100% sure about that. @Callisto13 any thoughts on the comment in the issue?

@cw-sakamoto
Copy link
Contributor

@Skarlso

Thanks for the quick reply!

If keep it, we need to change the path of containerd's sock path below in docker service file.

$ cat /usr/lib/systemd/system/docker.service | grep ExecStart
ExecStartPre=/bin/mkdir -p /run/docker
ExecStartPre=/usr/libexec/docker/docker-setup-runtimes.sh
ExecStart=/usr/bin/dockerd -H fd:// --containerd=/run/containerd/containerd.sock $OPTIONS $DOCKER_STORAGE_OPTIONS $DOCKER_ADD_RUNTIMES

FYI: https://github.com/awslabs/amazon-eks-ami/blob/master/files/containerd-config.toml#L6

@Callisto13
Copy link
Contributor

Callisto13 commented Aug 6, 2021

@Skarlso I think I referred to this line in a comment somewhere (maybe in slack?). This restart was added when we would add/edit the docker daemon config, which I believe we no longer do. So it is likely some legacy stuff which I forgot to remove when I removed some bits which changed the cgroup driver.

So we can:

  1. Try removing it completely, see if it is needed when --container-runtime=dockerd. (I feel it really should not be needed but good to check)
  2. If I am wrong and it is needed, then it will only been required if using dockerd in which can we can throw an if around it. (basically mirroring what that ami bootstrap script is doing: they do not run this if containerd)

make sense?

@Skarlso Skarlso force-pushed the expose_containerd branch from f16e503 to a4e82dc Compare August 6, 2021 11:59
Co-authored-by: Claudia <claudiaberesford@gmail.com>
Co-authored-by: Claudia <claudiaberesford@gmail.com>
Copy link
Contributor

@Callisto13 Callisto13 left a comment

Choose a reason for hiding this comment

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

LGTM!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Expose support for containerd
3 participants