no-jira: Fix verify capi manifests script #9752

patrickdillon · 2025-05-28T19:15:33Z

The verify-capi-manifests script was failing on nutanix, which referenced an individual commit--not a release. Fixed that by adding git fetch and scripting some dependency management.

Also included fixup of mismatched CRDs.

Nutanix was crashing the script due to: - using an unavailable git ref (fixed by adding git fetch) - dependency issues: kustomize & controller-gen not found

These are the correct versions of the CRDs, according to the verify-capi-manifests script.

openshift-ci-robot · 2025-05-28T19:15:36Z

@patrickdillon: This pull request explicitly references no jira issue.

Details

In response to this:

The verify-capi-manifests script was failing on nutanix, which referenced an individual commit--not a release. Fixed that by adding git fetch and scripting some dependency management.

Also included fixup of mismatched CRDs.

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.

tthvo

/approve

Looks good! I just have a small nit and a question.

tthvo · 2025-05-28T22:46:04Z

hack/verify-capi-manifests.sh


+
+	# Install `controller-gen` & `kustomize`, which are needed by nutanix, if not present


I thought, usually, these tools are version-pinned and downloaded automatically on their side. Let me see if I can contribute upstream.

Also, took this chance to nit pick an extra newline haha

Suggested change

# Install `controller-gen` & `kustomize`, which are needed by nutanix, if not present

# Install `controller-gen` & `kustomize`, which are needed by nutanix, if not present

Upstream PR: nutanix-cloud-native/cluster-api-provider-nutanix#522

Hopefully, someone will take a look soon haha 😅

Yeah this would definitely be better--thanks for doing it right. I tried to ping some upstream reviewers on your PR.

Thanks @patrickdillon ! From comments upstream, they "did" similarly but moved to dev-box. So it's not great to make them switch again so I closed it 😓

So, currently this way is best we can do :D I am only concerned as it is using "latest"...

tthvo · 2025-05-28T23:08:31Z

hack/verify-capi-manifests.sh

 		clone_path="$(mktemp -d)"
 		git clone "${repo_origin}" "${clone_path}"
 		pushd "${clone_path}"
+		git fetch "${repo_origin}" "${revision}"


One of the concerns I observed: there are small diffs in infra manifest between the released assets and the generated ones in the same commit.

One example: #9704 (review). Or similarly, if I run the ./hack/verify-capi-manifests.sh again in this PR here (released v1.17.5 azure-infra manifest). I see:

diff --git a/data/data/cluster-api/azure-infrastructure-components.yaml b/data/data/cluster-api/azure-infrastructure-components.yaml index 215de54e78..abca06bac3 100644 --- a/data/data/cluster-api/azure-infrastructure-components.yaml +++ b/data/data/cluster-api/azure-infrastructure-components.yaml @@ -80694,7 +80694,7 @@ stringData: AZURE_SUBSCRIPTION_ID: "" AZURE_SYNC_PERIOD: ${AZURE_SYNC_PERIOD:=""} AZURE_TENANT_ID: "" - AZURE_USER_AGENT_SUFFIX: cluster-api-provider-azure/v1.17.5 + AZURE_USER_AGENT_SUFFIX: cluster-api-provider-azure/main type: Opaque --- apiVersion: v1 @@ -80980,8 +80980,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: registry.k8s.io/cluster-api-azure/cluster-api-azure-controller:v1.17.5 - imagePullPolicy: IfNotPresent + image: gcr.io/k8s-staging-cluster-api-azure/cluster-api-azure-controller:main + imagePullPolicy: Always livenessProbe: httpGet: path: /healthz

I guess it does not matter much. But one idea is, for this script, to first find the released assets. If any, use that. If not, generate from code (maybe future improvement). WDYT?

@patrickdillon I have a sketch of the idea above here: patrickdillon#2 (i.e. against this PR branch) if you'd like to have a quick look 😃

One of the benefits I can see is the shorter time to run the script (i.e. time ./hack/verify-capi-manifests.sh):
Before: 4m12.324s
After: 2m29.181s (with patrickdillon#2)

Updated: #9752 (comment) is added before CAPZ PR was merged. Though, I guess the question for checking released assets first is still valid?

openshift-ci · 2025-05-28T23:09:05Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tthvo

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~~ [tthvo]

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

This improvement includes trying out the released assets first if any. In case that fails (i.e. not a version, or non-existing asset URL), fall back to generate from pinned revision.

barbacbd · 2025-06-02T20:05:33Z

/hold

Adding a hold as a safety precaution. The upstream PR should merge and a new CRD should be regenerated either off of master or when a release puts one out (where the PR is included 😄 )

In regards to

Updated: https://github.com/openshift/installer/pull/9752#discussion_r2112903348
is added before CAPZ PR was merged. Though, I guess the question for checking
released assets first is still valid?

patrickdillon · 2025-07-30T15:32:42Z

The current version of this pr has been breaking because the nutanix gitref is not actually merged (it is pointing to a pr). #9855 should unblock this.

openshift-merge-robot · 2025-09-11T16:18:40Z

PR needs rebase.

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.

openshift-ci · 2025-09-11T16:18:56Z

@patrickdillon: 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-vsphere-externallb-ovn	`d4b8b4d`	link	false	`/test e2e-vsphere-externallb-ovn`
ci/prow/okd-scos-e2e-aws-ovn	`d4b8b4d`	link	false	`/test okd-scos-e2e-aws-ovn`
ci/prow/shellcheck	`d4b8b4d`	link	true	`/test shellcheck`
ci/prow/yaml-lint	`d4b8b4d`	link	true	`/test yaml-lint`

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-bot · 2025-12-11T01:00:17Z

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

tthvo · 2025-12-11T03:53:03Z

/remove-lifecycle stale

patrickdillon · 2026-01-15T18:44:10Z

/close

in favor of #10212

openshift-ci · 2026-01-15T18:46:01Z

@patrickdillon: Closed this PR.

Details

In response to this:

/close

in favor of #10212

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.

patrickdillon added 2 commits May 28, 2025 15:14

hack/verify-capi-manifests: fixup nutanix

041dfb8

Nutanix was crashing the script due to: - using an unavailable git ref (fixed by adding git fetch) - dependency issues: kustomize & controller-gen not found

data/cluster-api: fixup crds

e03a969

These are the correct versions of the CRDs, according to the verify-capi-manifests script.

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

openshift-ci bot requested review from barbacbd and rwsu May 28, 2025 19:16

patrickdillon mentioned this pull request May 28, 2025

no-jira: Bump CAPZ Version #9704

Merged

tthvo reviewed May 28, 2025

View reviewed changes

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 28, 2025

tthvo added 2 commits May 28, 2025 23:22

no-jira: improvement to the verify-capi-manifests scripts

0aba0c2

This improvement includes trying out the released assets first if any. In case that fails (i.e. not a version, or non-existing asset URL), fall back to generate from pinned revision.

update deps docs

d4b8b4d

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 2, 2025

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 11, 2025

openshift-ci bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 11, 2025

openshift-ci bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 11, 2025

openshift-ci bot closed this Jan 15, 2026



		# Install `controller-gen` & `kustomize`, which are needed by nutanix, if not present

no-jira: Fix verify capi manifests script #9752

no-jira: Fix verify capi manifests script #9752

Conversation

patrickdillon commented May 28, 2025

Uh oh!

openshift-ci-robot commented May 28, 2025

Uh oh!

tthvo left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented May 28, 2025

Uh oh!

barbacbd commented Jun 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

patrickdillon commented Jul 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-merge-robot commented Sep 11, 2025

Uh oh!

openshift-ci bot commented Sep 11, 2025

Uh oh!

openshift-bot commented Dec 11, 2025

Uh oh!

tthvo commented Dec 11, 2025

Uh oh!

patrickdillon commented Jan 15, 2026

Uh oh!

openshift-ci bot commented Jan 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

barbacbd commented Jun 2, 2025 •

edited

Loading

patrickdillon commented Jul 30, 2025 •

edited

Loading