OCPBUGS-56027: [cinder-csi-plugin] Don't report topology capability when --with-topology=False #323

stephenfin · 2025-05-08T17:10:14Z

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

%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>

…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 <stephenfin@redhat.com>

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

openshift-ci-robot · 2025-05-08T17:10:18Z

@stephenfin: This pull request explicitly references no jira issue.

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 · 2025-05-08T17:10:51Z

/cc @mandre

openshift-ci · 2025-05-08T19:44:06Z

@stephenfin: The following test 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/security	`8d2d8a7`	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.

mandre · 2025-05-12T07:52:04Z

/rename UPSTREAM: 2872: NO-JIRA: [cinder-csi-plugin] Don't report topology capability when --with-topology=False

Although, I'm not exactly sure about the NO-JIRA part. Shouldn't we have one?

mandre

It's a clean backport from upstream.
/lgtm
/approve

openshift-ci · 2025-05-12T07:59:05Z

[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:

~~DOWNSTREAM_OWNERS~~ [mandre,stephenfin]

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

mandre · 2025-05-12T10:21:44Z

/label backport-risk-assessed

stephenfin · 2025-05-12T11:53:41Z

/retitle OCPBUGS-56027: [cinder-csi-plugin] Don't report topology capability when --with-topology=False

openshift-ci-robot · 2025-05-12T11:53:49Z

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

expected the bug to target the "4.19.0" version, but no target version was set
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 Jira Issue OCPBUGS-56027 to depend on a bug targeting a version in 4.20.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

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:

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 · 2025-05-12T11:59:37Z

/jira refresh

openshift-ci-robot · 2025-05-12T11:59:43Z

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

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-56028 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is POST 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.

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.

itzikb-redhat · 2025-05-13T06:15:18Z

/label cherry-pick-approved

stephenfin · 2025-05-13T16:55:59Z

/jira refresh

openshift-ci-robot · 2025-05-13T16:56:08Z

@stephenfin: This pull request references Jira Issue OCPBUGS-56027, 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.0) matches configured target version for branch (4.19.0)
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-56028 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Jira Issue OCPBUGS-56028 targets the "4.20.0" version, which is one of the valid target versions: 4.20.0
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (itbrown@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.

openshift-ci-robot · 2025-05-13T17:01:07Z

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

openshift/cloud-provider-openstack#323

Jira Issue OCPBUGS-56027 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.

openshift-bot · 2025-05-14T09:09:22Z

[ART PR BUILD NOTIFIER]

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

openshift-bot · 2025-05-14T09:12:22Z

[ART PR BUILD NOTIFIER]

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

openshift-bot · 2025-05-14T09:12:24Z

[ART PR BUILD NOTIFIER]

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

openshift-merge-robot · 2025-05-15T09:59:56Z

Fix included in accepted release 4.19.0-0.nightly-2025-05-15-043906

stephenfin added 3 commits May 8, 2025 18:07

manila-csi-plugin: Unify some logging between cinder, manila

8d2d8a7

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

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

openshift-ci bot requested review from EmilienM, gryf and mandre May 8, 2025 17:10

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 8, 2025

mandre reviewed May 12, 2025

View reviewed changes

openshift-ci bot assigned mandre May 12, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 12, 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 May 12, 2025

openshift-ci bot assigned eurijon, itzikb-redhat and rlobillo May 12, 2025

openshift-ci bot changed the title ~~NO-JIRA: [cinder-csi-plugin] Don't report topology capability when --with-topology=False~~ OCPBUGS-56027: [cinder-csi-plugin] Don't report topology capability when --with-topology=False May 12, 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 May 12, 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 May 13, 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 May 13, 2025

openshift-merge-bot bot merged commit c736cbf into openshift:release-4.19 May 13, 2025
7 of 10 checks passed

stephenfin deleted the fix-cinder-with-topology-flag-release-4.19 branch May 13, 2025 17:38

OCPBUGS-56027: [cinder-csi-plugin] Don't report topology capability when --with-topology=False #323

OCPBUGS-56027: [cinder-csi-plugin] Don't report topology capability when --with-topology=False #323

Uh oh!

Conversation

stephenfin commented May 8, 2025

Uh oh!

openshift-ci-robot commented May 8, 2025

Uh oh!

stephenfin commented May 8, 2025

Uh oh!

openshift-ci bot commented May 8, 2025

Uh oh!

mandre commented May 12, 2025

Uh oh!

mandre left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented May 12, 2025

Uh oh!

mandre commented May 12, 2025

Uh oh!

stephenfin commented May 12, 2025

Uh oh!

openshift-ci-robot commented May 12, 2025

Uh oh!

stephenfin commented May 12, 2025

Uh oh!

openshift-ci-robot commented May 12, 2025

Uh oh!

itzikb-redhat commented May 13, 2025

Uh oh!

stephenfin commented May 13, 2025

Uh oh!

openshift-ci-robot commented May 13, 2025

Uh oh!

Uh oh!

openshift-ci-robot commented May 13, 2025

Uh oh!

openshift-bot commented May 14, 2025

Uh oh!

openshift-bot commented May 14, 2025

Uh oh!

openshift-bot commented May 14, 2025

Uh oh!

openshift-merge-robot commented May 15, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants