Skip to content

Fix OpenStackVersion minor update workflow hanging on OVN dataplane check #1823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stuggi wants to merge 2 commits into
base: main
Choose a base branch
from
+16 −14
Open

Fix OpenStackVersion minor update workflow hanging on OVN dataplane check #1823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42d9b28
Fix OpenStackVersion minor update workflow hanging on OVN dataplane c…
stuggi Feb 24, 2026
2fbd40e
Add zuul minor update job
stuggi Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions internal/openstack/dataplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,11 @@ func DataplaneNodesetsOVNControllerImagesMatch(version *corev1beta1.OpenStackVer
// the current nodeset spec), we only check nodesets if they have any nodes
// and have deployed OVN
if len(nodeset.Spec.Nodes) > 0 && nodeset.Status.ContainerImages["OvnControllerImage"] != "" {
if !nodeset.IsReady() {
return false
}
// Check if OVN controller image matches the target version.
// Note: We don't check nodeset.IsReady() here because this is an intermediate
Copy link
Contributor

@rabi rabi Feb 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nodeset becomes Ready after every deployment, but we don't need check as it would fail for some watcher triggered reconcilation (ex. OpenStackVersion changes). We don't trigger nodeset reconciliation for status update (for deployment statuses). We can prbably get rid of the whole comment here IMO.

Copy link
Contributor Author

@stuggi stuggi Feb 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ack, I have shortened it to just have the info why we are not checking IsReady. might help for future understanding.

// step in the minor update workflow. The nodeset might be not-Ready due to
// subsequent deployments running (e.g. edpm-update), but if the OVN image matches,
// it means the OVN update deployment already completed.
if nodeset.Status.ContainerImages["OvnControllerImage"] != *version.Status.ContainerImages.OvnControllerImage {
return false
}
Expand Down
19 changes: 8 additions & 11 deletions zuul.d/jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
attempts: 1
required-projects:
- github.com/openstack-k8s-operators/openstack-operator
irrelevant-files:
irrelevant-files: &irrelevant-files
- .*/*.md
- ^\..*$
- ^docs/.*$
Expand All @@ -32,16 +32,7 @@
name: openstack-operator-tempest-multinode
parent: podified-multinode-edpm-deployment-crc-3comp
dependencies: ["openstack-k8s-operators-content-provider"]
irrelevant-files:
- .*/*.md
- ^\..*$
- ^docs/.*$
- ^LICENSE$
- ^OWNERS$
- ^OWNERS_ALIASES$
- ^PROJECT$
- ^README.md$
- tests?\/functional
irrelevant-files: *irrelevant-files
vars:
cifmw_operator_build_golang_ct: "docker.io/library/golang:1.24"
cifmw_operator_build_golang_alt_ct: "quay.rdoproject.org/openstack-k8s-operators/golang:1.24"
Expand Down Expand Up @@ -87,3 +78,9 @@
[libvirt]
cpu_mode = custom
cpu_models = Nehalem

- job:
name: openstack-operator-edpm-baremetal-minor-update
parent: cifmw-crc-podified-edpm-baremetal-minor-update
dependencies: ["openstack-k8s-operators-content-provider"]
irrelevant-files: *irrelevant-files
3 changes: 3 additions & 0 deletions zuul.d/projects.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@
- openstack-operator-docs-preview
- openstack-operator-kuttl:
voting: false
- openstack-operator-edpm-baremetal-minor-update:
dependencies: ["openstack-k8s-operators-content-provider"]
irrelevant-files: *irrelevant-files