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

Automated cherry pick of #12900: Simplify Flatcar containerd exec command #13258

Conversation

hakman
Copy link
Member

@hakman hakman commented Feb 15, 2022

Cherry pick of #12900 on release-1.21.

#12900: Simplify Flatcar containerd exec command

For details on the cherry pick process, see the cherry pick requests page.

The containerd command used in
kubernetes#12177 is a modification from
the torcx containerd unit. However, how torcx starts containerd is a
implementation detail and it's better to not hardcode torcx in case it
isn't used anymore.
Change the ExecStard command to use /usr/bin/containerd directly,
making it simpler and more future-proof.
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Feb 15, 2022
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 15, 2022
@hakman
Copy link
Member Author

hakman commented Feb 15, 2022

/retest

@hakman
Copy link
Member Author

hakman commented Feb 17, 2022

/cc @johngmyers @olemarkus

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 17, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: olemarkus

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 17, 2022
@k8s-ci-robot k8s-ci-robot merged commit b5a254e into kubernetes:release-1.21 Feb 17, 2022
@hakman hakman deleted the automated-cherry-pick-of-#12900-upstream-release-1.21 branch February 18, 2022 04:26
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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants