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

Fix typo in Containerd configuration #8206

Merged
merged 1 commit into from Nov 19, 2021

Conversation

pasqualet
Copy link
Contributor

What type of PR is this?
/kind bug

What this PR does / why we need it:
Fix typo introduced in #8123

Which issue(s) this PR fixes:
Fixes #8186

Does this PR introduce a user-facing change?:

NONE

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 18, 2021
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 18, 2021
@@ -13,7 +13,7 @@ containerd_runc_runtime:
engine: ""
root: ""
options:
systemCgroup: "true"
systemdCgroup: "true"
Copy link
Contributor

Choose a reason for hiding this comment

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

I would propose something better:

Suggested change
systemdCgroup: "true"
systemdCgroup: "{{ (kubelet_cgroup_driver == 'systemd') | ternary('true', 'false', omit) }}"

As it stands, just fixing the typo breaks kubelet_cgroup_driver: cgroupfs scenario.

Copy link
Member

@floryut floryut left a comment

Choose a reason for hiding this comment

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

@pasqualet ok @cristicalin was also doing this on an other PR but fine by me if it's fine by him

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: floryut, pasqualet

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 Nov 18, 2021
@cristicalin
Copy link
Contributor

Forget my recommendation above as it is broken, the proper way would be to set

systemdCgroup: "{{ containerd_use_systemd_cgroup | ternary('true', 'false') }}"

... which is what I'm testing in the other PR.

I'm fine with this PR addressing the issue but in a proper way as pointed above, since the scope of #8175 is not to fix containerd support but switch to it as the default in CI, I'm actually pulling out unrelated changes into separate PRs to keep the git history clean.

@pasqualet pasqualet changed the title Fix typo in Containerd configuration WIP: Fix typo in Containerd configuration Nov 18, 2021
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 18, 2021
@pasqualet pasqualet marked this pull request as draft November 18, 2021 11:37
@@ -2,5 +2,5 @@

- name: set kubelet_config_extra_args options when cgroupfs is used
Copy link
Contributor

Choose a reason for hiding this comment

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

I would ask you to remove this task al together in favour of modifying the options in a single place in default.yml, it is easier to grep for values and understand where they are coming from and how they depend on each other.

@pasqualet
Copy link
Contributor Author

@cristicalin You're right, the ternary solution is better to understand and visualize, but here I was just updating the facts because it was already in place.

Previously, this cgroup option was developed in this way to follow the same pattern of other cgroups options in ./roles/kubernetes/node/tasks/facts.yml. Maybe all this part could be refactored to make it simpler and easier to review.

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 18, 2021
@pasqualet pasqualet marked this pull request as ready for review November 18, 2021 16:12
@pasqualet pasqualet changed the title WIP: Fix typo in Containerd configuration Fix typo in Containerd configuration Nov 18, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 18, 2021
@cristicalin
Copy link
Contributor

Thank you @pasqualet for the fix!

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 19, 2021
@k8s-ci-robot k8s-ci-robot merged commit fe8c843 into kubernetes-sigs:master Nov 19, 2021
sakuraiyuta pushed a commit to sakuraiyuta/kubespray that referenced this pull request Apr 16, 2022
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jun 28, 2023
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Calico-node crashed on Debian 11
4 participants