refactor: adjust the order of merging kubeadm configs #2567
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
Codecov ReportBase: 65.09% // Head: 65.09% // No change to project coverage 👍
Additional details and impacted files@@ Coverage Diff @@
## main #2567 +/- ##
=======================================
Coverage 65.09% 65.09%
=======================================
Files 8 8
Lines 573 573
=======================================
Hits 373 373
Misses 168 168
Partials 32 32 Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
fengxsong
force-pushed
the
feat_2562
branch
2 times, most recently
from
76e2324 to
40b3bc2
Compare
cuisongliu
reviewed
Feb 13, 2023
| k.ImageKubeVersion = k.getKubeVersionFromImage() | ||
| for _, fn := range []string{ | ||
| "", // generate default kubeadm configs | ||
| k.getDefaultKubeadmConfig(), // merging from predefined path of file if file exists |
There was a problem hiding this comment.
- k.getDefaultKubeadmConfig()
- “”
is OK
There was a problem hiding this comment.
This way in the comment, as well as the original, both are setting default values first, then dst will not be overwritten even if the src is set. IMO, with mergo's transformers is more intuitive.
Signed-off-by: fengxsong <[email protected]>
cuisongliu
approved these changes
Feb 13, 2023
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.
Signed-off-by: fengxsong [email protected]
Seems it's already implemented but needs some adjustments. #2562