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

Allow containerd config imports #1630

Merged
merged 1 commit into from Feb 21, 2024
Merged

Conversation

ndbaker1
Copy link
Member

@ndbaker1 ndbaker1 commented Feb 6, 2024

Issue #, if available:
#1628

Description of changes:

adding an import path for containerd to read for merging config tomls: https://github.com/containerd/containerd/blob/main/docs/man/containerd-config.toml.5.md#complete-configuration

avoid the need for users to directly edit the containerd config toml.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Testing Done

See this guide for recommended testing for PRs. Some tests may not apply. Completing tests and providing additional validation steps are not required, but it is recommended and may reduce review time and time to merge.

@cartermckinnon cartermckinnon changed the title add import path glob to containerd file Allow containerd config imports Feb 6, 2024
@cartermckinnon
Copy link
Member

/ci

Copy link
Contributor

github-actions bot commented Feb 6, 2024

@cartermckinnon roger that! I've dispatched a workflow. 👍

@cartermckinnon
Copy link
Member

cartermckinnon commented Feb 6, 2024

We need a user guide section about this, this should be the preferred way of amending the EKS containerd defaults on AL2.

@dims
Copy link
Member

dims commented Feb 6, 2024

@ndbaker1 do we create the directory? (is /etc/containerd/config.d/ already present on disk)

@ndbaker1
Copy link
Member Author

ndbaker1 commented Feb 6, 2024

We need a user guide section about this, this should be the preferred way of amending the EKS containerd defaults on AL2.

updated the user guide 👍 PTAL

do we create the directory?

we weren't, just added this to bootstrap.sh to allow users to assume it exists when piping/writing to it

Copy link
Member

@cartermckinnon cartermckinnon left a comment

Choose a reason for hiding this comment

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

Think the wording can be tightened up and most of the details left in the code.

doc/USER_GUIDE.md Outdated Show resolved Hide resolved
doc/USER_GUIDE.md Outdated Show resolved Hide resolved
doc/USER_GUIDE.md Outdated Show resolved Hide resolved
doc/USER_GUIDE.md Outdated Show resolved Hide resolved
doc/USER_GUIDE.md Outdated Show resolved Hide resolved
Copy link
Contributor

github-actions bot commented Feb 6, 2024

@cartermckinnon the workflow that you requested has completed. 🎉

Kubernetes versionBuildLaunchTest
1.23success ✅success ✅success ✅
1.24success ✅success ✅success ✅
1.25success ✅success ✅success ✅
1.26success ✅success ✅success ✅
1.27success ✅success ✅success ✅
1.28success ✅success ✅success ✅
1.29success ✅success ✅success ✅

@dims
Copy link
Member

dims commented Feb 6, 2024

we weren't, just added this to bootstrap.sh to allow users to assume it exists when piping/writing to it

thanks @ndbaker1

@@ -555,6 +555,7 @@ if [[ "$CONTAINER_RUNTIME" = "containerd" ]]; then
fi

sudo mkdir -p /etc/containerd
sudo mkdir -p /etc/containerd/config.d
Copy link
Member

Choose a reason for hiding this comment

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

Do we need this if it's created at build time?

Copy link
Member Author

@ndbaker1 ndbaker1 Feb 6, 2024

Choose a reason for hiding this comment

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

bottom line, probably not, but its still a contract set at bootstrap time so i figure its safe to have in both 🤔

@cartermckinnon
Copy link
Member

/ci

let's see what the latest rev looks like...

Copy link
Contributor

github-actions bot commented Feb 7, 2024

@cartermckinnon roger that! I've dispatched a workflow. 👍

Copy link
Contributor

github-actions bot commented Feb 7, 2024

@cartermckinnon the workflow that you requested has completed. 🎉

Kubernetes versionBuildLaunchTest
1.23success ✅success ✅success ✅
1.24success ✅success ✅success ✅
1.25success ✅success ✅success ✅
1.26success ✅success ✅success ✅
1.27success ✅success ✅success ✅
1.28success ✅success ✅success ✅
1.29success ✅success ✅success ✅

@cartermckinnon cartermckinnon changed the base branch from master to main February 15, 2024 01:02
@cartermckinnon
Copy link
Member

I changed the base branch to main and this is gonna need a rebase + some TLC. Sorry!

@ndbaker1 ndbaker1 force-pushed the contd-import branch 3 times, most recently from 3bbcd08 to 68ccf4c Compare February 15, 2024 17:14
@ndbaker1
Copy link
Member Author

thanks for the reminder! rebased now @cartermckinnon

@phillebaba
Copy link

Could we get an eye on this 😃 it would be nice to get a release with this fix so that we can resolve upstream issues.

@Issacwww
Copy link
Member

/ci

@ndbaker1
Copy link
Member Author

/ci

Copy link
Contributor

@ndbaker1 roger that! I've dispatched a workflow. 👍

Copy link
Contributor

@ndbaker1 the workflow that you requested has completed. 🎉

Kubernetes versionBuildLaunchTest
1.23failure ❌skipped ⏭️skipped ⏭️
1.24failure ❌skipped ⏭️skipped ⏭️
1.25success ✅success ✅success ✅
1.26success ✅success ✅success ✅
1.27success ✅success ✅success ✅
1.28success ✅success ✅success ✅
1.29success ✅success ✅success ✅

@ndbaker1 ndbaker1 merged commit d72a04a into awslabs:main Feb 21, 2024
10 checks passed
@ndbaker1 ndbaker1 deleted the contd-import branch February 21, 2024 21:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants