Skip to content

fix: avoid t8s HelmRelease name colliding with run_plugin's cluster_id - #1261

Merged
mbuechse merged 1 commit into
SovereignCloudStack:mainfrom
cwrau:fix/t8s-hr-name-config-collision
Jul 30, 2026
Merged

fix: avoid t8s HelmRelease name colliding with run_plugin's cluster_id#1261
mbuechse merged 1 commit into
SovereignCloudStack:mainfrom
cwrau:fix/t8s-hr-name-config-collision

Conversation

@cwrau

@cwrau cwrau commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

Summary

  • run_plugin.py sets config['name'] to the cluster_id (e.g. teuto-1.36) for every plugin kind, for use by other plugins.
  • PluginT8s (merged in feat: add t8s kaas offering #1244) reused that same name key for the VAP/RBAC-mandated HelmRelease name, so its "scs-kaas-certification" default never took effect — the HelmRelease was created as teuto-1.36/teuto-1.35 instead, which the ValidatingAdmissionPolicy on the management cluster rejects, breaking CI.
  • Renamed the config key to hrName to avoid the collision. teuto-1.35/teuto-1.36 entries in clusters.yaml.j2 don't set it, so they correctly fall back to scs-kaas-certification.

Test plan

  • Added test_hr_name_ignores_run_plugin_name, simulating run_plugin.py's setdefault('name', cluster_id) behavior, to prevent regression.
  • python -m pytest Tests/kaas/plugin — 29/29 passed.
  • flake8 --config=.flake8 — clean except pre-existing unrelated warnings.

@cwrau
cwrau force-pushed the fix/t8s-hr-name-config-collision branch from 6c883ce to e5e17c8 Compare July 30, 2026 17:48
run_plugin.py sets config['name'] to the cluster_id for every plugin kind, so PluginT8s's use of the same key for the VAP/RBAC-mandated HelmRelease name never fell back to its intended value. Renamed to 'hrName', now set explicitly in clusters.yaml.j2 for each teuto entry instead of defaulted in code.

Signed-off-by: Chris Werner Rau <cwrau@cwrau.info>
@cwrau
cwrau force-pushed the fix/t8s-hr-name-config-collision branch from e5e17c8 to 48fe84f Compare July 30, 2026 18:08
@cwrau
cwrau requested review from fkr and garloff as code owners July 30, 2026 18:08

@mbuechse mbuechse left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looking great. Thanks a ton for the quick action!

@mbuechse
mbuechse merged commit eb7e77c into SovereignCloudStack:main Jul 30, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants