OCPBUGS-66948: Pin IPAM CRDs to release-4.20 #253

mdbooth · 2025-12-09T12:08:32Z

We can't push v1beta2 IPAM to production clusters without also running the conversion webhook, so we pin to the last released version which did not have it.

TPNU clusters continue to get the latest CAPI.

Pull in manifests-gen from openshift/cluster-capi-operator#425

openshift-ci-robot · 2025-12-09T12:08:41Z

@mdbooth: This pull request references Jira Issue OCPBUGS-6698, which is invalid:

expected the bug to be open, but it isn't
expected the bug to target either version "4.21." or "openshift-4.21.", but it targets "4.13.0" instead
expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done) instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Revert changes to IPAM CRD manifests

DNM: Fucking vendoring

Tooling to build IPAM CRD manifests from 4.20

Build IPAM CRDs from 4.20

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.

openshift-ci · 2025-12-09T12:09:55Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mdbooth

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

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

openshift-ci-robot · 2025-12-09T12:13:08Z

@mdbooth: This pull request references Jira Issue OCPBUGS-66948, which is invalid:

expected the bug to target the "4.21.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Revert changes to IPAM CRD manifests

DNM: Fucking vendoring

Tooling to build IPAM CRD manifests from 4.20

Build IPAM CRDs from 4.20

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.

mdbooth · 2025-12-09T12:13:12Z

/jira refresh

openshift-ci-robot · 2025-12-09T12:13:17Z

@mdbooth: This pull request references Jira Issue OCPBUGS-66948, which is invalid:

expected the bug to target the "4.21.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

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.

mdbooth · 2025-12-09T12:15:25Z

/jira refresh

openshift-ci-robot · 2025-12-09T12:15:33Z

@mdbooth: This pull request references Jira Issue OCPBUGS-66948, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.21.0) matches configured target version for branch (4.21.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Details

In response to this:

/jira refresh

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.

mdbooth · 2025-12-09T12:24:43Z

/payload-job periodic-ci-openshift-release-master-nightly-4.21-e2e-vsphere-static-ovn

openshift-ci · 2025-12-09T12:24:49Z

@mdbooth: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-master-nightly-4.21-e2e-vsphere-static-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/0b0cdbf0-d4fa-11f0-81d7-e2152966c00b-0

mdbooth · 2025-12-09T13:50:24Z

/test e2e-vsphere-capi-techpreview

mdbooth · 2025-12-09T13:51:10Z

/test e2e-aws-capi-techpreview

mdbooth · 2025-12-09T13:56:23Z

/test e2e-vsphere-capi-techpreview
/test e2e-aws-capi-techpreview

openshift-ci-robot · 2025-12-09T15:48:37Z

@mdbooth: This pull request references Jira Issue OCPBUGS-66948, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.21.0) matches configured target version for branch (4.21.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Details

In response to this:

We can't push v1beta2 IPAM to production clusters without also running the conversion webhook, so we pin to the last released version which did not have it.

TPNU clusters continue to get the latest CAPI.

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.

We can't push v1beta2 IPAM to production clusters without also running the conversion webhook, so we pin to the last released version which did not have it. TPNU clusters continue to get the latest CAPI.

mdbooth · 2025-12-09T16:33:35Z

/cherry-pick release-4.21

openshift-cherrypick-robot · 2025-12-09T16:33:38Z

@mdbooth: once the present PR merges, I will cherry-pick it on top of release-4.21 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.21

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.

mdbooth · 2025-12-09T16:51:54Z

/payload-job periodic-ci-openshift-release-master-nightly-4.21-e2e-vsphere-static-ovn

openshift-ci · 2025-12-09T16:52:39Z

@mdbooth: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-master-nightly-4.21-e2e-vsphere-static-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/5ec29bc0-d51f-11f0-8868-0d46b3cdbe8f-0

JoelSpeed · 2025-12-09T17:14:39Z

openshift/Makefile

+.PHONY: update-ipam-ref
+update-ipam-ref:
+	# Get the current HEAD of the release-4.20 branch
+	$(eval current_head := $(shell git ls-remote https://github.com/openshift/cluster-api release-4.20 | awk '$$2 == "refs/heads/release-4.20" {print $$1}'))


This doesn't feel like it's going to age well, or is the intention for this not to age well?

I don't think we can ever go beyond 4.20 without a radically new approach. We're really hoping that radically new approach is going to be the CAPI Operator 😅 At that point we don't need any of this.

JoelSpeed · 2025-12-09T17:18:25Z

openshift/ipam/kustomization.yaml

+
+  # Instructs CVO to only install these resources in clusters with the Default
+  # featureset. Specifically this means that they will not be installed in
+  # (TechPreview|Custom|Dev)NoUpgrade clusters.


Suggested change

# (TechPreview|Custom|Dev)NoUpgrade clusters.

# (TechPreview|Custom|DevPreview)NoUpgrade clusters.

openshift-ci · 2025-12-09T19:44:35Z

@mdbooth: 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.

damdo · 2025-12-09T19:53:32Z

/hold

For question from @JoelSpeed

JoelSpeed · 2025-12-10T10:05:35Z

/hold cancel

We are pinning this until we have a way to deploy the v1beta1 and v1beta2 versions alongside each other, with conversion webhook, in a Default feature set cluster

damdo · 2025-12-10T10:07:47Z

/label acknowledge-critical-fixes-only

To fix a Vsphere MAO/CAPI IPAM regression bug that is considered release blocking

damdo · 2025-12-10T12:46:57Z

@sunzhaohua2 manually verified and informed us here that 4.20 upgrade to 4.21 image built with this PR n.253 succeeds

damdo · 2025-12-10T12:47:56Z

Also the installation of vsphere clusters with staticip via IPAM is successful again with the changes in this PR as confirmed by ci/prow/e2e-vsphere-staticip-ipam-ovn

damdo · 2025-12-10T12:49:00Z

/verified by @sunzhaohua2 via manual upgrade and presubmit vsphere static ip job passing.

openshift-ci-robot · 2025-12-10T12:49:12Z

@damdo: This PR has been marked as verified by @sunzhaohua2 via [manual upgrade](https://github.com/openshift/cluster-api/pull/253#issuecomment-3636937696) and [presubmit vsphere static ip job passing](https://github.com/openshift/cluster-api/pull/253#issuecomment-3636941901)..

Details

In response to this:

/verified by @sunzhaohua2 via manual upgrade and presubmit vsphere static ip job passing.

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.

damdo

/lgtm

openshift-ci-robot · 2025-12-10T13:00:02Z

@mdbooth: Jira Issue Verification Checks: Jira Issue OCPBUGS-66948
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-66948 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

We can't push v1beta2 IPAM to production clusters without also running the conversion webhook, so we pin to the last released version which did not have it.

TPNU clusters continue to get the latest CAPI.

Pull in manifests-gen from openshift/cluster-capi-operator#425

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.

openshift-cherrypick-robot · 2025-12-10T13:01:10Z

@mdbooth: Failed to get PR patch from GitHub. This PR will need to be manually cherrypicked.

Error message

status code 406 not one of [200], body: {"message":"Sorry, the diff exceeded the maximum number of files (300). Consider using 'List pull requests files' API or locally cloning the repository instead.","errors":[{"resource":"PullRequest","field":"diff","code":"too_large"}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#list-pull-requests-files","status":"406"}

Details

In response to this:

/cherry-pick release-4.21

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-merge-robot · 2025-12-11T13:15:26Z

Fix included in accepted release 4.21.0-0.nightly-2025-12-10-193741

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 9, 2025

openshift-ci bot requested review from chrischdi and damdo December 9, 2025 12:09

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

mdbooth changed the title ~~OCPBUGS-6698: Pin IPAM CRDs to release-4.20~~ OCPBUGS-66948: Pin IPAM CRDs to release-4.20 Dec 9, 2025

openshift-ci-robot added the jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. label Dec 9, 2025

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 9, 2025

mdbooth marked this pull request as draft December 9, 2025 12:16

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 9, 2025

damdo mentioned this pull request Dec 9, 2025

OCPBUGS-66948: manifests-gen: Don't separate IPAM CRDs openshift/cluster-capi-operator#425

Merged

mdbooth force-pushed the OCPBUGS-6698 branch from 92e6fae to e573220 Compare December 9, 2025 15:47

mdbooth marked this pull request as ready for review December 9, 2025 15:47

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 Dec 9, 2025

openshift-ci bot requested a review from racheljpg December 9, 2025 15:49

mdbooth force-pushed the OCPBUGS-6698 branch from e573220 to 4aac1fa Compare December 9, 2025 16:07

mdbooth added 3 commits December 9, 2025 16:22

UPSTREAM: <carry>: Pin IPAM CRD manifests to CAPI from release-4.20

1f11a6d

We can't push v1beta2 IPAM to production clusters without also running the conversion webhook, so we pin to the last released version which did not have it. TPNU clusters continue to get the latest CAPI.

UPSTREAM: <drop>: generate ocp-manifests

3fd45de

UPSTREAM: <drop>: go mod tidy; go mod vendor

58d17f0

mdbooth force-pushed the OCPBUGS-6698 branch from 4aac1fa to 58d17f0 Compare December 9, 2025 16:27

JoelSpeed reviewed Dec 9, 2025

View reviewed changes

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

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

openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Dec 10, 2025

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Dec 10, 2025

damdo reviewed Dec 10, 2025

View reviewed changes

openshift-ci bot assigned damdo Dec 10, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 10, 2025

openshift-merge-bot bot merged commit 65eb451 into openshift:master Dec 10, 2025
18 checks passed

mdbooth deleted the OCPBUGS-6698 branch December 10, 2025 13:20

neisw mentioned this pull request Dec 11, 2025

TRT-2473: Revert "Pin IPAM CRDs to release-4.20" #254

Closed

	# (TechPreview\|Custom\|Dev)NoUpgrade clusters.
	# (TechPreview\|Custom\|DevPreview)NoUpgrade clusters.

OCPBUGS-66948: Pin IPAM CRDs to release-4.20 #253

OCPBUGS-66948: Pin IPAM CRDs to release-4.20 #253

Uh oh!

Conversation

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

Uh oh!

Uh oh!

openshift-ci-robot commented Dec 9, 2025

Uh oh!

openshift-ci bot commented Dec 9, 2025

Uh oh!

openshift-ci-robot commented Dec 9, 2025

Uh oh!

mdbooth commented Dec 9, 2025

Uh oh!

openshift-ci-robot commented Dec 9, 2025

Uh oh!

mdbooth commented Dec 9, 2025

Uh oh!

openshift-ci-robot commented Dec 9, 2025

Uh oh!

mdbooth commented Dec 9, 2025

Uh oh!

openshift-ci bot commented Dec 9, 2025

Uh oh!

mdbooth commented Dec 9, 2025

Uh oh!

mdbooth commented Dec 9, 2025

Uh oh!

mdbooth commented Dec 9, 2025

Uh oh!

openshift-ci-robot commented Dec 9, 2025

Uh oh!

mdbooth commented Dec 9, 2025

Uh oh!

openshift-cherrypick-robot commented Dec 9, 2025

Uh oh!

mdbooth commented Dec 9, 2025

Uh oh!

openshift-ci bot commented Dec 9, 2025

Uh oh!

JoelSpeed Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

mdbooth Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

JoelSpeed Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Dec 9, 2025

Uh oh!

damdo commented Dec 9, 2025

Uh oh!

JoelSpeed commented Dec 10, 2025

Uh oh!

damdo commented Dec 10, 2025

Uh oh!

damdo commented Dec 10, 2025

Uh oh!

damdo commented Dec 10, 2025

Uh oh!

damdo commented Dec 10, 2025

Uh oh!

openshift-ci-robot commented Dec 10, 2025

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

openshift-ci-robot commented Dec 10, 2025

Uh oh!

openshift-cherrypick-robot commented Dec 10, 2025

Uh oh!

openshift-merge-robot commented Dec 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

mdbooth commented Dec 9, 2025 •

edited

Loading