Only clean up containerd hosts dirs managed by k3s #10823
Merged
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.
Proposed Changes
Only clean up containerd hosts dirs managed by k3s
If the user creates their own hosts.toml, or drops CA or client certs in the directory by hand, we shouldn't delete them whenever K3s starts.
Types of Changes
enhancement
Verification
/var/lib/rancher/k3s/agent/etc/containerd/certs.d/MYREGISTRY
and add custom hosts.toml and/or certs. Restart K3s, and note that the custom content you created is left alone./var/lib/rancher/k3s/agent/etc/containerd/certs.d/MYREGISTRY/hosts.toml
to remove the DO NOT EDIT header and restart k3s; note that it is reverted to the managed content./var/lib/rancher/k3s/agent/etc/containerd/certs.d/MYREGISTRY
is removed.Testing
Linked Issues
agent/etc/containerd/certs.d/*
files are deleted by k3s on startup #10787User-Facing Change
Further Comments