Skip to content

STOR-2758: Rebase to upstream v2.4.2 for OCP 4.22 #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 91 commits into from
Apr 8, 2026
Merged

STOR-2758: Rebase to upstream v2.4.2 for OCP 4.22 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
ddc2bd0
Update Readme markdown for crossaccount prerequisites
seanzatzdev-amazon Apr 8, 2024
0c5b52d
Release efs-utils v2.0.0
RyanStan Apr 12, 2024
0884956
Don't require rust or cargo for rhel 7
RyanStan Apr 17, 2024
46cdb9f
efs-utils v2.0.1 release
RyanStan Apr 23, 2024
48bb375
Amend Debian control to use binary architecture
inopinatus Apr 29, 2024
c974e9d
bump py from 1.10.0 to 1.11.0
amofakhar May 15, 2024
8b3a208
efs-utils v2.0.2 release
anthotse May 20, 2024
232188f
Merge pull request #219 from anthotse/2.0.2
anthotse May 24, 2024
14a15c7
Add Ubuntu 22.04 to verified OS list
anthotse Jun 10, 2024
5f418ee
efs-utils v2.0.3 release
arnavgup1 Jun 18, 2024
848d801
Remove outdated python versions from CircleCI
arnavgup1 Jun 18, 2024
8bac137
Change README to account for change to CircleCI Python tests
arnavgup1 Jun 18, 2024
4289435
Merge pull request #223 from arnavgup1/circleci_python
arnavgup1 Jun 19, 2024
89565bf
Merge pull request #222 from arnavgup1/2.0.3
arnavgup1 Jun 19, 2024
c7f271f
Merge pull request #216 from amofakhar/bump_py
anthotse Jun 19, 2024
9d08805
efs-utils v2.0.4 release
anthotse Jun 25, 2024
3dcc61a
Merge pull request #224 from anthotse/2.0.4
anthotse Jun 27, 2024
b6721ed
use dns suffix based on region
jdwtf Aug 7, 2024
769637c
adding dns name suffixes for new regions
jdwtf Aug 8, 2024
5addd50
use region-specific dns suffix for sts
jdwtf Aug 9, 2024
c25f1f7
efs-utils v2.0.4-2 release
anthotse Aug 12, 2024
e33ad7d
Merge pull request #235 from anthotse/2.0.4
anthotse Aug 12, 2024
1477f55
Update rust requirements
anthotse Aug 12, 2024
7119f24
Merge pull request #236 from anthotse/master
anthotse Aug 12, 2024
d414371
Add rpm-without-system-rust to rpmspec
retornam Aug 22, 2024
1c0f9de
Merge pull request #237 from retornam/retornam/fixes
mskanth972 Sep 9, 2024
2911904
adding unit tests
jdwtf Sep 17, 2024
78ad005
Merge branch 'aws:master' into master
jdwtf Sep 17, 2024
c08abb1
efs-utils v2.1.0-1 release
jrakas-dev Sep 23, 2024
3b88794
Merge pull request #243 from jrakas-dev/2.1.0
jrakas-dev Sep 24, 2024
460841b
fixing conflicts
jdwtf Sep 30, 2024
7373551
resolving conflict
jdwtf Sep 30, 2024
d2b5cc5
Merge pull request #234 from jdwtf/master
seanzatzdev-amazon Oct 1, 2024
5647637
Revert "Adding region-specifc domain suffix for sts endpoints and add…
seanzatzdev-amazon Oct 1, 2024
b7d3e19
Merge pull request #245 from aws/revert-234-master
seanzatzdev-amazon Oct 1, 2024
97fc737
Enable support for EC2 Mac instances running macOS Sequoia
jrakas-dev Oct 8, 2024
87874bd
Merge pull request #250 from jrakas-dev/macos-sequoia
jrakas-dev Oct 8, 2024
615f154
Merge branch 'master' into fix_control_arch_release
anthotse Nov 19, 2024
20de38a
Merge pull request #211 from inopinatus/fix_control_arch_release
anthotse Nov 19, 2024
15f6f88
efs-utils v2.2.0-1 release
anthotse Nov 20, 2024
942e73a
Merge pull request #258 from anthotse/2.2.0
anthotse Nov 20, 2024
b160f02
Add installation instruction for make rpm edge case
thakurmi Feb 4, 2025
dacdc4b
Merge pull request #268 from thakurmi/rpm-install-instruction-update
anthotse Feb 7, 2025
ca29621
Upgrade log4rs version to mitigate security vulnerabilities
jrakas-dev Feb 10, 2025
c9600be
Merge pull request #269 from jrakas-dev/log4rs-version-upgrade
jrakas-dev Feb 10, 2025
7ef52be
Remove RHEL 7 support from efs-utils README as its no longer supported.
mskanth972 Mar 4, 2025
d468404
Revert "Remove RHEL 7 support from efs-utils README as its no longer …
mskanth972 Mar 4, 2025
e28dafd
Remove RHEL 7 support from efs-utils README as its no longer supported.
mskanth972 Mar 4, 2025
1c6c5bb
Merge pull request #272 from aws/updateReadme
mskanth972 Mar 4, 2025
c0b60d9
efs-utils v2.2.1-1 release
dluthcke Mar 11, 2025
e0f8ee5
Merge pull request #275 from dluthcke/2.2.1
mskanth972 Mar 11, 2025
14e73be
remove $ from all codeblocks
tjex Mar 26, 2025
47e79f5
Merge pull request #276 from tjex/patch-1
anthotse Apr 8, 2025
c65af2f
efs-utils v2.3.0-1 release
anthotse Apr 29, 2025
9283250
Merge pull request #279 from anthotse/2.3.0
anthotse Apr 29, 2025
6dd515c
Fix backtrace version to resolve ubuntu and rhel build issues
thakurmi May 8, 2025
fe821f5
Merge pull request #282 from thakurmi/master
anthotse May 8, 2025
34e6a52
Pin Cargo.lock to avoid unexpected error across images
thakurmi May 13, 2025
48cd437
Merge pull request #284 from thakurmi/master
anthotse May 14, 2025
5949545
Update version in amazon-efs-utils.spec to 2.3.1
anthotse Jul 3, 2025
e539990
Fix incorrect package version
anthotse Jul 18, 2025
e9ff0e1
Merge pull request #292 from anthotse/mainline
anthotse Jul 18, 2025
e56ea4c
Add environment variable support for AWS profiles and regions
oyiz-michael Jul 24, 2025
ad31b55
Regenerate Cargo.lock with rust 1.70.0
anthotse Jul 28, 2025
f37f194
Merge pull request #298 from aws/cargo-lock
anthotse Jul 28, 2025
43bd530
Merge pull request #297 from oyiz-michael/feature/aws-env-var-support
samuhale Jul 29, 2025
d9efba8
Update circle-ci config
anthotse Jul 30, 2025
5001f27
Fix AWS Env Variable Test and Code Style Issue
samuhale Jul 30, 2025
3986952
Merge pull request #300 from samuhale/test-fix
samuhale Jul 30, 2025
a1b8ec1
Merge branch 'aws:master' into circle-ci
anthotse Jul 31, 2025
1c56f20
Remove CentOS 8 and Ubuntu 16.04 from verified Linux distribution list
anthotse Aug 11, 2025
15d3a86
Merge pull request #304 from anthotse/circle-ci
anthotse Aug 11, 2025
1fc4ab3
efs-utils v2.3.3-1 release
anthotse Aug 11, 2025
943020f
Merge pull request #305 from anthotse/v2.3.3
anthotse Aug 11, 2025
6f43ed1
efs-utils v2.4.0-1 release
YangjinanHu Oct 28, 2025
ff7b161
Merge pull request #311 from aws/yjnhu/v2.4.0
YangjinanHu Oct 31, 2025
de938b6
efs-utils v2.4.1-1 release
anthotse Nov 20, 2025
2341e82
Merge pull request #317 from anthotse/2.4.1
anthotse Nov 20, 2025
413b60d
Fix log retention logic
zmaguire Dec 3, 2025
16a0d58
Merge pull request #319 from zmaguire/master
samuhale Dec 3, 2025
fde8027
Fix whitespace for circleCI
zmaguire Dec 3, 2025
e9ee2bd
Merge pull request #320 from zmaguire/master
samuhale Dec 3, 2025
4183473
Add slack notification workflow for issues and PRs
DavidXU12345 Dec 23, 2025
7f491f9
Merge pull request #321 from DavidXU12345/add-slack-notification
DavidXU12345 Dec 24, 2025
be26e89
Fix EFS_FQDN_RE to support ADC DNS suffixes with hyphens
Feb 23, 2026
e23020f
Merge pull request #325 from ANorwell/fix-adc-fqdn-regex
samuhale Feb 23, 2026
1567e44
efs-utils v2.4.2-1 release
samuhale Mar 4, 2026
e79f9c1
Merge pull request #329 from samuhale/2.4.2
samuhale Mar 4, 2026
9344e82
Merge remote-tracking branch 'openshift/master' into rebase-v2.4.2
dfajmon Mar 10, 2026
f0c6c45
UPSTREAM: : Add OpenShift files
dfajmon Apr 2, 2026
1117c13
UPSTREAM: <carry>: Enable stunnel permanently
dfajmon Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
294 changes: 0 additions & 294 deletions .circleci/config.yml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ COPY ./src/watchdog/__init__.py /usr/bin/amazon-efs-mount-watchdog
RUN chmod 755 /usr/bin/amazon-efs-mount-watchdog

# Copy cachito / hermeto files used in the build pipeline. Copy an innocent file if the env. vars are not set.
ARG REMOTE_SOURCES
ARG REMOTE_SOURCES_DIR
ENV REMOTE_SOURCES_SRC=${REMOTE_SOURCES:-"requirements.txt"}
ENV REMOTE_SOURCES_DST=${REMOTE_SOURCES_DIR:-"/remote_sources_dir/"}
COPY "$REMOTE_SOURCES_SRC" "$REMOTE_SOURCES_DST"
Expand Down
Loading