[release-1.18] Fix handling of existing imports in containerd #1384
Conversation
This file contains hidden or 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
This change fixes the handling of existing imports in containerd config files. Without this fix the existing imports were dropped and replaced with the import directive for the generated drop-in file. Signed-off-by: Evan Lezar <[email protected]> (cherry picked from commit 40c3a75)
elezar
approved these changes
Oct 23, 2025
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.
🤖 Automated backport of #1382 to
release-1.18✅ Cherry-pick completed successfully with no conflicts.
Original PR: #1382
Original Author: @elezar
Cherry-picked commits (1):
40c3a75Fix handling of existing imports in containerdThis backport was automatically created by the backport bot.