DPTP-4410: ArgoCD ignore GCP MachineSet disks on build02, AWS AMI on build05

[deepsm007]

/cc @openshift/test-platform

This PR updates OpenShift CI infrastructure in openshift/release to stop Argo CD from reverting MCO-managed machine image changes for two build clusters.

Practical changes:

• Affected infrastructure: Argo CD Application manifests under clusters/gitops/apps/ that control build clusters.
• build02 (GCP): clusters/gitops/apps/app-cluster-build02.yaml — adds an ignoreDifferences rule for group machine.openshift.io, kind MachineSet that ignores .spec.template.spec.providerSpec.value.disks[]?.image so GCP MachineSet boot disk image updates applied by the Machine Config Operator are not reverted by Argo CD.
• build05 (AWS): clusters/gitops/apps/app-cluster-build05.yaml — adds an ignoreDifferences rule for group machine.openshift.io, kind MachineSet that ignores .spec.template.spec.providerSpec.value.ami so AWS AMI updates applied by MCO are not reverted by Argo CD.

Operational detail:

• Both Argo CD Applications remain on automated sync with selfHeal: true and include the sync option RespectIgnoreDifferences=true so Argo respects these ignore rules during sync.

Notes:

• The PR description references Jira DPTP-4410 and includes a comment directing @openshift/test-platform.
• An expected MachineConfiguration change referenced in the initial summary (clusters/build-clusters/common/assets/_machine-configuration.yaml) was not found in the repository tree provided; only the two Argo CD Application updates are present.

[openshift-ci-robot]

@deepsm007: This pull request references DPTP-4410 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "5.0.0" version, but no target version was set.

Details

In response to this:

/cc @openshift/test-platform

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 9627b5cf-3fb2-4f3c-9b25-18438972baf6

📥 Commits

Reviewing files that changed from the base of the PR and between 5a575ae and 4e325a5.

📒 Files selected for processing (1)

• clusters/build-clusters/common/assets/_machine-configuration.yaml

💤 Files with no reviewable changes (1)

• clusters/build-clusters/common/assets/_machine-configuration.yaml

---

Walkthrough

Added MCO-related configuration and Argo CD ignore rules: a MachineConfiguration now declares managedBootImages for MachineSet managers, and two Argo CD Application manifests add ignoreDifferences rules so Argo won't revert MCO-managed MachineSet providerSpec image fields.

Changes

Machine image management and ArgoCD ignore rules

Layer / File(s)	Summary
MCO managedBootImages declaration clusters/build-clusters/common/assets/_machine-configuration.yaml	spec.managedBootImages.machineManagers changed from [] to include { apiGroup: machine.openshift.io, resource: machinesets, selection: { mode: All } }.
Argo CD ignore rule — GCP MachineSet disk image clusters/gitops/apps/app-cluster-build02.yaml	Added spec.ignoreDifferences entry for group: machine.openshift.io, kind: MachineSet to ignore .spec.template.spec.providerSpec.value.disks[]?.image.
Argo CD ignore rule — AWS MachineSet AMI clusters/gitops/apps/app-cluster-build05.yaml	Added spec.ignoreDifferences entry for group: machine.openshift.io, kind: MachineSet to ignore .spec.template.spec.providerSpec.value.ami.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Suggested reviewers

• Prucek

🚥 Pre-merge checks | ✅ 12

✅ Passed checks (12 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly and specifically describes the main changes: adding ArgoCD ignoreDifferences rules for GCP MachineSet disks on build02 and AWS AMI on build05, matching the actual modifications in the changeset.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names	✅ Passed	PR modifies only YAML config files. The check applies to Ginkgo test code, which is not present in this PR.
Test Structure And Quality	✅ Passed	PR contains no Ginkgo test code. Files modified are YAML configs and standard Go tests. Check not applicable to this PR.
Microshift Test Compatibility	✅ Passed	PR modifies only YAML config files (Argo CD and Machine configuration). No new Ginkgo e2e tests are added, so the MicroShift compatibility check is not applicable.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	No Ginkgo e2e tests are added. All changes are YAML configuration files (Argo CD Applications and Machine Configuration specs). Check applies only to new test code.
Topology-Aware Scheduling Compatibility	✅ Passed	PR modifies ArgoCD Application and MachineConfiguration resources only. No deployment manifests, operators, or controllers with pod scheduling constraints are added or modified.
Ote Binary Stdout Contract	✅ Passed	PR contains only YAML configuration files. No executable code, binaries, or test implementations present. OTE Binary Stdout Contract check not applicable to declarative configs.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	PR contains only YAML configuration changes for ArgoCD Applications. No Ginkgo e2e tests are present. The custom check is not applicable to this PR.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[openshift-merge-bot]

[REHEARSALNOTIFIER]
@deepsm007: no rehearsable tests are affected by this change

Note: If this PR includes changes to step registry files (ci-operator/step-registry/) and you expected jobs to be found, try rebasing your PR onto the base branch. This helps pj-rehearse accurately detect changes when the base branch has moved forward.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

[openshift-ci]

@deepsm007: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

[hector-vido]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deepsm007, hector-vido

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:

• clusters/OWNERS [deepsm007,hector-vido]

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