Skip to content

Conversation

stephenfin
Copy link
Contributor

Modify the Cinder operator so that it starts reporting controller driver metrics correctly.

Modify the Manila operator so that we stop creating a controller driver metrics proxy container, since the controller driver does not currently support reporting metrics.

We had configured the proxy sidecar container for the driver in the
controller Deployment, but the upstream it was pointing to did not
exist. Fix this by setting the --http-endpoint option. Per the upstream
docs [1]:

  --http-endpoint <HTTP server>
    This argument is optional.

    The TCP network address where the HTTP server for providing metrics
    for diagnostics, will listen (example: `:8080`).

    The default is empty string, which means the server is disabled.

There's a bit of cleanup needed here to avoid hardcoding something which
is generated (via a loop-variable) elsewhere, but we'll do that
separately.

[1] https://github.com/kubernetes/cloud-provider-openstack/blob/release-1.32/docs/cinder-csi-plugin/using-cinder-csi-plugin.md#command-line-arguments

Signed-off-by: Stephen Finucane <[email protected]>
The openstack-manila driver does not currently support this.

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/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 15, 2025
@openshift-ci-robot
Copy link

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

  • expected the bug to target the "4.19.0" version, but no target version was set

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.

In response to this:

Modify the Cinder operator so that it starts reporting controller driver metrics correctly.

Modify the Manila operator so that we stop creating a controller driver metrics proxy container, since the controller driver does not currently support reporting metrics.

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
Contributor Author

/jira refresh

@openshift-ci-robot 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 Apr 16, 2025
@openshift-ci-robot
Copy link

@stephenfin: This pull request references Jira Issue OCPBUGS-54975, 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.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state ASSIGNED, 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.

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

stephenfin commented Apr 16, 2025

/retest-required

I haven't been able to reproduce the Cinder or Manila failures locally. Looks like an infra issue.

@stephenfin
Copy link
Contributor Author

/retest-required

@stephenfin
Copy link
Contributor Author

/test e2e-openstack

@stephenfin
Copy link
Contributor Author

/retest

@gnufied
Copy link
Member

gnufied commented May 20, 2025

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 20, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 20, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gnufied, stephenfin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

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

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

/retest-required

Remaining retests: 0 against base HEAD d096201 and 2 for PR HEAD 521e741 in total

1 similar comment
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD d096201 and 2 for PR HEAD 521e741 in total

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 21, 2025

@stephenfin: all tests passed!

Full PR test history. Your PR dashboard.

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-merge-bot openshift-merge-bot bot merged commit b9d4c47 into openshift:main May 21, 2025
26 checks passed
@openshift-ci-robot
Copy link

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

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

In response to this:

Modify the Cinder operator so that it starts reporting controller driver metrics correctly.

Modify the Manila operator so that we stop creating a controller driver metrics proxy container, since the controller driver does not currently support reporting metrics.

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

[ART PR BUILD NOTIFIER]

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

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-azure-disk-csi-driver-operator
This PR has been included in build ose-azure-disk-csi-driver-operator-container-v4.20.0-202505211518.p0.gb9d4c47.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-aws-efs-csi-driver-operator
This PR has been included in build ose-aws-efs-csi-driver-operator-container-v4.20.0-202505211518.p0.gb9d4c47.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: azure-file-csi-driver-operator
This PR has been included in build ose-azure-file-csi-driver-operator-container-v4.20.0-202505211518.p0.gb9d4c47.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-aws-ebs-csi-driver-operator
This PR has been included in build ose-aws-ebs-csi-driver-operator-container-v4.20.0-202505211518.p0.gb9d4c47.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-operator
This PR has been included in build ose-openstack-cinder-csi-driver-operator-container-v4.20.0-202505211518.p0.gb9d4c47.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-smb-csi-driver-operator
This PR has been included in build ose-smb-csi-driver-operator-container-v4.20.0-202505211518.p0.gb9d4c47.assembly.stream.el9.
All builds following this will include this PR.

@stephenfin stephenfin deleted the fix-openstack-driver-metrics branch May 30, 2025 10:24
@stephenfin
Copy link
Contributor Author

/cherry-pick release-4.19
/cherry-pick release-4.18

@openshift-cherrypick-robot

@stephenfin: #379 failed to apply on top of branch "release-4.18":

Applying: openstack-cinder: Add --http-endpoint option to controller container
Using index info to reconstruct a base tree...
M	assets/overlays/openstack-cinder/generated/hypershift/controller.yaml
M	assets/overlays/openstack-cinder/generated/standalone/controller.yaml
M	assets/overlays/openstack-cinder/patches/controller_add_driver.yaml
Falling back to patching base and 3-way merge...
Auto-merging assets/overlays/openstack-cinder/patches/controller_add_driver.yaml
Auto-merging assets/overlays/openstack-cinder/generated/standalone/controller.yaml
Auto-merging assets/overlays/openstack-cinder/generated/hypershift/controller.yaml
Applying: openstack-manila: Stop exposing driver metrics
Using index info to reconstruct a base tree...
M	assets/overlays/openstack-manila/generated/hypershift/controller.yaml
M	assets/overlays/openstack-manila/generated/standalone/controller.yaml
M	assets/overlays/openstack-manila/patches/controller_add_driver.yaml
Falling back to patching base and 3-way merge...
Auto-merging assets/overlays/openstack-manila/patches/controller_add_driver.yaml
CONFLICT (content): Merge conflict in assets/overlays/openstack-manila/patches/controller_add_driver.yaml
Auto-merging assets/overlays/openstack-manila/generated/standalone/controller.yaml
Auto-merging assets/overlays/openstack-manila/generated/hypershift/controller.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 openstack-manila: Stop exposing driver metrics

In response to this:

/cherry-pick release-4.19
/cherry-pick release-4.18

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

/cherry-pick release-4.19

@openshift-cherrypick-robot

@stephenfin: new pull request created: #386

In response to this:

/cherry-pick release-4.19

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.

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.

5 participants