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

Hardcode Flatcar containerd exec command #12177

Merged

Conversation

hakman
Copy link
Member

@hakman hakman commented Aug 19, 2021

@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 Aug 19, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 19, 2021
@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 Aug 19, 2021
@k8s-ci-robot k8s-ci-robot merged commit 3ddafa3 into kubernetes:master Aug 19, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Aug 19, 2021
@hakman hakman deleted the hardcode_flatcar_containerd_exec branch August 19, 2021 07:31
k8s-ci-robot added a commit that referenced this pull request Aug 19, 2021
…-upstream-release-1.21

Automated cherry pick of #12177: Hardcode Flatcar containerd exec command
@jepio
Copy link

jepio commented Dec 6, 2021

Hi, just wanted add an observation: the two referenced Flatcar PRs didn't change the containerd command, the previous override method was not successful (${CONTAINERD_CONFIG}" was still being looked up in the torcx directory) but containerd-1.4 ignores missing config files and runs with default config, whereas containerd-1.5 errors out in that case.

@hakman
Copy link
Member Author

hakman commented Dec 6, 2021

Thanks for the explanation @jepio. Was a bit harder these days to keep track with any Flatcar related issues as the periodic tests keep failing since kOps switched to IMDSv2 by default for AWS. Not sure if anyone is looking into that, but seems like a pretty simple ignition issue (see: flatcar/ignition#32).

hakman pushed a commit to hakman/kops that referenced this pull request Feb 15, 2022
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.
hakman pushed a commit to hakman/kops that referenced this pull request Feb 15, 2022
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.
ederst pushed a commit to infonova/kops that referenced this pull request Apr 5, 2022
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.
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.

None yet

4 participants