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

Containerd support for flatcar #1340

Merged
merged 4 commits into from
May 11, 2021
Merged

Containerd support for flatcar #1340

merged 4 commits into from
May 11, 2021

Conversation

mlavacca
Copy link
Contributor

@mlavacca mlavacca commented May 6, 2021

What this PR does / why we need it:
Since Flatcar now enables the CRI plugin by default, this PR introduces its support to containerd.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #1333

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

@kubermatic-bot kubermatic-bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels May 6, 2021
@kubermatic-bot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@kubermatic-bot kubermatic-bot added dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 6, 2021
@mlavacca mlavacca force-pushed the flatcar-containerd-support branch 5 times, most recently from 2f08f32 to 41eb2a9 Compare May 7, 2021 10:14
@mlavacca mlavacca marked this pull request as ready for review May 7, 2021 10:14
@mlavacca mlavacca force-pushed the flatcar-containerd-support branch 2 times, most recently from 754c02b to 83a7584 Compare May 7, 2021 10:33
@kron4eg kron4eg marked this pull request as draft May 7, 2021 10:36
@kubermatic-bot kubermatic-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 7, 2021
@mlavacca mlavacca force-pushed the flatcar-containerd-support branch from 6165e5c to 8774371 Compare May 7, 2021 13:07
@mlavacca mlavacca marked this pull request as ready for review May 7, 2021 13:08
@mlavacca mlavacca changed the title [WIP] Containerd support for flatcar Containerd support for flatcar May 7, 2021
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 7, 2021
@mlavacca mlavacca requested review from xmudrii and kron4eg May 7, 2021 13:56
crinjes
crinjes reviewed May 7, 2021
View reviewed changes
pkg/scripts/os.go Outdated Show resolved Hide resolved
@mlavacca mlavacca force-pushed the flatcar-containerd-support branch 2 times, most recently from 3e90feb to 2e42d4c Compare May 10, 2021 07:30
@mlavacca
Copy link
Contributor Author

/retest

@kron4eg
Copy link
Member

kron4eg commented May 10, 2021

@mlavacca the PR itself looks good 👍

New MC release v1.29.0 has been just released. Release that include kubermatic/machine-controller#958. Please integrate that new version as well an this PR will feature complete support for containerd on flatcar.

@kron4eg
Copy link
Member

kron4eg commented May 10, 2021

@mlavacca the PR itself looks good 👍

New MC release v1.29.0 has been just released. Release that include kubermatic/machine-controller#958. Please integrate that new version as well an this PR will feature complete support for containerd on flatcar.

It means simply changing version here to v1.29.0:

kubeone/pkg/templates/images/images.go

Line 56 in 2bd1393

MachineController: "docker.io/kubermatic/machine-controller:v1.28.0",

@mlavacca mlavacca force-pushed the flatcar-containerd-support branch from 3a4a908 to e7a44b6 Compare May 10, 2021 12:08
@kron4eg
Copy link
Member

kron4eg commented May 10, 2021

/retest

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label May 10, 2021
@kron4eg
Copy link
Member

kron4eg commented May 10, 2021

@xmudrii PTAL

@kron4eg
Copy link
Member

kron4eg commented May 10, 2021

/assign @xmudrii

xmudrii
xmudrii requested changes May 11, 2021
View reviewed changes
.prow.yaml Show resolved Hide resolved
.prow.yaml Show resolved Hide resolved
pkg/scripts/testdata/TestKubeadmFlatcar-force.golden Outdated Show resolved Hide resolved
@kubermatic-bot kubermatic-bot removed the lgtm Indicates that a PR is ready to be merged. label May 11, 2021
@mlavacca mlavacca force-pushed the flatcar-containerd-support branch from e7a44b6 to 6a25219 Compare May 11, 2021 09:13
@mlavacca
Containerd support for flatcar
5032254 
Signed-off-by: Mattia Lavacca <lavacca.mattia@gmail.com>
@mlavacca
E2E test for flatcar with containerd
4fe99c8 
Signed-off-by: Mattia Lavacca <lavacca.mattia@gmail.com>
@mlavacca
Flatcar with containerd enabled in probes.go
f49df9a 
Signed-off-by: Mattia Lavacca <lavacca.mattia@gmail.com>
@mlavacca
Machine-controller version bumped to 1.29.0
8af65bf 
Signed-off-by: Mattia Lavacca <lavacca.mattia@gmail.com>
@mlavacca mlavacca force-pushed the flatcar-containerd-support branch from 6a25219 to 8af65bf Compare May 11, 2021 09:15
@mlavacca
Copy link
Contributor Author

/test pull-kubeone-lint

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label May 11, 2021
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 6aa04405e4efe64e17a2a98d390c5748d6d71433

xmudrii
xmudrii approved these changes May 11, 2021
View reviewed changes
Copy link
Member

@xmudrii xmudrii left a comment

Choose a reason for hiding this comment

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

/approve

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mlavacca, xmudrii

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 11, 2021
@kubermatic-bot kubermatic-bot merged commit 1b16800 into kubermatic:master May 11, 2021
@kubermatic-bot kubermatic-bot added this to the KubeOne 1.3 milestone May 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crinjes crinjes crinjes left review comments

@kron4eg kron4eg kron4eg approved these changes

@xmudrii xmudrii xmudrii approved these changes

Assignees

@kron4eg kron4eg

@xmudrii xmudrii

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
KubeOne 1.3
Development

Successfully merging this pull request may close these issues.

Support containerd on Flatcar Linux
5 participants
@mlavacca @kubermatic-bot @kron4eg @xmudrii @crinjes