Skip to content

Conversation

@Danil-Grigorev
Copy link

@Danil-Grigorev Danil-Grigorev commented Apr 14, 2025

Remove direct helm chart modifications beyond chart install config, and merge experimental flags configuration with fleet chart installation.

Simplify conditions handling by using get_or_insert_default.

Flags configuration inside ConfigMap is refactored to ensure that code works on a valid structure, despite the custom merge of json and yaml data inside it due to downstream expectations. We also need to set condition on the resource, to display the state of the reconcile.

Fixes #250

Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>
.collect());
let env_map = settings.fleet.extra_env.get_or_insert_default();

match env_map
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

self.status
.get_or_insert_default()
.conditions
.push(Condition {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice one, this was missing.

@Danil-Grigorev Danil-Grigorev self-assigned this Apr 14, 2025
@Danil-Grigorev Danil-Grigorev moved this to In Progress (8 max) in CAPI / Turtles Apr 14, 2025
@Danil-Grigorev Danil-Grigorev moved this from In Progress (8 max) to PR to be reviewed in CAPI / Turtles Apr 14, 2025
@Danil-Grigorev Danil-Grigorev added this pull request to the merge queue Apr 14, 2025
Merged via the queue into rancher:main with commit fdb2abe Apr 14, 2025
19 checks passed
@Danil-Grigorev Danil-Grigorev deleted the patch-flags-on-install branch April 14, 2025 13:37
@github-project-automation github-project-automation bot moved this from PR to be reviewed to Done in CAPI / Turtles Apr 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

Perform experimental flags management only on upstream charts

2 participants