Use consistent names for node and cluster config#7586
Open
twz123 wants to merge 1 commit into
Open
Conversation
Contributor
|
This pull request has merge conflicts that need to be resolved. |
20c09d4 to
bb63c2c
Compare
Contributor
|
This pull request has merge conflicts that need to be resolved. |
bb63c2c to
43bff7d
Compare
Contributor
|
This pull request has merge conflicts that need to be resolved. |
For historical reasons, k0s has multiple configuration flavors, all of which are backed by the same ClusterConfig struct. Node-local configuration is usually called "node config", whereas the cluster-wide, reconcilable configuration is called "cluster config". The ClusterConfig struct represents a superset of all the fields, though not all of them are part of one or the other. Different parts of the code didn't use the correct wording for the actual values being operated on. This made it difficult to determine which configuration a variable or field referred to, potentially leading to false assumptions, even. Make the naming consistent with the actual values and remove a few ClusterConfig fields that are no longer used. Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
43bff7d to
d1b8c02
Compare
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
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
For historical reasons, k0s has multiple configuration flavors, all of which are backed by the same ClusterConfig struct. Node-local configuration is usually called "node config", whereas the cluster-wide, reconcilable configuration is called "cluster config". The ClusterConfig struct represents a superset of all the fields, though not all of them are part of one or the other.
Different parts of the code didn't use the correct wording for the actual values being operated on. This made it difficult to determine which configuration a variable or field referred to, potentially leading to false assumptions, even.
Make the naming consistent with the actual values and remove a few ClusterConfig fields that are no longer used.
Type of change
How Has This Been Tested?
Checklist