Let cleanup steps hold their own data #5194
Merged
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
|
This pull request has merge conflicts that need to be resolved. |
twz123
force-pushed
the
separate-cleanup-steps-data
branch
from
b131940 to
f22d164
Compare
4 tasks
|
This pull request has merge conflicts that need to be resolved. |
Signed-off-by: Tom Wieczorek <[email protected]>
Use the run dir from the config struct instead. Signed-off-by: Tom Wieczorek <[email protected]>
Signed-off-by: Tom Wieczorek <[email protected]>
So it's obvious which parts of the config it uses. Signed-off-by: Tom Wieczorek <[email protected]>
So it's obvious which parts of the config it uses. Signed-off-by: Tom Wieczorek <[email protected]>
Instead of its own bespoke way of setting up containerd. Signed-off-by: Tom Wieczorek <[email protected]>
Now that the steps hold their onw data, the cleanup step creation can be moved into the NewConfig function, and the Config struct only needs to care about the step slice. Signed-off-by: Tom Wieczorek <[email protected]>
Makes the code a bit clearer. Signed-off-by: Tom Wieczorek <[email protected]>
twz123
force-pushed
the
separate-cleanup-steps-data
branch
from
f22d164 to
3cfc6fd
Compare
jnummelin
approved these changes
Dec 10, 2024
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.
Description
Let the cleanup steps hold their own data, instead of sharing the superset of required things via a pointer to Config. This makes the code structure a bit cleaner, so it is clear which step needs which configuration data.
Use the containerd component in the containers cleanup step to start the managed containerd, instead of the previous ad hoc approach.
Also, remove a hardcoded value for k0s's run directory along the way.
Type of change
How Has This Been Tested?
Checklist: