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

[release/v1.4] nodeinstaller: ignore absence of containerd config template #1207

Merged
merged 1 commit into from
Feb 4, 2025

Conversation

edgelessci
Copy link
Contributor

Backport of #1206 to release/v1.4.

Original description:


Commit ff6bfe1 introduced an os.ReadFile operation for the containerd config template used by k3s, assuming that the template file would always be present. However, a fresh installation of k3s does not come with a template file:
https://docs.k3s.io/advanced#configuring-containerd.

On a fresh k3s installation, the nodeinstaller will not find the template file, (falsely) assume that there is no config and use an embedded default, which happens to be incompatible with k3s.

Going forward, the nodeinstaller will treat an absent template like an empty template.

Commit ff6bfe1 introduced an os.ReadFile operation for the containerd
config template used by k3s, assuming that the template file would
always be present. However, a fresh installation of k3s does not come
with a template file:
https://docs.k3s.io/advanced#configuring-containerd.

On a fresh k3s installation, the nodeinstaller will not find the
template file, (falsely) assume that there is no config and use an
embedded default, which happens to be incompatible with k3s.

Going forward, the nodeinstaller will treat an absent template like an
empty template.

(cherry picked from commit 0ae81e5)
@burgerdev burgerdev merged commit 773bbcd into release/v1.4 Feb 4, 2025
12 checks passed
@burgerdev burgerdev deleted the backport-1206-to-release/v1.4 branch February 4, 2025 11:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug fix Fixing a user facing bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants