Skip to content

Conversation

@stephenfin
Copy link

This is downstream-first backport of [1] (which is a backport of [2]). The upstream CI is currently broken and I want to get this now while I work on that CI.

[1] kubernetes#2872
[2] kubernetes#2862

stephenfin added 3 commits May 8, 2025 18:07
%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]>
…ogy=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]>
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels May 12, 2025
@openshift-ci-robot
Copy link

@stephenfin: This pull request references Jira Issue OCPBUGS-56028, 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.20.0) matches configured target version for branch (4.20.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

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

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

Details

In response to this:

This is downstream-first backport of [1] (which is a backport of [2]). The upstream CI is currently broken and I want to get this now while I work on that CI.

[1] kubernetes#2872
[2] kubernetes#2862

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 openshift-ci bot requested review from EmilienM and mdbooth May 12, 2025 12:00
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 12, 2025
Copy link
Member

@mandre mandre left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve
/hold for ci

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 12, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 12, 2025
@openshift-ci
Copy link

openshift-ci bot commented May 12, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mandre, 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:

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

@stephenfin
Copy link
Author

/retest

@stephenfin
Copy link
Author

/test e2e-openstack-parallel

Infra issue

@openshift-ci
Copy link

openshift-ci bot commented May 13, 2025

@stephenfin: 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/e2e-openstack-parallel 8d2d8a7 link false /test e2e-openstack-parallel
ci/prow/security 8d2d8a7 link false /test security
ci/prow/okd-scos-e2e-aws-ovn 8d2d8a7 link false /test okd-scos-e2e-aws-ovn

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
Copy link
Author

For context, it's these two tests that are failing:

: [sig-installer][Suite:openshift/openstack][lb][Serial] The Openstack platform should create a TCP Amphora LoadBalancer when LoadBalancerService ingressController is created on Openshift
: [sig-installer][Suite:openshift/openstack][lb][Serial] The Openstack platform should create a UDP Amphora LoadBalancer when a UDP svc with type:LoadBalancer is created on Openshift

@stephenfin
Copy link
Author

/unhold

failures are clearly unrelated

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 13, 2025
@stephenfin
Copy link
Author

Weird that you can do e.g.

/hold for ci

but not e.g.

/unhold ci is green

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 13, 2025
@stephenfin
Copy link
Author

/unhold

😅

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 13, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 23a11e2 into openshift:main May 13, 2025
7 of 10 checks passed
@openshift-ci-robot
Copy link

@stephenfin: Jira Issue OCPBUGS-56028: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-56028 has been moved to the MODIFIED state.

Details

In response to this:

This is downstream-first backport of [1] (which is a backport of [2]). The upstream CI is currently broken and I want to get this now while I work on that CI.

[1] kubernetes#2872
[2] kubernetes#2862

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
Copy link
Author

Weird that you can do e.g.

hold for ci

but not e.g.

unhold ci is green

kubernetes-sigs/prow#456

@stephenfin stephenfin deleted the fix-cinder-with-topology-flag-main branch May 13, 2025 17:38
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-openstack-cloud-controller-manager
This PR has been included in build ose-openstack-cloud-controller-manager-container-v4.20.0-202505140744.p0.g23a11e2.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: csi-driver-manila
This PR has been included in build csi-driver-manila-container-v4.20.0-202505140744.p0.g23a11e2.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-openstack-cinder-csi-driver
This PR has been included in build ose-openstack-cinder-csi-driver-container-v4.20.0-202505140744.p0.g23a11e2.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants