Skip to content

[OSPRH-17106] Improve detection of pre-existing OpenStackVersion#1463

Merged
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
abays:osversion_check
Jun 6, 2025
Merged

[OSPRH-17106] Improve detection of pre-existing OpenStackVersion#1463
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
abays:osversion_check

Conversation

@abays

@abays abays commented May 29, 2025

Copy link
Copy Markdown
Contributor

We currently assume the same resource name is used by both resources when we look up the OpenStackVersion associated with an OpenStackControlPlane. Let's try to prevent the divergent situation with a webhook, and then clearly surface the error in the CLI status if somehow the webhook mechanism is subverted.

Jira: https://issues.redhat.com/browse/OSPRH-17106

@openshift-ci

openshift-ci Bot commented May 29, 2025

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

@softwarefactory-project-zuul

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/3e223bf7a42543a29138cef7a7532f7d

✔️ openstack-k8s-operators-content-provider SUCCESS in 3h 19m 05s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 17m 00s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 30m 55s
adoption-standalone-to-crc-ceph-provider FAILURE in 3h 03m 30s
✔️ openstack-operator-tempest-multinode SUCCESS in 1h 49m 15s

@abays abays force-pushed the osversion_check branch from 2ff18fa to dfe9cbd Compare May 30, 2025 13:54
@abays abays marked this pull request as ready for review May 30, 2025 15:36
@openshift-ci openshift-ci Bot requested review from rabi and viroel May 30, 2025 15:37
@abays abays requested a review from dprince May 30, 2025 15:37
@abays abays force-pushed the osversion_check branch from dfe9cbd to 292959f Compare May 30, 2025 16:36
@abays abays removed the request for review from viroel May 30, 2025 16:38
@softwarefactory-project-zuul

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/fc7add4b22424053acd5f239cbabfa06

✔️ openstack-k8s-operators-content-provider SUCCESS in 3h 30m 14s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 15m 27s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 33m 44s
✔️ adoption-standalone-to-crc-ceph-provider SUCCESS in 3h 15m 20s
openstack-operator-tempest-multinode FAILURE in 23m 15s

@abays

abays commented May 30, 2025

Copy link
Copy Markdown
Contributor Author

recheck

@softwarefactory-project-zuul

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/44485f9f3fa64e8095a80c089b16882d

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 08m 33s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 19m 40s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 35m 21s
adoption-standalone-to-crc-ceph-provider RETRY_LIMIT in 40m 47s
openstack-operator-tempest-multinode FAILURE in 1h 52m 46s

@abays

abays commented May 30, 2025

Copy link
Copy Markdown
Contributor Author

recheck

@softwarefactory-project-zuul

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/15a86f85a3d74d26a58e3c2065f30e6f

openstack-k8s-operators-content-provider FAILURE in 5m 56s
⚠️ podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ adoption-standalone-to-crc-ceph-provider SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ openstack-operator-tempest-multinode SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider

@abays

abays commented May 31, 2025

Copy link
Copy Markdown
Contributor Author

recheck

@softwarefactory-project-zuul

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/dbfde1dc29be413db9c9f8f3a3425c9d

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 54m 25s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 20m 14s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 35m 38s
adoption-standalone-to-crc-ceph-provider FAILURE in 1h 36m 15s
openstack-operator-tempest-multinode FAILURE in 1h 40m 12s

@abays

abays commented Jun 2, 2025

Copy link
Copy Markdown
Contributor Author

recheck

@abays abays force-pushed the osversion_check branch from 292959f to b48bba0 Compare June 4, 2025 10:46
@softwarefactory-project-zuul

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/2adac92f9cf74642b541ec8ca1e6d537

✔️ openstack-k8s-operators-content-provider SUCCESS in 3h 32m 06s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 21m 51s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 29m 15s
✔️ adoption-standalone-to-crc-ceph-provider SUCCESS in 3h 15m 53s
openstack-operator-tempest-multinode FAILURE in 1h 45m 35s

@abays abays force-pushed the osversion_check branch from b48bba0 to c67538d Compare June 5, 2025 09:05
@softwarefactory-project-zuul

Copy link
Copy Markdown

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/openstack-operator for 1463,c67538d5a7fc55bb7b8934c3a261f532a6bf143b

@softwarefactory-project-zuul

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/c540225c55ad43eb949572fce312dfc0

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 03m 02s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 18m 14s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 32m 35s
adoption-standalone-to-crc-ceph-provider FAILURE in 1h 34m 37s
openstack-operator-tempest-multinode FAILURE in 1h 46m 26s

@abays

abays commented Jun 5, 2025

Copy link
Copy Markdown
Contributor Author

/retest

@abays

abays commented Jun 5, 2025

Copy link
Copy Markdown
Contributor Author

recheck

@abays

abays commented Jun 5, 2025

Copy link
Copy Markdown
Contributor Author

/test openstack-operator-build-deploy-kuttl

@bogdando bogdando 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

@abays

abays commented Jun 5, 2025

Copy link
Copy Markdown
Contributor Author

Why is there a rebase conflict here [1], when I've already rebased?

Locally everything is fine:

$ git pull --rebase upstream main
From https://github.com/openstack-k8s-operators/openstack-operator
 * branch              main       -> FETCH_HEAD
Current branch osversion_check is up to date.

[1] https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openstack-k8s-operators_openstack-operator/1463/pull-ci-openstack-k8s-operators-openstack-operator-main-openstack-operator-build-deploy-kuttl/1930551454586638336

@softwarefactory-project-zuul

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/630ee38bc9694729b5201876005a84e7

✔️ openstack-k8s-operators-content-provider SUCCESS in 3h 31m 52s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 18m 30s
cifmw-crc-podified-edpm-baremetal FAILURE in 1h 44m 46s
✔️ adoption-standalone-to-crc-ceph-provider SUCCESS in 3h 16m 03s
✔️ openstack-operator-tempest-multinode SUCCESS in 1h 40m 21s

@abays abays force-pushed the osversion_check branch from 984570d to 222db14 Compare June 5, 2025 21:37

@stuggi stuggi 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 commented Jun 6, 2025

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abays, stuggi

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:

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

@openshift-merge-bot openshift-merge-bot Bot merged commit a7ebf5e into openstack-k8s-operators:main Jun 6, 2025
9 checks passed
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.

4 participants