Skip to content

[openshift_setup] Merge catalog registry credentials and wait for MCP#4068

Open
rebtoor wants to merge 1 commit into
openstack-k8s-operators:stablefrom
rebtoor:DNM-OSPCIX-1431-catalog-source
Open

[openshift_setup] Merge catalog registry credentials and wait for MCP#4068
rebtoor wants to merge 1 commit into
openstack-k8s-operators:stablefrom
rebtoor:DNM-OSPCIX-1431-catalog-source

Conversation

@rebtoor

@rebtoor rebtoor commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Summary

  • When cifmw_openshift_setup_catalog_registry_credentials is defined, merge the auth into the cluster openshift-config/pull-secret so nodes can pull from the Konflux image-rbac-proxy registry.
  • Wait for MachineConfigPools to settle after IDMS + pull-secret changes before proceeding — ensures nodes have the correct mirrors and credentials before CatalogSource pods attempt to pull.

Context

Architecture-update jobs on OCP 4.18 need openstack-operator.v1.0.7 from a Konflux FBC catalog behind image-rbac-proxy. The pull-secret must contain the registry credentials before the MCP rollout completes and kustomize_deploy creates the CatalogSource.

Related-Issue: #OSPCIX-1431
Closes: ANVIL-159

Test plan

  • Pair with ci-framework-jobs content-set catalog selection MR !3464
  • Run architecture-update validation job on serval66 via testproject !2541

@openshift-ci

openshift-ci Bot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

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

@rebtoor
rebtoor force-pushed the DNM-OSPCIX-1431-catalog-source branch 3 times, most recently from c740eb5 to 057ee3b Compare July 20, 2026 20:06
@rebtoor rebtoor changed the title DNM: Apply CatalogSource from content-set catalog manifest [openshift_setup] Apply CatalogSource from content-set catalog manifest Jul 20, 2026
@rebtoor
rebtoor marked this pull request as ready for review July 20, 2026 20:08
evallesp
evallesp previously approved these changes Jul 21, 2026

@evallesp evallesp 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.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Jul 21, 2026
@rebtoor
rebtoor force-pushed the DNM-OSPCIX-1431-catalog-source branch from 057ee3b to 6043778 Compare July 21, 2026 12:17
@openshift-ci openshift-ci Bot removed the lgtm label Jul 21, 2026
@openshift-ci

openshift-ci Bot commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

New changes are detected. LGTM label has been removed.

@openshift-ci

openshift-ci Bot commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from evallesp. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

When cifmw_openshift_setup_catalog_registry_credentials is defined,
merge the auth into the cluster pull-secret so nodes can pull from
the Konflux image-rbac-proxy registry. Wait for MachineConfigPools
to settle after IDMS + pull-secret changes before proceeding.

Related-Issue: #OSPCIX-1431
Closes: ANVIL-159
Co-authored-by: Cursor <cursoragent@cursor.com>
Signed-off-by: Roberto Alfieri <ralfieri@redhat.com>
@rebtoor
rebtoor force-pushed the DNM-OSPCIX-1431-catalog-source branch from f2ab043 to cae6b5b Compare July 21, 2026 21:59
@rebtoor rebtoor changed the title [openshift_setup] Apply CatalogSource from content-set catalog manifest [openshift_setup] Merge catalog registry credentials and wait for MCP Jul 21, 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.

2 participants