Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Separate the initialization and reconciliation in ClusterConfigReconciler #4747

Merged
merged 6 commits into from
Aug 7, 2024

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Jul 11, 2024

Description

The cluster config initialization and the reconciliation are two independent things. The ClusterConfigReconciler did both of them at the same time. By separating the initialization part into the ClusterConfigInitializer, there's a clearer separation of concerns, and no longer the need to have a NeedToStoreInitialConfig method on config sources.

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 own 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 added 6 commits July 11, 2024 12:24
Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
This is something that's separate from the cluster config
reconciliation, hence start to decouple them.

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
It's more straight forward to move the CRD application into the if
branch that configures dynamic configuration instead of relying on the
ConfigSource method.

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
This allows for the removal of the initializer-only dependencies from
the reconciler. Adding the initializer only if dynamic config is enabled
allows the NeedToStoreInitialConfig method to be removed from the config
sources.

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
The Reconcile method is all that's needed, so no need to force a
specific implementation.

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
@twz123 twz123 marked this pull request as ready for review July 11, 2024 11:04
@twz123 twz123 requested a review from a team as a code owner July 11, 2024 11:05
@twz123 twz123 requested review from kke and juanluisvaladas July 11, 2024 11:05
@jnummelin jnummelin merged commit 032237f into k0sproject:main Aug 7, 2024
82 checks passed
@twz123 twz123 deleted the clusterconfigreco-separation branch September 6, 2024 07:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants