STOR-2758: Rebase to upstream v2.1.0 for OCP 4.22#183
STOR-2758: Rebase to upstream v2.1.0 for OCP 4.22#183openshift-merge-bot[bot] merged 30 commits intoopenshift:masterfrom
Conversation
Update Compatibility session in README
A CSI driver may implement ControllerModifyVolume without supporting extending volumes. The csi-resizer should allow this combination too.
Allow modify without resize support
Storage providers expect to obtain secrets from the ControllerMoodifyVolume CSI procedure. Without these credentials, it may not be possible to apply the parameters of a VolumeAttributeClass. A CSIPersistentVolumeSource does not have ControllerModifySecretRef (like ControllerExpandSecretRef), so in order to resolve credentials a secret reference from annotations on the PersistentVolume are used: - volume.kubernetes.io/controller-modify-secret-name - volume.kubernetes.io/controller-modify-secret-namespace In absence of these annotations, the ControllerExpandSecretRef of the CSIPersistentVolumeSource used as a fallback.
Use Context.TODO() in the top-level modify() call, and pass it along.
bbe5e547 Use Kubernetes v1.34 and Kind v0.30 by default 4e9eb2c9 Merge pull request kubernetes-csi#288 from gnufied/add-gnufied-for-csi-approver 064e260d Add myself as csi approver c852fa79 Merge pull request kubernetes-csi#287 from andyzhangx/patch-7 bce16c10 fix: upgrade to go1.24.11 to fix CVE-2025-61727 8d1258cc Merge pull request kubernetes-csi#286 from kubernetes-csi/dependabot/github_actions/actions/checkout-6 91e35981 Bump actions/checkout from 5 to 6 29413815 Merge pull request kubernetes-csi#285 from andyzhangx/patch-6 fa8b339e fix: upgrade to go1.24.9 to fix CVEs git-subtree-dir: release-tools git-subtree-split: bbe5e547e2d675e8ac5d0362f2314f73129c5b56
…-1.34 Rebase release-tools to use Kubernetes v1.34 by default
…olume/secrets Use credentials when calling ControllerModifyVolume
…flake Fix modifyvolume flake
Fix broken link to CSI spec
d6846630 Merge pull request kubernetes-csi#290 from dfajmon/go-1.25.5 55e527c4 Bump golang to 1.25.5 b12e407c Merge pull request kubernetes-csi#289 from nixpanic/k8s-v1.34 git-subtree-dir: release-tools git-subtree-split: d6846630bd10e563861ab5fa870f9b815daf1f61
Bump dependencies to kubernetes v1.35
add v2 path to module name to allign with go dependency engine rules and allow users to use latest code correctly
update go.mod module to v2
Signed-off-by: Eddie Torres <torredil@amazon.com>
…s-race-condition Protect finalErrorPVCs with mutex to prevent concurrent map writes
1e81e752 Merge pull request kubernetes-csi#293 from andyzhangx/patch-9 4dc18505 fix: upgrade to go1.25.7 to fix CVE-2025-61727 b60b9a50 Merge pull request kubernetes-csi#292 from andyzhangx/patch-8 0e4e2ed0 Update Go version from 1.25.5 to 1.25.6 to fix CVE 707a99ec Merge pull request kubernetes-csi#291 from dfajmon/logcheck a9d2b0fb Bump logcheck to v0.10.0 git-subtree-dir: release-tools git-subtree-split: 1e81e752e87e027311be882279eac9e292705aa5
Bump csi-release-tools to bring go 1.25.7
Add changelog for 2.1.0
And remove .github
openshift-ci-robot
added
the
jira/valid-reference
|
@dfajmon: This pull request references STOR-2758 which is a valid jira issue. DetailsIn 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. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dfajmon The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
Bot
added
the
approved
|
/retest |
|
@dfajmon: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
/lgtm |
1 similar comment
|
/lgtm |
|
CI results look good, which should be sufficient for merging from QE side. |
openshift-ci-robot
added
the
verified
|
@duanwei33: This PR has been marked as verified by DetailsIn 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. |
15 participants
Issue link
https://issues.redhat.com/browse/STOR-2758
Diff to upstream v2.1.0
kubernetes-csi/external-resizer@v2.1.0...dfajmon:rebase-v2.1.0
Notes for reviewers
Summary of changes
Breaking Changes
https://github.com/kubernetes-csi/external-resizer/v2instead ofhttps://github.com/kubernetes-csi/external-resizerand update import paths in the code accordingly (#553)Major Features
csi.storage.k8s.io/controller-modify-secret-nameandcsi.storage.k8s.io/controller-modify-secret-namespaceto reference the credentials that should be used to modify a volume according to the parameters of a VolumeAttributeClass. In absence of these credentials, the credentials ofcontroller-expand-secretare used as a fallback. (#544)MODIFY_VOLUMEcapability without needing to implement theEXPAND_VOLUMEcapability. (#545)Notable Bug Fixes
CVE Fixes
CVE-2025-68121 (updated Go version, #563)
Upstream changelogs
Full changelog
kubernetes-csi/external-resizer@v2.0.0...v2.1.0
Last rebase
#179
@openshift/storage