OCPCLOUD-3326: Update to use new manifests-gen #584

mdbooth · 2025-12-16T17:33:59Z

No description provided.

openshift-ci · 2025-12-16T17:34:04Z

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

coderabbitai · 2025-12-16T17:34:10Z

Walkthrough

Updates OpenShift CAPI operator packaging: changes Dockerfile manifest copy paths, replaces the Makefile's ocp-manifests invocation with a more granular manifests-gen call, adds kustomize and provider metadata under openshift/capi-operator-manifests, removes a legacy AWS ConfigMap, and updates openshift/tools/go.mod dependencies.

Changes

Cohort / File(s)	Summary
Docker build `openshift/Dockerfile.openshift`	Adjusts the manifests copy: source moved from `/build/openshift/manifests` to `openshift/capi-operator-manifests` and image destination changed from `/manifests` to `/capi-operator-manifests`.
Makefile / manifests-gen invocation `openshift/Makefile`	Replaces previous `ocp-manifests` flags (`--provider-name`, `--provider-type`, `--provider-version`, `--base-path`, `--manifests-path`) with new flags including `--manifests-path ../capi-operator-manifests`, `--kustomize-dir`, `--name`, `--install-order`, `--attribute` (type/version), `--self-image-ref`, `--platform`, and `--protect-cluster-resource`.
CAPI operator manifests & kustomize `openshift/capi-operator-manifests/default/metadata.yaml`, `openshift/kustomization.yaml`	Adds provider metadata (`attributes.type=infra`, `attributes.version=v2.10.0`, `installOrder=20`, `name`, `ocpPlatform`, `selfImageRef`) and a Kustomization that references the generated component, `../config/default` resource, an image rewrite, and a JSON patch targeting a ServiceAccount annotation.
Removed legacy manifest `openshift/manifests/0000_30_cluster-api_04_cm.infrastructure-aws.yaml`	Deletes the AWS infrastructure ConfigMap manifest (entire file removed).
Dependency updates `openshift/tools/go.mod`	Large dependency restructuring: bumps `manifests-gen` pseudo-version, replaces and updates many Kubernetes/OpenShift and container-related modules, and adds/removes various indirect dependencies.
Removed helper script `openshift/fetch_ext_bins.sh`	Removes the script that fetched and prepared external tool binaries (kubebuilder tooling and related env setup).

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~45 minutes

✨ Finishing touches

📝 Generate docstrings

🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment

No actionable comments were generated in the recent review. 🎉

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

openshift-ci-robot · 2025-12-16T17:36:37Z

@mdbooth: This pull request references OCPCLOUD-3326 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

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.

theobarberbany · 2026-02-06T17:45:25Z

/lgtm
/approve

openshift-ci · 2026-02-06T17:46:41Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: theobarberbany

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:

~~OWNERS~~ [theobarberbany]

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

coderabbitai

Actionable comments posted: 1

🤖 Fix all issues with AI agents

In `@openshift/kustomization.yaml`:
- Around line 21-23: The JSON Patch path for the remove op is missing the
closing brace and thus doesn't match the annotation key; update the patch entry
whose path currently reads
/metadata/annotations/${AWS_CONTROLLER_IAM_ROLE~1#arn~1eks.amazonaws.com~1role-arn
to include the trailing } so it exactly matches the annotation key
`${AWS_CONTROLLER_IAM_ROLE/#arn/eks.amazonaws.com/role-arn}` (keeping the ~1
separators as used in the patch encoding).

coderabbitai · 2026-02-12T11:04:02Z

openshift/kustomization.yaml

+  patch: |-
+    - op: remove
+      path: /metadata/annotations/${AWS_CONTROLLER_IAM_ROLE~1#arn~1eks.amazonaws.com~1role-arn


⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🏁 Script executed:

# First, let's read the openshift/kustomization.yaml file to see the exact content cat -n openshift/kustomization.yaml

Repository: openshift/cluster-api-provider-aws

Length of output: 841

🏁 Script executed:

# Search for AWS_CONTROLLER_IAM_ROLE references in the codebase rg -n "AWS_CONTROLLER_IAM_ROLE" --type yaml -C 3

Repository: openshift/cluster-api-provider-aws

Length of output: 1707

🏁 Script executed:

# Look for ServiceAccount definitions and annotation patterns rg -n "metadata/annotations" --type yaml -C 2

Repository: openshift/cluster-api-provider-aws

Length of output: 625

JSON Patch path is truncated - missing closing }.

The annotation key in config/rbac/serviceaccount.yaml is ${AWS_CONTROLLER_IAM_ROLE/#arn/eks.amazonaws.com/role-arn} (ends with }), but the patch path on line 23 omits the closing brace. This causes the patch to fail silently since it won't match any existing annotation.

Correct the path:

Diff

patch: |- - op: remove - path: /metadata/annotations/${AWS_CONTROLLER_IAM_ROLE~1#arn~1eks.amazonaws.com~1role-arn + path: /metadata/annotations/${AWS_CONTROLLER_IAM_ROLE~1#arn~1eks.amazonaws.com~1role-arn}

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

patch: |-

- op: remove

path: /metadata/annotations/${AWS_CONTROLLER_IAM_ROLE~1#arn~1eks.amazonaws.com~1role-arn

patch: |-

- op: remove

path: /metadata/annotations/${AWS_CONTROLLER_IAM_ROLE~1#arn~1eks.amazonaws.com~1role-arn}

🤖 Prompt for AI Agents

In `@openshift/kustomization.yaml` around lines 21 - 23, The JSON Patch path for the remove op is missing the closing brace and thus doesn't match the annotation key; update the patch entry whose path currently reads /metadata/annotations/${AWS_CONTROLLER_IAM_ROLE~1#arn~1eks.amazonaws.com~1role-arn to include the trailing } so it exactly matches the annotation key `${AWS_CONTROLLER_IAM_ROLE/#arn/eks.amazonaws.com/role-arn}` (keeping the ~1 separators as used in the patch encoding).

theobarberbany · 2026-02-12T11:08:25Z

/lgtm

coderabbitai

Actionable comments posted: 1

🤖 Fix all issues with AI agents

In `@openshift/Makefile`:
- Around line 26-29: The shell command in the Makefile that invokes
$(MANIFESTS_GEN) is concatenating the `--install-order` value and the next flag
because the backslash is immediately after `20`; update the line with
`--install-order 20\` so there is a space before the backslash (e.g.,
`--install-order 20 \`) to ensure `--attribute` (and subsequent flags) are
passed as separate arguments to the `MANIFESTS_GEN` invocation.

coderabbitai · 2026-02-12T11:10:58Z

openshift/Makefile

+	cd tools && $(MANIFESTS_GEN) --manifests-path "../capi-operator-manifests" --kustomize-dir="../../openshift" \
+		--name cluster-api-provider-aws \
+		--install-order 20\
+		--attribute type=infrastructure \


⚠️ Potential issue | 🔴 Critical

Fix the line continuation after --install-order to avoid flag concatenation.

Without a space before the backslash, the shell concatenates 20 with --attribute, so manifests-gen receives --install-order 20--attribute and the --attribute flag is lost, likely breaking the command.

Proposed fix

- --install-order 20\ + --install-order 20 \

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

cd tools && $(MANIFESTS_GEN) --manifests-path "../capi-operator-manifests" --kustomize-dir="../../openshift" \

--name cluster-api-provider-aws \

--install-order 20\

--attribute type=infrastructure \

cd tools && $(MANIFESTS_GEN) --manifests-path "../capi-operator-manifests" --kustomize-dir="../../openshift" \

--name cluster-api-provider-aws \

--install-order 20 \

--attribute type=infrastructure \

🤖 Prompt for AI Agents

In `@openshift/Makefile` around lines 26 - 29, The shell command in the Makefile that invokes $(MANIFESTS_GEN) is concatenating the `--install-order` value and the next flag because the backslash is immediately after `20`; update the line with `--install-order 20\` so there is a space before the backslash (e.g., `--install-order 20 \`) to ensure `--attribute` (and subsequent flags) are passed as separate arguments to the `MANIFESTS_GEN` invocation.

theobarberbany · 2026-02-12T17:10:23Z

/retest

theobarberbany · 2026-02-12T17:36:55Z

/retest

openshift-ci · 2026-02-12T17:53:17Z

New changes are detected. LGTM label has been removed.

openshift-ci · 2026-02-12T21:20:20Z

@mdbooth: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aws-capi-techpreview	`f57fdb9`	link	true	`/test e2e-aws-capi-techpreview`
ci/prow/unit	`f57fdb9`	link	true	`/test unit`

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.

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 16, 2025

mdbooth changed the title ~~Update to use new manifests-gen~~ OCPCLOUD-3326: Update to use new manifests-gen Dec 16, 2025

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 16, 2025

mdbooth mentioned this pull request Dec 16, 2025

OCPCLOUD-3327: Rewrite manifests-gen to support upgrade safety openshift/cluster-capi-operator#434

Merged

mdbooth force-pushed the manifests-gen branch from ce4b500 to 799b643 Compare December 18, 2025 17:06

mdbooth force-pushed the manifests-gen branch from 9e676d3 to 1743766 Compare January 5, 2026 16:54

theobarberbany force-pushed the manifests-gen branch from 1743766 to cb7778f Compare January 16, 2026 14:40

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 16, 2026

theobarberbany force-pushed the manifests-gen branch from cb7778f to 732cd52 Compare January 16, 2026 14:44

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 16, 2026

theobarberbany force-pushed the manifests-gen branch from 732cd52 to e799452 Compare January 23, 2026 17:09

theobarberbany force-pushed the manifests-gen branch from e799452 to db9ad01 Compare February 4, 2026 10:54

JoelSpeed marked this pull request as ready for review February 6, 2026 17:43

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 6, 2026

openshift-ci bot assigned theobarberbany Feb 6, 2026

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 6, 2026

openshift-ci bot requested review from damdo and racheljpg February 6, 2026 17:46

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 6, 2026

theobarberbany force-pushed the manifests-gen branch from db9ad01 to edeb50c Compare February 12, 2026 11:01

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 12, 2026

coderabbitai bot reviewed Feb 12, 2026

View reviewed changes

mdbooth added 2 commits February 12, 2026 11:07

UPSTREAM: <carry>: Bump manifests-gen

5248488

UPSTREAM: <carry>: Update to new manifests-gen

1037ebf

theobarberbany force-pushed the manifests-gen branch from edeb50c to 1037ebf Compare February 12, 2026 11:07

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 12, 2026

coderabbitai bot reviewed Feb 12, 2026

View reviewed changes

UPSTREAM: <carry>: Delegate unit tests to make test

f57fdb9

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 12, 2026

OCPCLOUD-3326: Update to use new manifests-gen #584

Are you sure you want to change the base?

OCPCLOUD-3326: Update to use new manifests-gen #584

Conversation

mdbooth commented Dec 16, 2025

Uh oh!

openshift-ci bot commented Dec 16, 2025

Uh oh!

coderabbitai bot commented Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Estimated code review effort

Uh oh!

openshift-ci-robot commented Dec 16, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

theobarberbany commented Feb 6, 2026

Uh oh!

openshift-ci bot commented Feb 6, 2026

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

theobarberbany commented Feb 12, 2026

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

theobarberbany commented Feb 12, 2026

Uh oh!

theobarberbany commented Feb 12, 2026

Uh oh!

openshift-ci bot commented Feb 12, 2026

Uh oh!

openshift-ci bot commented Feb 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

coderabbitai bot commented Dec 16, 2025 •

edited

Loading

openshift-ci-robot commented Dec 16, 2025 •

edited by openshift-ci bot

Loading