STOR-2758: Rebase to upstream v2.4.2 for OCP 4.22#42
STOR-2758: Rebase to upstream v2.4.2 for OCP 4.22#42openshift-merge-bot[bot] merged 91 commits intoopenshift:masterfrom
Conversation
This commit replaces stunnel, which provides TLS encryptions for mounts, with efs-proxy, a component built in-house at AWS. Efs-proxy lays the foundation for upcoming feature launches at EFS.
rhel 7 doesn't provide rust or cargo packages. Even if a user installs rust and cargo through rustup, the 'buildrequires' statement will still fail the build. I also updated the README with a "common 2.0.0 installation issues" section.
- Disable Nagle's algorithm for TLS mounts to improve latencies
The output includes a binary for a specific architecture. Parameterise the control file and package filename appropriately, lest repository management tools misbehave in multi-architecture environments.
efs-utils v2.0.2 release
Remove outdated python versions from CircleCI
efs-utils v2.0.3 release
bump py fom 1.10.0 to 1.11.0
efs-utils v2.0.4 release
efs-utils v2.0.4-2 release
Update rust requirements
Updated the rpmspec with the following conditions - with system_rust - without system_rust [1] is the default and builds the rpmspec with rustc and cargo provided they are installed with yum [2] builds the rpmspecfile with rustc and cargo installed outside of yum (in cases where rustup was used to install both rustc and cargo) [1] and [2] makes it possible to build both instances using the Makefile. The old makefile command make rpm stays the same but assumes [1] and the new command make rpm-without-system-rust assumes [2]
Add rpm-without-system-rust to rpmspec
- Support region as a mount option (PR-171) - Add new regions to efs-utils.conf file (PR-241)
efs-utils v2.1.0-1 release
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
|
@dfajmon I manually build the utils image and override it in driver dockerfile, build operator/bundle/index images launched regression tests, all efs related tests mount failed -> ...
Warning FailedMount 51s (x10 over 5m4s) kubelet MountVolume.SetUp failed for volume "pvc-52b777f7-0fca-4b22-bcf5-3434575c5ad8" : rpc error: code = Internal desc = Could not mount "fs-0fa045a224cfa40bd:/" at "/var/lib/kubelet/pods/5a143a7e-117b-4e81-8ed6-85ef918be535/volumes/kubernetes.io~csi/pvc-52b777f7-0fca-4b22-bcf5-3434575c5ad8/mount": mount failed: exit status 1
Mounting command: mount
Mounting arguments: -t efs -o accesspoint=fsap-0ba9c66a60b072488,tls fs-0fa045a224cfa40bd:/ /var/lib/kubelet/pods/5a143a7e-117b-4e81-8ed6-85ef918be535/volumes/kubernetes.io~csi/pvc-52b777f7-0fca-4b22-bcf5-3434575c5ad8/mount
Output: Could not start amazon-efs-mount-watchdog, unrecognized init system "aws-efs-csi-dri"
which: no efs-proxy in (/sbin:/usr/sbin:/usr/local/sbin:/root/bin:/usr/local/bin:/usr/bin:/bin)
Failed to locate efs-proxy in /sbin:/usr/sbin:/usr/local/sbin:/root/bin:/usr/local/bin:/usr/bin:/bin - The efs-proxy binary is packaged with efs-utils. It was deleted or not installed correctly.
...Dig further and found seems in https://github.com/aws/efs-utils/pull/203/changes?mode=single#diff-ebc2f4cb2a27f555929aab44a3f15be40decdc0432e7ffa6b7e6a588354c166bR1909-R1916 uses efs-proxy mount by default. It seems we need a carry patch change the [mount]
# Use legacy stunnel instead of efs-proxy for TLS mounts
use_legacy_stunnel = true |
Sorry, it is a hallucination(claude's suggestion), after double checking I do not find it in source codes or aws doc. We still needs to find another way to fix it if we have to rebase the 2.0+ version. |
@dfajmon , OK, I didn't know that we remove everything related to upstream CI, but it must be fine -- we needn't this file downstream. I'm just curios, what would be broken if we keep it "as is"? Can you add some words about why we removed this file to commit description, please. |
Add OpenShift specific: OWNERS & OWNER_ALIASES .ci-operator.yaml Dockerfile Botocore specifics: requirements.txt.ocp install-python-deps-ocp.sh Removed ci configs: .github .circleci
This needs to be communicated with upstream to have better solution.
|
@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 |
|
/unassign @duanwei33 @chao007 @radeore |
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
|
/verified by CI |
openshift-ci-robot
added
the
verified
|
@Phaow: 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. |
20 participants
Issue link
https://redhat.atlassian.net/browse/STOR-2758
Diff to upstream v2.4.2
aws/efs-utils@v2.4.2...dfajmon:rebase-v2.4.2
Notes for reviewers
Botocore dependencies are included with install-python-deps-ocp.sh.
Summary of changes
Breaking Changes
Major Features
Notable Bug Fixes
Cherry-picked commits
Upstream changelogs
The upstream aws/efs-utils project does not publish formal per-release changelogs or GitHub Releases. Changes are tracked via git tags and commit history.
Full changelog
aws/efs-utils@v1.36.0...v2.4.2
Last rebase
#26
@openshift/storage