Skip to content

STOR-2403: Rebase to upstream v2.1.8 for OCP 4.20#97

Merged
openshift-merge-bot[bot] merged 88 commits into
openshift:masterfrom
rhrmo:rebase-2.1.8
Jul 14, 2025
Merged

STOR-2403: Rebase to upstream v2.1.8 for OCP 4.20#97
openshift-merge-bot[bot] merged 88 commits into
openshift:masterfrom
rhrmo:rebase-2.1.8

Conversation

@rhrmo
Copy link
Copy Markdown

@rhrmo rhrmo commented Jun 25, 2025 •
edited
Loading

mskanth972 and others added 30 commits October 25, 2024 14:57
@mskanth972
Pre-release PR for v2.1.0
853de88
@mskanth972
Merge pull request kubernetes-sigs#1488 from mskanth972/pre-release-PR
159cf14 
Pre-release PR for v2.1.0
@mskanth972
Post-release PR for v2.1.0
d7bb9a7
@mskanth972
Merge pull request kubernetes-sigs#1490 from mskanth972/post-release_…
f4ada9b 
…2.1.0

Post-release PR for v2.1.0
@andrewjamesbrown @jrakas-dev
chore: update Python base images to newer versions
047cb18
@abhinavmpandey08 @jrakas-dev
Adds anti-affinity for incompatible compute types
758c25b
@pvickery-ParamountCommerce @jrakas-dev
Fix controller.podLabels typo in values.yaml
3ff393e
@cescribanohs @jrakas-dev
chore: squash commits
e66e037 
feat: add portRangeUpperBound to be exposed in the helm chart

feat: add portRangeUpperBound to be exposed in the helm chart
@mskanth972 @jrakas-dev
Add additional arguments for Side cars
6760fcb
@dankova22 @jrakas-dev
Fix volume delete failure for static provisioning when accessPointId …
2f3da27 
…is empty
@mskanth972 @jrakas-dev
Add permissions to all GitHub actions
f2693ee
@omerap12 @sherifabdlnaby @jrakas-dev
Squashed commit of the following:
0b3044e 
commit 2dfd178
Author: Omer Aplatony <omerap12@gmail.com>
Date:   Tue Nov 26 17:07:14 2024 +0200

    revert

    Signed-off-by: Omer Aplatony <omerap12@gmail.com>

commit 3b7dbbd
Author: Omer Aplatony <omerap12@gmail.com>
Date:   Tue Nov 26 09:16:04 2024 +0200

    Set default values

    Signed-off-by: Omer Aplatony <omerap12@gmail.com>

commit 508e32a
Merge: a943df0 c963295
Author: Omer Aplatony <omerap12@gmail.com>
Date:   Tue Nov 26 09:04:32 2024 +0200

    Merged master

    Signed-off-by: Omer Aplatony <omerap12@gmail.com>

commit a943df0
Author: Omer Aplatony <omerap12@gmail.com>
Date:   Sun Jul 7 10:06:27 2024 +0300

    Add Pod Disruption Budget and configurable deployment name

    Signed-off-by: Omer Aplatony <omerap12@gmail.com>

Signed-off-by: Omer Aplatony <omerap12@gmail.com>

Apply suggestions from code review

Co-authored-by: Sherif Abdel-Naby <sherifabdlnaby@gmail.com>
Signed-off-by: Omer Aplatony <omerap12@gmail.com>
@omerap12 @jrakas-dev
Fixed wrong labels
5f40ef8 
Signed-off-by: Omer Aplatony <omerap12@gmail.com>
@mskanth972 @jrakas-dev
Adding new argument for csi provisioner
8b1adf5
@Kellen275 @jrakas-dev
Add metadata.namespace to chart templates
612fa75
@andrewjamesbrown @jrakas-dev
chore: update go and deps to address CVEs
1670256
@jrakas-dev
Update documentation and changelog for release v2.1.1
bd6e9c7
@k8s-ci-robot
Merge pull request kubernetes-sigs#1517 from jrakas-dev/pre-release-v…
ac8f0b0 
…2.1.1

Pre-release PR for v2.1.1
@k8s-ci-robot
Merge pull request kubernetes-sigs#1516 from jrakas-dev/cherry-pick-v…
2d59caa 
…2.1.1

Cherry pick v2.1.1
@jrakas-dev
Post-release PR for release v2.1.1
b8c5c64
@k8s-ci-robot
Merge pull request kubernetes-sigs#1521 from jrakas-dev/post-release-…
e3bc3fa 
…v2.1.1

Post-release PR for release v2.1.1
@andrewjamesbrown @tdachille-dev
chore: update k8s dependencies
b5cfeec
@k8s-ci-robot
Merge pull request kubernetes-sigs#1526 from tdachille-dev/cherry-pic…
4caa488 
…k-v2.1.2

Cherry pick v2.1.2
@tdachille-dev
Pre-release PR for v2.1.2 (update documentation and changelog)
82ffd17
@k8s-ci-robot
Merge pull request kubernetes-sigs#1527 from tdachille-dev/pre-releas…
ae832b9 
…e-v2.1.2

Pre-release PR for v2.1.2
@jrakas-dev
Add PR-1532 and PR-1531 to release v2.1.2
a0ee72e
@jrakas-dev
Modify delete access point root directory logic to only remove tempor…
d9ded6e 
…ary directory if empty
@germanparente @jrakas-dev
CVE-2024-45337: bump golang.org/x/crypto to v0.31.0
e24528a
@k8s-ci-robot
Merge pull request kubernetes-sigs#1536 from jrakas-dev/release-2.1.2…
4ff6ae1 
…-additions

Add PR-1532 and PR-1531 to release v2.1.2
@mskanth972
Merge pull request kubernetes-sigs#1537 from jrakas-dev/release-2.1.2…
5a3dfe8 
…-cherry-pick

Release 2.1.2 cherry pick
@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 25, 2025
@openshift-ci openshift-ci Bot requested review from mpatlasov and tsmetana June 25, 2025 13:34
@rhrmo rhrmo changed the title [WIP] Rebase 2.1.8 STOR-2403: Rebase to upstream v2.1.8 for OCP 4.20 Jun 26, 2025
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 26, 2025
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jun 26, 2025 •
edited by openshift-ci Bot
Loading

@rhrmo: This pull request references STOR-2403 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.20.0" version, but no target version was set.

Details

In 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.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 26, 2025
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jun 26, 2025 •
edited by openshift-ci Bot
Loading

@rhrmo: This pull request references STOR-2403 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.20.0" version, but no target version was set.

Details

In response to this:

Issue link:
https://issues.redhat.com/browse/STOR-2403

Diff to upstream v2.1.8:
kubernetes-sigs/aws-efs-csi-driver@v2.1.8...rhrmo:rebase-2.1.8

Notable changes between v2.1.5 (OCP 4.19) and v2.1.8 (OCP 4.20):

Full changelogs:
https://github.com/kubernetes-sigs/aws-efs-csi-driver/blob/master/CHANGELOG-2.x.md

@openshift/storage
@openshift/storage-qe

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.

mpatlasov
mpatlasov reviewed Jun 30, 2025
View reviewed changes
Comment thread OWNERS_ALIASES
RomanBednar and others added 3 commits July 1, 2025 09:10
@RomanBednar @rhrmo
UPSTREAM: <carry>: Add OpenShift files
2db91b4 
Additional changes:

- remove .github files
- do not overwrite GOARCH in makefile
- go mod tidy && go mod vendor
@rhrmo
UPSTREAM: <carry>: Add replace for k8s.io/endpointslice module
03af524 
Commit fixed issues with running go list -mod=readonly -m all

Can be dropped if upstream adds this replace to go.mod:

k8s.io/endpointslice => k8s.io/endpointslice v0.28.15
@kunalmemane @rhrmo
UPSTREAM: 1611: CVE-2025-22869: bump golang.org/x/crypto to v0.35.0
8612af1
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Jul 1, 2025

@rhrmo: all tests passed!

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.

@mpatlasov
Copy link
Copy Markdown

mpatlasov commented Jul 1, 2025

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 1, 2025
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Jul 1, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mpatlasov, rhrmo

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 Jul 1, 2025
@ropatil010
Copy link
Copy Markdown

ropatil010 commented Jul 14, 2025

Adding qe label based on the tested results using this PR.

Platform: AWS
EFS Version: 4.20.0-202507101546
Payload: 4.20.0-0.nightly-2025-07-07-234740
EFS Driver Image value: quay.io/rhn_support_ropatil/aws-efs-csi-driver710@sha256:2db2d749cb9f4537b98930e690f2d27adf56bf6cea33f241d305fdcdcdad9ecd
EFS CSI Driver version:
{ "driverVersion": "v2.1.8", "gitCommit": "8612af1a9896f044d3ea796813d7debc09568add", "buildDate": "2025-07-10T03:17:48Z", "efsClientSource": "k8s", "goVersion": "go1.24.3 (Red Hat 1.24.3-3.el9) X:strictfipsruntime", "compiler": "gc", "platform": "linux/amd64" }

Storage Regression test results with EFS provisioner:
https://jenkins-csb-openshift-qe-mastern.dno.corp.redhat.com/job/ocp-common/job/ginkgo-test/293523/console
07-11 14:57:22.614 error: 3 fail, 124 pass, 167 skip (3h43m39s)

3 Failures:

  1. 07-11 14:57:22.614 [sig-storage] STORAGE Author:ropatil-NonHyperShiftHOST-ROSA-OSD_CCS-Medium-74568-[AWS-EFS-CSI Driver][Dynamic PV][Filesystem] is provisioned successfully with nil posix user for accesspoint [Serial]
  2. 07-11 14:57:22.614 [sig-storage] STORAGE NonHyperShiftHOST-ROSA-OSD_CCS-Longduration-NonPreRelease-ARO-Author:jiasun-High-37783-[storage] Metric should report storage volume numbers per storage plugins and volume mode [Serial]
  3. 07-11 14:57:22.614 [sig-storage] STORAGE ROSA-OSD_CCS-ARO-Longduration-NonPreRelease-Author:jiasun-Medium-44297-[AWS-EFS-CSI-Driver]-one thousand of access point are supportable for one efs volume [Serial]

74568 Auto fix: https://issues.redhat.com/browse/STOR-2512
37783, 44297 are timeout issue. No product issues.

/label qe-approved

@openshift-ci openshift-ci Bot added the qe-approved Signifies that QE has signed off on this PR label Jul 14, 2025
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 14, 2025 •
edited by openshift-ci Bot
Loading

@rhrmo: This pull request references STOR-2403 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.20.0" version, but no target version was set.

Details

In response to this:

Issue link:
https://issues.redhat.com/browse/STOR-2403

Diff to upstream v2.1.8:
kubernetes-sigs/aws-efs-csi-driver@v2.1.8...rhrmo:rebase-2.1.8

Notable changes between v2.1.5 (OCP 4.19) and v2.1.8 (OCP 4.20):

Full changelogs:
https://github.com/kubernetes-sigs/aws-efs-csi-driver/blob/master/CHANGELOG-2.x.md

@openshift/storage
@openshift/storage-qe

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 7cced5e into openshift:master Jul 14, 2025
7 checks passed
@openshift-bot
Copy link
Copy Markdown

openshift-bot commented Jul 14, 2025

[ART PR BUILD NOTIFIER]

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

@dfajmon dfajmon mentioned this pull request Nov 3, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tsmetana tsmetana Awaiting requested review from tsmetana

1 more reviewer

@mpatlasov mpatlasov mpatlasov left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@mpatlasov mpatlasov

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. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.