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.

Sign up for GitHub

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

Jump to bottom

Add support for containerd #5

Merged
merged 2 commits into from
Jun 16, 2020
Merged

Add support for containerd #5

merged 2 commits into from
Jun 16, 2020

Conversation

vpnachev
Copy link
Member

@vpnachev vpnachev commented Apr 22, 2020 •
edited
Loading

What this PR does / why we need it:
Add support for containerd

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:
Inspired by gardener/gardener-extension-os-ubuntu#5

Release note:

It is now supported to configure the `containerd` CRI for worker pools using the Garden Linux machine images.

@vpnachev vpnachev requested a review from a team as a code owner April 22, 2020 20:52
@gardener-robot-ci-3 gardener-robot-ci-3 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Apr 22, 2020
@gardener-robot-ci-1 gardener-robot-ci-1 added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Apr 22, 2020
@rfranzke
Copy link
Member

@danielfoehrKn could you have a look?

@vpnachev vpnachev force-pushed the support-containerd branch from 4a79d6b to 74cdcdd Compare April 24, 2020 06:19
@gardener-robot-ci-2 gardener-robot-ci-2 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Apr 24, 2020
@gardener-robot-ci-1 gardener-robot-ci-1 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Apr 24, 2020
@danielfoehrKn
Copy link
Contributor

Will take a look soon.

@zanetworker
Copy link

zanetworker commented Apr 24, 2020 •
edited
Loading

@vpnachev doesn't this script already https://github.com/gardener/gardener/blob/master/charts/seed-operatingsystemconfig/original/templates/scripts/_init-containerd.sh cover this part?

@danielfoehrKn
Copy link
Contributor

danielfoehrKn commented Apr 24, 2020 •
edited
Loading

@zanetworker no, the script in the gardener only generates the containerd config. The changes here add the drop-in file for the containerd.service to actually use the generated config file.

@danielfoehrKn
Copy link
Contributor

Could you also adjust the unit test that makes sure that includes the changes above?

@danielfoehrKn danielfoehrKn mentioned this pull request Jun 5, 2020
Merged
@danielfoehrKn danielfoehrKn mentioned this pull request Jun 8, 2020
Merged
@vpnachev vpnachev force-pushed the support-containerd branch from 74cdcdd to a0160bf Compare June 13, 2020 11:17
@gardener-robot-ci-3 gardener-robot-ci-3 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jun 13, 2020
@gardener-robot-ci-2 gardener-robot-ci-2 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jun 13, 2020
@gardener-robot-ci-3 gardener-robot-ci-3 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Jun 13, 2020
@vpnachev vpnachev mentioned this pull request Jun 13, 2020
Merged
@vpnachev vpnachev force-pushed the support-containerd branch from 08fbf53 to 9dd9612 Compare June 13, 2020 15:05
@gardener-robot-ci-2 gardener-robot-ci-2 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jun 13, 2020
@gardener-robot-ci-1 gardener-robot-ci-1 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jun 13, 2020
danielfoehrKn
danielfoehrKn approved these changes Jun 16, 2020
View reviewed changes
Copy link
Contributor

@danielfoehrKn danielfoehrKn left a comment

Choose a reason for hiding this comment

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

Looks good

@danielfoehrKn danielfoehrKn merged commit 3c04fc2 into gardener:master Jun 16, 2020
@vpnachev vpnachev deleted the support-containerd branch June 16, 2020 18:50
@ialidzhikov ialidzhikov mentioned this pull request Sep 29, 2020
Merged
LucaBernstein pushed a commit to LucaBernstein/gardener-extension-os-gardenlinux that referenced this pull request Jun 5, 2024
@rfranzke
Merge pull request gardener#5 from nimrodoron/containerd-new-2
9f230f5 
GEP 10 - ContainerD Enablement
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danielfoehrKn danielfoehrKn danielfoehrKn approved these changes

Assignees

@danielfoehrKn danielfoehrKn

Labels
needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@vpnachev @rfranzke @danielfoehrKn @zanetworker @gardener-robot-ci-1 @gardener-robot-ci-2 @gardener-robot-ci-3