Fallback to file for runtime config #777
Merged
+43
−36
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
elezar
added
the
must-backport
|
I think we need the same fallback logic here as well |
elezar
force-pushed
the
add-config-fallback
branch
from
f6f6282 to
b615ea5
Compare
You're right. I have updated the implementation. I also missed the logic in the |
tariq1890
reviewed
Nov 7, 2024
tariq1890
approved these changes
Nov 7, 2024
elezar
force-pushed
the
add-config-fallback
branch
from
b615ea5 to
bf11286
Compare
tariq1890
reviewed
Nov 7, 2024
| containerd.WithUseLegacyConfig(co.useLegacyConfig), | ||
| containerd.WithContainerAnnotations(co.containerAnnotationsFromCDIPrefixes()...), | ||
| ) | ||
| cfg, err := getConfig(o, co) |
There was a problem hiding this comment.
Suggested change
| cfg, err := getConfig(o, co) | |
| cfg, err := getRuntimeConfig(o, co) |
This change ensures that we fall back to the previous behaviour of reading the existing config from the specified config file if extracting the current config from the command line fails. This fixes use cases where the containerd / crio executables are not available. Signed-off-by: Evan Lezar <[email protected]>
elezar
force-pushed
the
add-config-fallback
branch
from
bf11286 to
e9b8ad9
Compare
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.
This change ensures that we fall back to the previous behaviour of reading the existing config from the specified config file if extracting the current config from the command line fails. This fixes use cases where the containerd / crio executables are not available.