OCPBUGS-64812: Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.31 into release-4.19 #335

shiftstack-merge-bot · 2025-07-03T12:47:55Z

No description provided.

Co-authored-by: pýrus <kayrus@users.noreply.github.com>

Unblock the gate while we investigate the perforamnce regressions seen in Dalmatian (and possibly Caracal). python-barbicanclient does not have a 2023.2-eol tag so we can't use install from Git. Since we're not hacking on though there's no good reason to be installing from Git, so we remove both this and python-octaviaclient from the list. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Co-authored-by: Stephen Finucane <stephenfin@redhat.com>

Signed-off-by: Justin Lamp <justin.lamp@netways.de> Co-authored-by: Justin Lamp <justin.lamp@netways.de>

…hen --with-topology=False (kubernetes#2872) * cinder-csi-plugin, manila-csi-plugin: Correct formatting character %T prints the type. %t prints the word true/false, which is what we want. [1] [1] https://pkg.go.dev/fmt Conflicts: pkg/csi/manila/driver.go NOTE(stephenfin): Merge conflicts are due to the absence of PR kubernetes#2734, which we don't want to backport. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * cinder-csi-plugin: Don't report topology capability when --with-topology=False The 'PluginCapability_Service_VOLUME_ACCESSIBILITY_CONSTRAINTS' capability flag determines whether the provisioner attempts to look up topology information from the node or not [1][2]. If we report it but don't return topology information from the node, we end up with failures to provision [3]. Fix the issue by optionally reporting the capability, like Manila already does. [1] https://github.com/kubernetes-csi/external-provisioner/blob/17e2429e9f/pkg/controller/controller.go#L685-L700 [2] https://github.com/kubernetes-csi/external-provisioner/blob/17e2429e9f/pkg/controller/controller.go#L994-L996 [3] https://github.com/kubernetes-csi/external-provisioner/blob/17e2429e9f/pkg/controller/topology.go#L177 Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * manila-csi-plugin: Unify some logging between cinder, manila Signed-off-by: Stephen Finucane <stephenfin@redhat.com> --------- Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Co-authored-by: pýrus <kayrus@users.noreply.github.com>

openshift-ci · 2025-07-03T12:48:28Z

Hi @shiftstack-merge-bot[bot]. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

Co-authored-by: Manjunath Kumatagi <mkumatag@in.ibm.com>

* update alpine to latest patch release * update go

Co-authored-by: pýrus <kayrus@users.noreply.github.com>

Co-authored-by: Jesse Haka <haka.jesse@gmail.com>

Co-authored-by: Ansou FALL <fallansou@gmail.com>

* tests: Bump DevStack to Epoxy (2025.1) (kubernetes#2742) * tests: Prefer ginkgo timeout So that we actually get test results. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * tests: Align opts for Cinder, Manila tests Add a timeout to the Manila job and otherwise move some lines around. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * tests: Suffix image version While boskos will reap most resources for us, it doesn't reap images [1]. This has resulted in us using the same image for who knows how long at this point. Encode the Ubuntu version to prevent us picking up other version by mistake. [1] https://github.com/kubernetes-sigs/boskos/blob/5993cef5a1c719c33c0936d416b7d935058e1204/cmd/janitor/gcp_janitor.py#L46-L88 Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * tests: Bump DevStack to Epoxy (2025.1) Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * tests: Bump amphora image Use the Ubuntu 24.04 version, rather than the 22.04 version. This aligns with what we're using for DevStack itself. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * devstack: Remove USE_PYTHON3 It's all Python 3 now, baby. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * tests: Install Ansible from Debian Testing Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * tests: Correct broken conditions Per the Ansible 2.19 porting guide [1]. [1] https://ansible.readthedocs.io/projects/ansible-core/devel/porting_guides/porting_guide_core_2.19.html Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * tests: Decrease device detach timeout Wait less time before retrying. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> --------- Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * Bump CSI test timeouts (kubernetes#2966) * Bump CSI test timeouts We have worked around Nova bug #2119114 by lowering the device detach threshold to 1 second. Unfortunately this still leaves us with a N seconds of additional runtime, where N is the number of device detaches incurred by our test suite (since we run tests serially). This has put us right on the cusp of timeouts, meaning our jobs occasionally pass and occasionally fail, depending on the node we end up on. Add a bit more breathing room for the jobs while we wait for the Nova fix. Note that we do this for both Cinder and Manila to try keep those jobs consistent where possible. [1] https://bugs.launchpad.net/nova/+bug/2119114 Signed-off-by: Stephen Finucane <stephenfin@redhat.com> * tests: Temporarily remove share v1 endpoint Signed-off-by: Stephen Finucane <stephenfin@redhat.com> --------- Signed-off-by: Stephen Finucane <stephenfin@redhat.com> --------- Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Co-authored-by: Stephen Finucane <stephenfin@redhat.com>

…1.31 into release-4.19

stephenfin · 2025-11-07T15:56:49Z

/retitle OCPBUGS-64812: Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.31 into release-4.19
/ok-to-test

openshift-ci-robot · 2025-11-07T15:57:09Z

@shiftstack-merge-bot[bot]: This pull request references Jira Issue OCPBUGS-64812, which is invalid:

expected the bug to target either version "4.19." or "openshift-4.19.", but it targets "4.18.z" instead
release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
expected dependent Jira Issue OCPBUGS-64811 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ASSIGNED 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:

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.

stephenfin · 2025-11-07T15:58:30Z

/approve
/lgtm

stephenfin · 2026-01-09T12:57:55Z

/jira refresh

openshift-ci-robot · 2026-01-09T12:58:00Z

@stephenfin: This pull request references Jira Issue OCPBUGS-64812, which is invalid:

expected the bug to target either version "4.19." or "openshift-4.19.", but it targets "4.18.z" instead
release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

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.

stephenfin · 2026-01-09T12:58:46Z

/jira refresh

openshift-ci-robot · 2026-01-09T12:58:55Z

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

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.19.z) matches configured target version for branch (4.19.z)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-64811 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-64811 targets the "4.20.z" version, which is one of the valid target versions: 4.20.0, 4.20.z
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (imatza@redhat.com), skipping review request.

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.

…ubernetes#2947)" This reverts commit d9937d1. We don't want to bump the go version on this branch.

stephenfin · 2026-01-09T13:09:55Z

/verified by CI

stephenfin · 2026-01-09T13:09:57Z

/label backport-risk-assessed

openshift-ci-robot · 2026-01-09T13:10:07Z

@stephenfin: This PR has been marked as verified by CI.

Details

In response to this:

/verified by CI

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.

stephenfin · 2026-01-09T13:10:08Z

/lgtm
/approve

openshift-ci · 2026-01-09T13:11:06Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: shiftstack-merge-bot[bot], stephenfin

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:

~~DOWNSTREAM_OWNERS~~ [stephenfin]

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

openshift-ci · 2026-01-09T16:09:07Z

@shiftstack-merge-bot[bot]: 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/okd-scos-e2e-aws-ovn	`34f13e8`	link	false	`/test okd-scos-e2e-aws-ovn`
ci/prow/security	`ca81a13`	link	false	`/test security`
ci/prow/e2e-openstack-csi-cinder	`ca81a13`	link	false	`/test e2e-openstack-csi-cinder`

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-robot · 2026-01-09T16:11:55Z

@shiftstack-merge-bot[bot]: Jira Issue Verification Checks: Jira Issue OCPBUGS-64812
✔️ 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-64812 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:

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.

k8s-infra-cherrypick-robot and others added 5 commits July 2, 2025 01:51

add POSIX shell to docker image (kubernetes#2919)

85b0b8f

Co-authored-by: pýrus <kayrus@users.noreply.github.com>

Fix clouds.yaml authentication (kubernetes#2926)

a61afc8

Signed-off-by: Justin Lamp <justin.lamp@netways.de> Co-authored-by: Justin Lamp <justin.lamp@netways.de>

fix lbaas logs (kubernetes#2925)

c5712ce

Co-authored-by: pýrus <kayrus@users.noreply.github.com>

openshift-ci bot requested review from mandre and stephenfin July 3, 2025 12:48

openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 3, 2025

kayrus and others added 4 commits July 25, 2025 08:02

[release-1.31] chore: bump dependencies (kubernetes#2939)

4f8409c

[release-1.31] prepare new 1.31.4 release (kubernetes#2942)

7721e72

[release-1.31] charts: bump manila chart

6f645a8

Update DEBIAN_IMAGE to bookworm (kubernetes#2944)

492a867

Co-authored-by: Manjunath Kumatagi <mkumatag@in.ibm.com>

shiftstack-merge-bot-cloner bot force-pushed the merge-bot-release-4.19 branch from 7f5b861 to e29b651 Compare July 28, 2025 12:21

[release-1.31] update alpine to latest patch release (kubernetes#2947)

d9937d1

* update alpine to latest patch release * update go

shiftstack-merge-bot-cloner bot force-pushed the merge-bot-release-4.19 branch from e29b651 to 629a7e9 Compare July 31, 2025 12:25

k8s-infra-cherrypick-robot and others added 3 commits August 1, 2025 08:07

tests: create volumev3 service type (kubernetes#2961)

853ad56

Co-authored-by: pýrus <kayrus@users.noreply.github.com>

tests: fix create volumev3 service type task

1eb090b

migrate away from gcr.io/k8s-testimages (kubernetes#2971)

a9d711e

Co-authored-by: Jesse Haka <haka.jesse@gmail.com>

shiftstack-merge-bot-cloner bot force-pushed the merge-bot-release-4.19 branch from 629a7e9 to 62a0ffe Compare August 7, 2025 12:47

do not allow DetachVolume when status is detaching (kubernetes#2975)

7ae2326

Co-authored-by: Ansou FALL <fallansou@gmail.com>

shiftstack-merge-bot-cloner bot force-pushed the merge-bot-release-4.19 branch from 62a0ffe to 2aa2409 Compare August 11, 2025 12:21

kayrus and others added 3 commits August 28, 2025 15:03

Merge https://github.com/kubernetes/cloud-provider-openstack:release-…

04701ad

…1.31 into release-4.19

Updating and vendoring go modules after an upstream merge

34f13e8

shiftstack-merge-bot-cloner bot force-pushed the merge-bot-release-4.19 branch from 2aa2409 to 34f13e8 Compare September 1, 2025 12:05

openshift-ci bot changed the title ~~Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.31 into release-4.19~~ OCPBUGS-64812: Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.31 into release-4.19 Nov 7, 2025

openshift-ci bot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Nov 7, 2025

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

openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Nov 7, 2025

openshift-ci bot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 7, 2025

openshift-ci bot assigned stephenfin Nov 7, 2025

openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 7, 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 Jan 9, 2026

CARRY: Revert "[release-1.31] update alpine to latest patch release (k…

ca81a13

…ubernetes#2947)" This reverts commit d9937d1. We don't want to bump the go version on this branch.

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

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jan 9, 2026

openshift-ci bot assigned eurijon, imatza-rh and itzikb-redhat Jan 9, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jan 9, 2026

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

openshift-merge-bot bot merged commit 5f3ccea into openshift:release-4.19 Jan 9, 2026
6 of 8 checks passed

openshift-merge-bot bot deleted the merge-bot-release-4.19 branch January 9, 2026 16:11

OCPBUGS-64812: Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.31 into release-4.19 #335

OCPBUGS-64812: Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.31 into release-4.19 #335

Uh oh!

Conversation

shiftstack-merge-bot bot commented Jul 3, 2025

Uh oh!

openshift-ci bot commented Jul 3, 2025

Uh oh!

stephenfin commented Nov 7, 2025

Uh oh!

openshift-ci-robot commented Nov 7, 2025

Uh oh!

stephenfin commented Nov 7, 2025

Uh oh!

stephenfin commented Jan 9, 2026

Uh oh!

openshift-ci-robot commented Jan 9, 2026

Uh oh!

stephenfin commented Jan 9, 2026

Uh oh!

openshift-ci-robot commented Jan 9, 2026

Uh oh!

stephenfin commented Jan 9, 2026

Uh oh!

stephenfin commented Jan 9, 2026

Uh oh!

openshift-ci-robot commented Jan 9, 2026

Uh oh!

stephenfin commented Jan 9, 2026

Uh oh!

openshift-ci bot commented Jan 9, 2026

Uh oh!

openshift-ci bot commented Jan 9, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Jan 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants