ROX-24494: ACSCS Addon overrides in Gitops lingers after removing from Gitops #2186
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
ludydoo
reviewed
Feb 7, 2025
| @@ -168,6 +165,39 @@ func (p *AddonProvisioner) provisionAddon(dataplaneClusterConfig gitops.DataPlan | |||
| return | |||
| } | |||
|
|
|||
| func (p *AddonProvisioner) augmentGitopsWithOCMDefaultValues(expectedConfig *gitops.AddonConfig) error { | |||
| if expectedConfig.Version == "" { | |||
There was a problem hiding this comment.
What is this condition about?
There was a problem hiding this comment.
You can specify the addon version in the gitops config. If you do not do this, the latest version will be installed.
ludydoo
approved these changes
Feb 7, 2025
kurlov
approved these changes
Feb 7, 2025
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: kovayur, kurlov, ludydoo The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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
There is only a PATCH endpoint for updating addons in OCM.
So when a parameter is removed from the gitops config, it is not removed from the addon installation or switched to default value as expected, but remains there unmodified. As a result, there will always be a mismatch between the addon installed on the cluster and the expected state of the addon represented in the gitops config.
The proposed solution is to get all the default parameters for the given addon version and enrich the expected addon parameters by the default values.
This will only help if the engineer wants to switch from the value defined in gitops to the default value defined in OCM. When they need to remove a parameter from OCM, it always requires a new version to be released in OCM..
So the full procedure of removing the parameter, will look like the following:
Checklist (Definition of Done)
Test manualROX-12345: ...Test manual
Unit tests