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 containerd config file to Flatcar based instances #10540

Merged
merged 1 commit into from
Jan 7, 2021

Conversation

hakman
Copy link
Member

@hakman hakman commented Jan 6, 2021

This makes it possible to configure Flatcar from kOps and also fixes the issue of custom socket location (different approach to #10518).

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 6, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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

@k8s-ci-robot k8s-ci-robot added area/nodeup approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 6, 2021
@hakman
Copy link
Member Author

hakman commented Jan 6, 2021

/cc @rifelpet

nodeup/pkg/model/containerd.go Outdated Show resolved Hide resolved
@hakman
Copy link
Member Author

hakman commented Jan 6, 2021

/retest

@rifelpet
Copy link
Member

rifelpet commented Jan 7, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 7, 2021
@k8s-ci-robot k8s-ci-robot merged commit 59c6aaa into kubernetes:master Jan 7, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Jan 7, 2021
@hakman hakman deleted the flatcar-containerd-config branch January 10, 2021 05:30
k8s-ci-robot added a commit that referenced this pull request Jan 15, 2021
…-upstream-release-1.19

Automated cherry pick of #10540: Add containerd config file to Flatcar based instances
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/nodeup cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants