Skip to content

fix: use explicit Clusters Service ARM helper config - #6478

Draft
roi (roivaz) wants to merge 2 commits into
Azure:mainfrom
roivaz:fix/cs-arm-helper-helm-fallback
Draft

fix: use explicit Clusters Service ARM helper config#6478
roi (roivaz) wants to merge 2 commits into
Azure:mainfrom
roivaz:fix/cs-arm-helper-helm-fallback

Conversation

@roivaz

@roivaz roi (roivaz) commented Aug 7, 2026

Copy link
Copy Markdown
Collaborator

https://redhat.atlassian.net/browse/AROSLSRE-1776

What

Make the Clusters Service chart consume only clustersServiceArmHelperClientId and clustersServiceArmHelperCertName. The chart no longer reads the Backend armHelperClientId or armHelperCertName fields and contains no identity fallback logic.

Configuration owns identity sharing explicitly:

  • environments with a dedicated Clusters Service identity set the CS fields to that identity;
  • environments sharing the Backend identity set both pairs to the same client ID and certificate;
  • single-lease CI copies the leased Backend pair into the CS fields, while two-lease CI keeps the pairs distinct.

Focused Helm fixtures cover shared and distinct identity configurations.

Why

The original split in #6454 performed fallback in preprocessed cluster-service/values.yaml. In EV2 resolve mode, the dedicated references became non-empty __...__ placeholders, so the conditional selected them before EV2 substituted INT's real empty values. Helm received empty helper fields, omitted the ARM-helper flags and certificate mount, and Clusters Service fell back to the mock FPA for CheckAccess V2.

#6476 restored the shared identity as an incident mitigation. Keeping environment migration policy out of the chart makes the re-land simpler and removes the entire placeholder/fallback failure class: Clusters Service has one explicit configuration pair, and each environment decides which identity populates it.

openshift/release PR #83084 remains on hold until this chart support is ready.

Testing

  • make verify-materialize
  • Cluster Service Helm fixtures with shared and distinct identity pairs
  • Bash syntax validation and ShellCheck for hack/ci/build-config-override.sh
  • Single-lease override generation produces identical Backend and CS pairs
  • Two-lease override generation produces distinct Backend and CS pairs
  • check-ev2-render semantic guard
  • sdp-pipelines EV2 resolve-mode generation for Microsoft.Azure.ARO.HCP.ClusterService

Special notes for your reviewer

The large generated portion consists of the two standard Helm fixtures. The dedicated identity infrastructure and configuration fields introduced by #6454 remain unchanged.

PR Checklist

  • PR is scoped to a single task (no mixed concerns)
  • Title follows Conventional Commits format
  • Summary explains the "Why" behind the change
  • Linked to relevant ticket/issue
  • Screenshots included (not applicable)
  • Self-reviewed the diff
  • CI/CD checks are passing (ignore Tide)
  • Draft PR used for WIP
  • Commit history is clean (will squash before marking ready)
  • Tricky code blocks are commented (not applicable)
  • Specific reviewers tagged
  • All comment threads resolved before merge

Pass shared and dedicated ARM-helper values independently through EV2, then select the dedicated pair from the Helm chart only when both values are present. This keeps INT on the shared identity until its dedicated values are configured and avoids resolve-mode placeholder truthiness.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@openshift-ci

openshift-ci Bot commented Aug 7, 2026

Copy link
Copy Markdown

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Have the Cluster Service chart consume only clustersServiceArmHelperClientId and clustersServiceArmHelperCertName. Environments without a dedicated identity must populate those fields with the shared identity; single-lease CI now does so explicitly.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@openshift-ci

openshift-ci Bot commented Aug 7, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: roivaz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@roivaz roi (roivaz) changed the title fix: select CS ARM helper after EV2 substitution fix: use explicit Clusters Service ARM helper config Aug 7, 2026
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.

1 participant