Skip to content

Use consistent names for node and cluster config#7586

Open
twz123 wants to merge 1 commit into
k0sproject:mainfrom
twz123:consistent-config-naming
Open

Use consistent names for node and cluster config#7586
twz123 wants to merge 1 commit into
k0sproject:mainfrom
twz123:consistent-config-naming

Conversation

@twz123

@twz123 twz123 commented May 7, 2026

Copy link
Copy Markdown
Member

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

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

@twz123 twz123 added the chore label May 7, 2026
@twz123 twz123 marked this pull request as ready for review May 7, 2026 13:37
@twz123 twz123 requested review from a team as code owners May 7, 2026 13:37
@twz123 twz123 requested review from jnummelin and ncopa May 7, 2026 13:37
@twz123 twz123 enabled auto-merge May 7, 2026 13:37
@github-actions

github-actions Bot commented May 9, 2026

Copy link
Copy Markdown
Contributor

This pull request has merge conflicts that need to be resolved.

@github-actions

Copy link
Copy Markdown
Contributor

This pull request has merge conflicts that need to be resolved.

@twz123 twz123 force-pushed the consistent-config-naming branch from bb63c2c to 43bff7d Compare May 29, 2026 15:35
@github-actions

github-actions Bot commented Jun 1, 2026

Copy link
Copy Markdown
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>
@twz123 twz123 force-pushed the consistent-config-naming branch from 43bff7d to d1b8c02 Compare June 2, 2026 06:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant