Skip to content

Conversation

@jsafrane
Copy link

@jsafrane jsafrane commented Sep 29, 2025

Summary

This PR rebases the OpenShift fork of external-attacher to upstream version v4.10.0 for OpenShift Container Platform 4.21.

Upstream Changelog

v4.10.0 Changes:

Previous version (v4.9.0):

Changes Applied

  • Cherry-picked and squashed OpenShift-specific carry commits
  • Updated CI operator configuration for OCP 4.21
  • Maintained OpenShift files (Dockerfile.ocp, OWNERS, etc.)

Verification

  • ✅ Build successful: make completed without errors
  • ✅ Tests passed: All Go tests, vet, fmt, and vendor checks passed
  • ✅ All changes from openshift/master properly carried forward

Upstream Diff

View the diff between upstream v4.10.0 and this PR: kubernetes-csi/external-attacher@v4.10.0...jsafrane:csi-external-attacher:rebase-v4.10.0

torredil and others added 24 commits August 1, 2025 06:09
…bernetes-csi#662)

* Populate VolumeError.ErrorCode field

Signed-off-by: Eddie Torres <[email protected]>

* Guard patching AttachError.ErrorCode behind MutableCSINodeAllocatableCount feature gate

Signed-off-by: Eddie Torres <[email protected]>

* Fix make test

Signed-off-by: Eddie Torres <[email protected]>

---------

Signed-off-by: Eddie Torres <[email protected]>
…-faster

Restart external-attacher faster by releasing leader election lease on sigterm
Bumps the k8s-dependencies group with 2 updates in the / directory: [sigs.k8s.io/apiserver-network-proxy/konnectivity-client](https://github.com/kubernetes-sigs/apiserver-network-proxy) and [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml).


Updates `sigs.k8s.io/apiserver-network-proxy/konnectivity-client` from 0.31.2 to 0.33.0
- [Release notes](https://github.com/kubernetes-sigs/apiserver-network-proxy/releases)
- [Changelog](https://github.com/kubernetes-sigs/apiserver-network-proxy/blob/master/RELEASE.md)
- [Commits](kubernetes-sigs/apiserver-network-proxy@v0.31.2...v0.33.0)

Updates `sigs.k8s.io/yaml` from 1.4.0 to 1.6.0
- [Release notes](https://github.com/kubernetes-sigs/yaml/releases)
- [Changelog](https://github.com/kubernetes-sigs/yaml/blob/master/RELEASE.md)
- [Commits](kubernetes-sigs/yaml@v1.4.0...v1.6.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/apiserver-network-proxy/konnectivity-client
  dependency-version: 0.33.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: k8s-dependencies
- dependency-name: sigs.k8s.io/yaml
  dependency-version: 1.6.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: k8s-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
…go_modules/k8s-dependencies-9248c45c46

Bump the k8s-dependencies group across 1 directory with 2 updates
Strings are safe, because our existing keys were
VA and PV names.

Refresh go.mod with `GO111MODULE=on go mod tidy`.
Address various linter (staticcheck, modernize, etc.) comments.
Fix version of kubernetes for alpha version of ReleaseLeaderElectionOnExit fg
5f38a907 Merge pull request kubernetes-csi#282 from rhrmo/update-go-1.24.6
579f6242 Update go to 1.24.6
74e066a8 Merge pull request kubernetes-csi#279 from Aishwarya-Hebbar/update-csi-prow-version
6f236be7 Update CSI prow driver version to v1.17.0
0ee55894 Merge pull request kubernetes-csi#280 from xing-yang/update_go_1.24.4
9af10153 update to go 1.24.4
f5fec3e3 Merge pull request kubernetes-csi#275 from chrishenzie/emeritus
c5d285db Remove chrishenzie from kubernetes-csi-reviewers

git-subtree-dir: release-tools
git-subtree-split: 5f38a907597230563f5e2213aea116acdd9d86bc
@openshift-ci openshift-ci bot requested review from dfajmon and dobsonj September 29, 2025 15:42
@openshift-ci
Copy link

openshift-ci bot commented Sep 29, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 29, 2025
@jsafrane jsafrane changed the title Rebase to v4.10.0 for OCP 4.21 STOR-2586: Rebase to v4.10.0 for OCP 4.21 Sep 29, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 29, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 29, 2025

@jsafrane: This pull request references STOR-2586 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Summary

This PR rebases the OpenShift fork of external-attacher to upstream version v4.10.0 for OpenShift Container Platform 4.21.

Upstream Changelog

v4.10.0 Changes:

Previous version (v4.9.0):

Changes Applied

  • Cherry-picked and squashed OpenShift-specific carry commits
  • Updated CI operator configuration for OCP 4.21
  • Maintained OpenShift files (Dockerfile.ocp, OWNERS, etc.)

Verification

  • ✅ Build successful: make completed without errors
  • ✅ Tests passed: All Go tests, vet, fmt, and vendor checks passed
  • ✅ All changes from openshift/master properly carried forward

Upstream Diff

View the diff between upstream v4.10.0 and this PR: kubernetes-csi/external-attacher@v4.10.0...jsafrane:csi-external-attacher:rebase-v4.10.0

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.

@jsafrane
Copy link
Author

/retest-required
@openshift/storage

@openshift-ci
Copy link

openshift-ci bot commented Sep 30, 2025

@jsafrane: 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/okd-scos-e2e-aws-ovn 5cfbc26 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.

@dfajmon
Copy link

dfajmon commented Oct 14, 2025

/retest-required

@gnufied
Copy link
Member

gnufied commented Oct 21, 2025

/hold

@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 Oct 21, 2025
@dfajmon
Copy link

dfajmon commented Nov 3, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 3, 2025
@gnufied
Copy link
Member

gnufied commented Nov 3, 2025

/hold cancel

@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 Nov 3, 2025
@duanwei33
Copy link

/unassign @Phaow @chao007 @radeore

@duanwei33
Copy link

There is one customer-facing change that

API enhancement: Populated the "VolumeError.ErrorCode" field in VolumeAttachment objects

After enable the feature-gate, we can get the errorCode as below

$ oc get volumeattachments.storage.k8s.io  csi-1226eb4fd483483e9c9d799e0af402a4224469abe6c860791c1e996890c7bbd7 -oyaml | yq .status
attachError:
  errorCode: 13
  message: 'rpc error: code = Internal desc = Could not attach volume "vol-09f383086fdc12345" to node "i-05cfd01808d0d2c02": could not attach volume "vol-09f383086fdc12345" to node "i-05cfd01808d0d2c02": operation error EC2: AttachVolume, https response error StatusCode: 400, RequestID: 24f72e59-eee1-497c-a2d1-f08112a602c3, api error InvalidParameterValue: The volume ID ''vol-09f383086fdc12345'' is malformed'
  time: "2025-11-06T08:30:44Z"
attached: false
detachError:
  message: 'rpc error: code = Internal desc = Could not detach volume "vol-09f383086fdc12345" from node "i-05cfd01808d0d2c02": could not detach volume "vol-09f383086fdc12345" from node "i-05cfd01808d0d2c02": operation error EC2: DetachVolume, https response error StatusCode: 400, RequestID: 59386384-6b35-46f0-bd10-d4b63d0eb33c, api error InvalidParameterValue: The volume ID ''vol-09f383086fdc12345'' is malformed'
  time: "2025-11-06T13:20:44Z"

TBH, I'm not pretty sure how the errorCode maps the CSI Driver error, but the population works anyway.
@jsafrane Another concern is there is no detachError.errorCode, should we investigate this?

@duanwei33
Copy link

After checking the code, it looks like only attach errorcode is populated, there is no detach errorcode.

@duanwei33
Copy link

/verified by @duanwei33

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 7, 2025
@openshift-ci-robot
Copy link

@duanwei33: This PR has been marked as verified by @duanwei33.

Details

In response to this:

/verified by @duanwei33

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-bot openshift-merge-bot bot merged commit 344669a into openshift:master Nov 7, 2025
11 of 12 checks passed
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-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.