OCPBUGS-57800: Rebase release-4.18 onto release-1.31 #322

shiftstack-merge-bot · 2025-05-01T12:10:17Z

No description provided.

Co-authored-by: pýrus <[email protected]>

…netes#2882) Co-authored-by: pýrus <[email protected]>

openshift-ci · 2025-05-01T12:11:02Z

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.

stephenfin · 2025-05-08T16:35:56Z

/ok-to-test

stephenfin · 2025-06-19T15:13:08Z

Let's merge this to get it off our queue.

/approve
/lgtm
/label backport-risk-assessed

(I don't think I can do the last one. @mandre to the rescue if not)

openshift-ci · 2025-06-19T15:13:27Z

@stephenfin: Can not set label backport-risk-assessed: Must be member in one of these teams: [openshift-staff-engineers]

Details

In response to this:

Let's merge this to get it off our queue.

/approve
/lgtm
/label backport-risk-assessed

(I don't think I can do the last one. @mandre to the rescue if not)

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.

mandre · 2025-06-19T15:34:10Z

/label backport-risk-assessed

stephenfin · 2025-06-19T15:51:22Z

/retitle OCPBUGS-57800: Rebase release-4.18 onto release-1.31

openshift-ci-robot · 2025-06-19T15:51:47Z

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

expected dependent Jira Issue OCPBUGS-57799 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New instead
expected dependent Jira Issue OCPBUGS-57799 to target a version in 4.19.0, but it targets "4.19.z" 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.

eurijon · 2025-06-19T20:15:12Z

/label cherry-pick-approved

Co-authored-by: pýrus <[email protected]>

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 <[email protected]> Co-authored-by: Stephen Finucane <[email protected]>

Signed-off-by: Justin Lamp <[email protected]> Co-authored-by: Justin Lamp <[email protected]>

…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 <[email protected]> * 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 <[email protected]> * manila-csi-plugin: Unify some logging between cinder, manila Signed-off-by: Stephen Finucane <[email protected]> --------- Signed-off-by: Stephen Finucane <[email protected]>

* update alpine to latest patch release * update go

Co-authored-by: pýrus <[email protected]>

Co-authored-by: Jesse Haka <[email protected]>

Co-authored-by: Ansou FALL <[email protected]>

* 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * tests: Bump DevStack to Epoxy (2025.1) Signed-off-by: Stephen Finucane <[email protected]> * 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 <[email protected]> * devstack: Remove USE_PYTHON3 It's all Python 3 now, baby. Signed-off-by: Stephen Finucane <[email protected]> * tests: Install Ansible from Debian Testing Signed-off-by: Stephen Finucane <[email protected]> * 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 <[email protected]> * tests: Decrease device detach timeout Wait less time before retrying. Signed-off-by: Stephen Finucane <[email protected]> --------- Signed-off-by: Stephen Finucane <[email protected]> * 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 <[email protected]> * tests: Temporarily remove share v1 endpoint Signed-off-by: Stephen Finucane <[email protected]> --------- Signed-off-by: Stephen Finucane <[email protected]> --------- Signed-off-by: Stephen Finucane <[email protected]> Co-authored-by: Stephen Finucane <[email protected]>

…1.31 into release-4.18

stephenfin · 2025-10-06T17:34:30Z

/retest
/jira refresh

openshift-ci-robot · 2025-10-06T17:34:38Z

@stephenfin: This pull request references Jira Issue OCPBUGS-57800, 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.18.z) matches configured target version for branch (4.18.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-57799 is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-57799 targets the "4.19.0" version, which is one of the valid target versions: 4.19.0, 4.19.z
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

Details

In response to this:

/retest
/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.

mandre · 2025-10-07T07:05:33Z

go.mod

 module k8s.io/cloud-provider-openstack

-go 1.22.0
+go 1.23.11


As noted by @stephenfin, commit d9937d12c492f80f89a5a0775b12aed4d8be001b bumps the go version and we can't really do that. We'll have to carry a downstream patch in branch release-4.18 to restore the go version to 1.22.

mandre · 2025-10-07T11:14:17Z

/test e2e-openstack-csi-manila

stephenfin · 2025-10-07T11:37:48Z

/test e2e-openstack-parallel

openshift-ci · 2025-10-07T15:38:50Z

@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	`73ee0a5`	link	false	`/test okd-scos-e2e-aws-ovn`
ci/prow/e2e-openstack-parallel	`73ee0a5`	link	false	`/test e2e-openstack-parallel`
ci/prow/security	`73ee0a5`	link	false	`/test security`

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.

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

Those failures in e2e-openstack-parallel are almost certainly due to ongoing resource contention. I'm happy with this as-is.

/lgtm
/verified by CI

openshift-ci-robot · 2025-10-07T15:58:42Z

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

Details

In response to this:

Those failures in e2e-openstack-parallel are almost certainly due to ongoing resource contention. I'm happy with this as-is.

/lgtm
/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.

openshift-ci · 2025-10-07T16:02:07Z

[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-robot · 2025-10-07T16:06:58Z

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

openshift-merge-robot · 2025-10-08T11:04:37Z

Fix included in accepted release 4.18.0-0.nightly-2025-10-08-051110

k8s-infra-cherrypick-robot and others added 2 commits April 29, 2025 00:43

Update issue templates (kubernetes#2874)

e6ad6a2

Co-authored-by: pýrus <[email protected]>

k8s-keystone-auth: properly handle token with no project scope (kuber…

c38bd3d

…netes#2882) Co-authored-by: pýrus <[email protected]>

openshift-ci bot requested review from EmilienM and mandre May 1, 2025 12:10

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 May 1, 2025

openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 8, 2025

openshift-ci bot assigned stephenfin Jun 19, 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 Jun 19, 2025

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

openshift-ci bot assigned eurijon, itzikb-redhat and rlobillo Jun 19, 2025

openshift-ci bot changed the title ~~Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.31 into release-4.18~~ OCPBUGS-57800: Rebase release-4.18 onto release-1.31 Jun 19, 2025

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 Jun 19, 2025

openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 19, 2025

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

add POSIX shell to docker image (kubernetes#2919)

85b0b8f

Co-authored-by: pýrus <[email protected]>

Fix clouds.yaml authentication (kubernetes#2926)

a61afc8

Signed-off-by: Justin Lamp <[email protected]> Co-authored-by: Justin Lamp <[email protected]>

[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.18 branch from d404832 to 3d669e2 Compare July 31, 2025 12:19

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 <[email protected]>

tests: fix create volumev3 service type task

1eb090b

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

a9d711e

Co-authored-by: Jesse Haka <[email protected]>

shiftstack-merge-bot-cloner bot force-pushed the merge-bot-release-4.18 branch from 3d669e2 to 5aeb3bf Compare August 7, 2025 12:44

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

7ae2326

Co-authored-by: Ansou FALL <[email protected]>

shiftstack-merge-bot-cloner bot force-pushed the merge-bot-release-4.18 branch from 5aeb3bf to 28d287d Compare August 11, 2025 12:19

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

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

c462777

…1.31 into release-4.18

Updating and vendoring go modules after an upstream merge

144fccf

shiftstack-merge-bot-cloner bot force-pushed the merge-bot-release-4.18 branch from 28d287d to 144fccf Compare September 1, 2025 12:08

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 Oct 6, 2025

mandre requested changes Oct 7, 2025

View reviewed changes

CARRY: Pin go to v1.22

73ee0a5

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

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

openshift-merge-bot bot merged commit 8857214 into openshift:release-4.18 Oct 7, 2025
7 of 10 checks passed

stephenfin deleted the merge-bot-release-4.18 branch October 7, 2025 17:41

OCPBUGS-57800: Rebase release-4.18 onto release-1.31 #322

OCPBUGS-57800: Rebase release-4.18 onto release-1.31 #322

Uh oh!

Conversation

shiftstack-merge-bot bot commented May 1, 2025

Uh oh!

openshift-ci bot commented May 1, 2025

Uh oh!

stephenfin commented May 8, 2025

Uh oh!

stephenfin commented Jun 19, 2025

Uh oh!

openshift-ci bot commented Jun 19, 2025

Uh oh!

mandre commented Jun 19, 2025

Uh oh!

stephenfin commented Jun 19, 2025

Uh oh!

openshift-ci-robot commented Jun 19, 2025

Uh oh!

eurijon commented Jun 19, 2025

Uh oh!

stephenfin commented Oct 6, 2025

Uh oh!

openshift-ci-robot commented Oct 6, 2025

Uh oh!

mandre Oct 7, 2025

Choose a reason for hiding this comment

Uh oh!

mandre commented Oct 7, 2025

Uh oh!

stephenfin commented Oct 7, 2025

Uh oh!

openshift-ci bot commented Oct 7, 2025

Uh oh!

stephenfin commented Oct 7, 2025

Uh oh!

openshift-ci-robot commented Oct 7, 2025

Uh oh!

openshift-ci bot commented Oct 7, 2025

Uh oh!

Uh oh!

openshift-ci-robot commented Oct 7, 2025

Uh oh!

openshift-merge-robot commented Oct 8, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants