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

Add support for containerd to antrea-eks-node-init.yml #3840

Merged

Conversation

antoninbas
Copy link
Contributor

@antoninbas antoninbas commented May 27, 2022

Containerd is available as an alternative to docker since EKS
v1.21. Starting with EKS v1.23, containerd will also be the default
container runtime. Currently antrea-eks-node-init.yml assumes that
docker is always the container runtime, which means that Antrea cannot
be run on EKS clusters using containerd. We fix this by adding support
for containerd.

We also make a couple of improvements to the startup script in
antrea-eks-node-init.yml, to ensure that it can be run again if the
contents of the script change, which is useful for testing and may
also be useful to roll out patches.

Finally, we update our EKS CI to test with containerd instead of docker,
since containerd will be the default soon.

Fixes #3471

Signed-off-by: Antonin Bas abas@vmware.com

@antoninbas antoninbas added this to the Antrea v1.7 release milestone May 27, 2022
@antoninbas antoninbas added the area/provider/aws Issues or PRs related to aws provider. label May 27, 2022
@antoninbas
Copy link
Contributor Author

I'm going to run the cloud CI on my branch for testing

@codecov-commenter
Copy link

codecov-commenter commented May 27, 2022

Codecov Report

Merging #3840 (069890c) into main (069890c) will not change coverage.
The diff coverage is n/a.

❗ Current head 069890c differs from pull request most recent head d8f3572. Consider uploading reports for the commit d8f3572 to get more accurate results

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #3840   +/-   ##
=======================================
  Coverage   47.70%   47.70%           
=======================================
  Files         256      256           
  Lines       37092    37092           
=======================================
  Hits        17693    17693           
  Misses      17673    17673           
  Partials     1726     1726           
Flag Coverage Δ
kind-e2e-tests 47.70% <0.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link
Contributor

@jianjuns jianjuns left a comment

Choose a reason for hiding this comment

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

Nits.

build/yamls/antrea-eks-node-init.yml Outdated Show resolved Hide resolved
build/yamls/antrea-eks-node-init.yml Outdated Show resolved Hide resolved
@tnqn tnqn added the action/release-note Indicates a PR that should be included in release notes. label May 30, 2022
tnqn
tnqn previously approved these changes May 30, 2022
Copy link
Member

@tnqn tnqn left a comment

Choose a reason for hiding this comment

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

LGTM, a type in commit message: ensuire

@antoninbas
Copy link
Contributor Author

/skip-all

Containerd is available as an alternative to docker since EKS
v1.21. Starting with EKS v1.23, containerd will also be the default
container runtime. Currently antrea-eks-node-init.yml assumes that
docker is always the container runtime, which means that Antrea cannot
be run on EKS clusters using containerd. We fix this by adding support
for containerd.

We also make a couple of improvements to the startup script in
antrea-eks-node-init.yml, to ensure that it can be run again if the
contents of the script change, which is useful for testing and may also
be useful to roll out patches.

Finally, we update our EKS CI to test with containerd instead of docker,
since containerd will be the default soon.

Fixes antrea-io#3471

Signed-off-by: Antonin Bas <abas@vmware.com>
@antoninbas antoninbas force-pushed the support-containerd-for-eks-clusters branch from d8f3572 to f82f51e Compare May 31, 2022 20:04
@antoninbas
Copy link
Contributor Author

@antoninbas
Copy link
Contributor Author

/skip-all

@antoninbas antoninbas merged commit 8a49504 into antrea-io:main May 31, 2022
@antoninbas antoninbas deleted the support-containerd-for-eks-clusters branch May 31, 2022 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
action/release-note Indicates a PR that should be included in release notes. area/provider/aws Issues or PRs related to aws provider.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

antrea-eks-node-init and containerd
4 participants