nodeinstaller: ignore absence of containerd config template #1206
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
|
Diff looks reasonable to me. Did you test it by removing the template file on e.g. discovery? |
|
I tested it on a VM with a new k3s installation. |
msanft
approved these changes
Feb 4, 2025
|
Successfully created backport PR for |
|
I think this actually changed with newer k3s versions. I remember it would always create that template, that's also the reason we had to build the handling for it. |
|
I tested with 1.31.5 and 1.30.5, both don't create the template on first install. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commit ff6bfe1 introduced an
os.ReadFileoperation 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.