Skip to content

STOR-2598: Rebase to upstream v2.1.11 for OCP 4.21#106

Merged
openshift-merge-bot[bot] merged 29 commits into
openshift:masterfrom
dfajmon:rebase-v2.1.14
Nov 12, 2025
Merged

STOR-2598: Rebase to upstream v2.1.11 for OCP 4.21#106
openshift-merge-bot[bot] merged 29 commits into
openshift:masterfrom
dfajmon:rebase-v2.1.14

Conversation

@dfajmon
Copy link
Copy Markdown

@dfajmon dfajmon commented Nov 3, 2025

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

Diff to upstream v2.1.11
kubernetes-sigs/aws-efs-csi-driver@v2.1.11...dfajmon:rebase-v2.1.14

Notes for reviewers

Rebasing to v2.1.11 because newer versions use go 1.25+ which we don't support for OCP 4.21.

Changes Summary

Full changelog

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

Last rebase

#97

@openshift/storage

jrakas-dev and others added 26 commits May 5, 2025 11:48
…2.1.8

Post release PR for release v2.1.8
Change summary:
1) Address issue 1659: Invalid golang.org/x/net checksum and kubernetes
version. go.sum was regenerated with `go mod tidy`, vendored
dependencies where updated with `go mod vendor`
2) Upgrade k8s modules to 33.2, and clean go.mod replace directive
3) Update mock_k3s_client.go using update-gomock script output
- Fix spelling errors in comments and logs:
  * 'retring' → 'retrying' in node.go
  * 'proccessing' → 'processing' in efs_watch_dog.go logs
- Replace deprecated io/ioutil functions for Go 1.16+ compatibility:
  * ioutil.ReadDir() → os.ReadDir() in efs_watch_dog.go
  * ioutil.TempDir() → os.MkdirTemp() in tests
  * ioutil.WriteFile() → os.WriteFile() in tests
  * ioutil.ReadFile() → os.ReadFile() in reaper.go and tests

All tests pass and functionality remains unchanged.
PR testing failed when reverting line to clean_install 3.0.8 openssl 
packages. Creating this commit to test with clean_install and 
unpinned openssl packages.
…-release

Pre-release PR for 2.1.11 release
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 3, 2025
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Nov 3, 2025

@dfajmon: This pull request references STOR-2598 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:

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

Diff to upstream v2.1.14:
kubernetes-sigs/aws-efs-csi-driver@v2.1.14...dfajmon:rebase-v2.1.14

Changes between v2.1.8 (OCP 4.20) and v2.1.14 (OCP 4.21):

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

Last rebase
#97

@openshift/storage

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 openshift-ci Bot requested review from jsafrane and rhrmo November 3, 2025 16:00
@dfajmon dfajmon changed the title STOR-2598: Rebase to upstream v2.1.14 for OCP 4.21 STOR-2598: Rebase to upstream v2.1.11 for OCP 4.21 Nov 5, 2025
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Nov 5, 2025

@dfajmon: This pull request references STOR-2598 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:

Issue link:

https://issues.redhat.com/browse/STOR-2598

Notes

Rebasing to v2.1.11 because newer versions use go 1.25+ which we don't support for OCP 4.21.

Diff to upstream v2.1.11:
kubernetes-sigs/aws-efs-csi-driver@v2.1.11...dfajmon:rebase-v2.1.14

Changes between v2.1.8 (OCP 4.20) and v2.1.11 (OCP 4.21):

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

Last rebase
#97

@openshift/storage

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

openshift-ci Bot commented Nov 5, 2025

@dfajmon: 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/security 5048fe3 link false /test security

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.

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Nov 5, 2025

@dfajmon: This pull request references STOR-2598 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:

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

Diff to upstream v2.1.11
kubernetes-sigs/aws-efs-csi-driver@v2.1.11...dfajmon:rebase-v2.1.11

Notes for reviewers

Rebasing to v2.1.11 because newer versions use go 1.25+ which we don't support for OCP 4.21.

Changes Summary

Full changelog

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

Last rebase

#97

@openshift/storage

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

This is rebase to 2.1.14! Please update the changelogs + link to diff to upstream

@Phaow
Copy link
Copy Markdown

Phaow commented Nov 11, 2025

Hi @jsafrane, the previously rebase is to v2.1.14 but newer versions use go 1.25+ which we don't support for OCP 4.21, so we change to the latest one v2.1.11 which still using go1.24.x, the branch name seems could not be rename to rebase-v2.1.11 to avoid mislead in this PR. ^^
-> #106 (comment)

@dfajmon
Copy link
Copy Markdown
Author

dfajmon commented Nov 11, 2025

@jsafrane branches cant be renamed after PR is open, it used to be v2.1.14 based after checking that the newest version has incompatible go version I switched to v2.1.11.

Also mentioned in the Description in PR

Rebasing to v2.1.11 because newer versions use go 1.25+ which we don't support for OCP 4.21.

@jsafrane
Copy link
Copy Markdown

I see. Still, please update the "Diff to upstream v2.1.11" link, it's dead

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Nov 11, 2025

@dfajmon: This pull request references STOR-2598 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:

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

Diff to upstream v2.1.11
kubernetes-sigs/aws-efs-csi-driver@v2.1.11...dfajmon:rebase-v2.1.14

Notes for reviewers

Rebasing to v2.1.11 because newer versions use go 1.25+ which we don't support for OCP 4.21.

Changes Summary

Full changelog

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

Last rebase

#97

@openshift/storage

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

/lgtm

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

Phaow commented Nov 12, 2025

/unassign @duanwei33 @chao007 @radeore

@Phaow
Copy link
Copy Markdown

Phaow commented Nov 12, 2025

/verified by CI.
There's no user facing changes in the new rebase regression test should be enough, I manually build the driver/operator/bundle/index images and triggers CI all tests passed looks good.

48 pass, 21 skip (36m40s)

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

@Phaow: This PR has been marked as verified by [CI](https://qe-private-deck-ci.apps.ci.l2s4.p1.openshiftapps.com/view/gs/qe-private-deck/pr-logs/pull/openshift_release/71287/rehearse-71287-periodic-ci-openshift-openshift-tests-private-release-4.21-amd64-nightly-aws-efs-operator-e2e-extended/1988515459888058368)..

Details

In response to this:

/verified by CI.
There's no user facing changes in the new rebase regression test should be enough, I manually build the driver/operator/bundle/index images and triggers CI all tests passed looks good.

48 pass, 21 skip (36m40s)

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 146aab3 into openshift:master Nov 12, 2025
6 of 7 checks passed
@dfajmon dfajmon deleted the rebase-v2.1.14 branch November 12, 2025 14:10
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.