OCPBUGS-77562, STOR-2758: Rebase to upstream v4.11.0 for OCP 4.22#94
Conversation
During periodic re-sync in ReconcileVA, skip VolumeAttachments of unrelated CSI drivers. The VolumeAttachments will be skipped anyway in syncVA(). This only prevents log spam and saves some CPU.
Skip VolumeAttachments of other drivers
Bumps [github.com/mailru/easyjson](https://github.com/mailru/easyjson) from 0.9.0 to 0.9.1. - [Release notes](https://github.com/mailru/easyjson/releases) - [Commits](mailru/easyjson@v0.9...v0.9.1) --- updated-dependencies: - dependency-name: github.com/mailru/easyjson dependency-version: 0.9.1 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…go_modules/github.com/mailru/easyjson-0.9.1 Bump github.com/mailru/easyjson from 0.9.0 to 0.9.1
Signed-off-by: carlory <baofa.fan@daocloud.io>
cleanup csi.volume.kubernetes.io/nodeid
707a99ecae0 Merge pull request kubernetes-csi#291 from dfajmon/logcheck a9d2b0fb3b0 Bump logcheck to v0.10.0 d6846630bd1 Merge pull request kubernetes-csi#290 from dfajmon/go-1.25.5 55e527c4947 Bump golang to 1.25.5 b12e407cc95 Merge pull request kubernetes-csi#289 from nixpanic/k8s-v1.34 bbe5e547e2d Use Kubernetes v1.34 and Kind v0.30 by default 4e9eb2c9ee5 Merge pull request kubernetes-csi#288 from gnufied/add-gnufied-for-csi-approver 064e260d995 Add myself as csi approver c852fa797fe Merge pull request kubernetes-csi#287 from andyzhangx/patch-7 bce16c103a9 fix: upgrade to go1.24.11 to fix CVE-2025-61727 8d1258cce80 Merge pull request kubernetes-csi#286 from kubernetes-csi/dependabot/github_actions/actions/checkout-6 91e35981a64 Bump actions/checkout from 5 to 6 294138155cf Merge pull request kubernetes-csi#285 from andyzhangx/patch-6 fa8b339e900 fix: upgrade to go1.24.9 to fix CVEs 74502e544bc Merge pull request kubernetes-csi#278 from liangyuanpeng/migrate_k8s_testimages 53344305509 Merge pull request kubernetes-csi#281 from kubernetes-csi/dependabot/github_actions/actions/checkout-5 458ce146ff7 Bump actions/checkout from 4 to 5 5ec1a52b84d use gcr.io/k8s-staging-test-infra instead of gcr.io/k8s-testimages git-subtree-dir: release-tools git-subtree-split: 707a99ecae026a8faa36d60aa9ea88505b5865df
Update csi-release-tools & Bump k8s dependencies to v1.35.0
Bumps the k8s-dependencies group with 3 updates in the / directory: [github.com/kubernetes-csi/csi-test/v5](https://github.com/kubernetes-csi/csi-test), [sigs.k8s.io/apiserver-network-proxy/konnectivity-client](https://github.com/kubernetes-sigs/apiserver-network-proxy) and [sigs.k8s.io/structured-merge-diff/v6](https://github.com/kubernetes-sigs/structured-merge-diff). Updates `github.com/kubernetes-csi/csi-test/v5` from 5.3.1 to 5.4.0 - [Release notes](https://github.com/kubernetes-csi/csi-test/releases) - [Commits](kubernetes-csi/csi-test@v5.3.1...v5.4.0) Updates `sigs.k8s.io/apiserver-network-proxy/konnectivity-client` from 0.33.0 to 0.34.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.33.0...v0.34.0) Updates `sigs.k8s.io/structured-merge-diff/v6` from 6.3.0 to 6.3.1 - [Release notes](https://github.com/kubernetes-sigs/structured-merge-diff/releases) - [Changelog](https://github.com/kubernetes-sigs/structured-merge-diff/blob/master/RELEASE.md) - [Commits](kubernetes-sigs/structured-merge-diff@v6.3.0...v6.3.1) --- updated-dependencies: - dependency-name: github.com/kubernetes-csi/csi-test/v5 dependency-version: 5.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: sigs.k8s.io/apiserver-network-proxy/konnectivity-client dependency-version: 0.34.0 dependency-type: indirect update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: sigs.k8s.io/structured-merge-diff/v6 dependency-version: 6.3.1 dependency-type: indirect update-type: version-update:semver-patch dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
…go_modules/k8s-dependencies-a3a04027e6 Bump the k8s-dependencies group across 1 directory with 3 updates
To respect go versioning and have the module import-able.
Update the module import path to include /v4
Bumps the k8s-dependencies group with 1 update: [github.com/kubernetes-csi/csi-lib-utils](https://github.com/kubernetes-csi/csi-lib-utils). Updates `github.com/kubernetes-csi/csi-lib-utils` from 0.23.1 to 0.23.2 - [Release notes](https://github.com/kubernetes-csi/csi-lib-utils/releases) - [Commits](kubernetes-csi/csi-lib-utils@v0.23.1...v0.23.2) --- updated-dependencies: - dependency-name: github.com/kubernetes-csi/csi-lib-utils dependency-version: 0.23.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github.com/stoewer/go-strcase](https://github.com/stoewer/go-strcase) from 1.3.0 to 1.3.1. - [Release notes](https://github.com/stoewer/go-strcase/releases) - [Commits](stoewer/go-strcase@v1.3.0...v1.3.1) --- updated-dependencies: - dependency-name: github.com/stoewer/go-strcase dependency-version: 1.3.1 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…go_modules/k8s-dependencies-1ce085a5b7 Bump github.com/kubernetes-csi/csi-lib-utils from 0.23.1 to 0.23.2 in the k8s-dependencies group
refactor: use common sidecar flags functionality
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 git-subtree-dir: release-tools git-subtree-split: 1e81e752e87e027311be882279eac9e292705aa5
Bump csi-release-tools to bring go 1.25.7
Bumps the k8s-dependencies group with 1 update: [sigs.k8s.io/structured-merge-diff/v6](https://github.com/kubernetes-sigs/structured-merge-diff). Updates `sigs.k8s.io/structured-merge-diff/v6` from 6.3.1 to 6.3.2 - [Release notes](https://github.com/kubernetes-sigs/structured-merge-diff/releases) - [Changelog](https://github.com/kubernetes-sigs/structured-merge-diff/blob/master/RELEASE.md) - [Commits](kubernetes-sigs/structured-merge-diff@v6.3.1...v6.3.2) --- updated-dependencies: - dependency-name: sigs.k8s.io/structured-merge-diff/v6 dependency-version: 6.3.2 dependency-type: indirect update-type: version-update:semver-patch dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
…go_modules/github.com/stoewer/go-strcase-1.3.1 Bump github.com/stoewer/go-strcase from 1.3.0 to 1.3.1
…go_modules/k8s-dependencies-fdea40109e Bump sigs.k8s.io/structured-merge-diff/v6 from 6.3.1 to 6.3.2 in the k8s-dependencies group
Add changelog for v4.11
openshift-ci-robot
added
the
jira/valid-reference
openshift-ci-robot
added
the
jira/valid-bug
|
@dfajmon: This pull request references Jira Issue OCPBUGS-77562, which is valid. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (wduan@redhat.com), skipping review request. The bug has been updated to refer to the pull request using the external bug tracker. 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
|
@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 |
|
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. |
|
@dfajmon: Jira Issue Verification Checks: Jira Issue OCPBUGS-77562 Jira Issue OCPBUGS-77562 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓 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. |
10 participants
Issue link
https://issues.redhat.com/browse/STOR-2758
Diff to upstream v4.11.0
kubernetes-csi/external-attacher@v4.11.0...dfajmon:rebase-v4.11.0
Notes for reviewers
Summary of changes
Notable Bug Fixes
/v4(#696)CVE Fixes
CVE-2025-68121
Upstream changelogs
Full changelog
kubernetes-csi/external-attacher@v4.10.0...v4.11.0
Last rebase
#89
@openshift/storage