Skip to content

fix s3 snapshot isolation#577

Merged
markusewalker merged 1 commit intorancher:mainfrom
navsalehi:fix_s3_snapshot_isolation
Apr 1, 2026
Merged

fix s3 snapshot isolation#577
markusewalker merged 1 commit intorancher:mainfrom
navsalehi:fix_s3_snapshot_isolation

Conversation

@navsalehi
Copy link
Copy Markdown
Contributor

This PR adds S3 bucket handling to the snapshot restore tests and introduces reusable helpers (CreateS3Bucket and DeleteS3Bucket) under actions/etcdsnapshot to avoid duplication.

Both K3S and RKE2 tests now create a bucket dynamically, configure ETCD to use S3, validate snapshot/restore, and clean up the bucket during teardown.

@github-actions
Copy link
Copy Markdown

S3SnapshotRestoreTestSuite TearDownSuite
S3SnapshotRestoreTestSuite TearDownSuite
S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite TearDownSuite
S3SnapshotRestoreTestSuite TearDownSuite
S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite SetupSuite

TestSuites above were modified. TestSuites below use modified code from this PR.

Copy link
Copy Markdown
Contributor

@markusewalker markusewalker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left comments that apply to both K3s and RKE2. Once addressed, let's test again to ensure all is good. Overall, nice job!

@navsalehi navsalehi force-pushed the fix_s3_snapshot_isolation branch from aab9bdd to 34ad7e7 Compare March 26, 2026 23:07
@github-actions
Copy link
Copy Markdown

S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite TestS3SnapshotRestore
S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite TestS3SnapshotRestore

TestSuites above were modified. TestSuites below use modified code from this PR.

@navsalehi navsalehi force-pushed the fix_s3_snapshot_isolation branch from 34ad7e7 to 01bc916 Compare March 26, 2026 23:13
@navsalehi navsalehi requested a review from a team as a code owner March 26, 2026 23:13
@navsalehi navsalehi force-pushed the fix_s3_snapshot_isolation branch from 01bc916 to 52722ec Compare March 26, 2026 23:17
markusewalker
markusewalker previously approved these changes Mar 26, 2026
@navsalehi navsalehi force-pushed the fix_s3_snapshot_isolation branch 2 times, most recently from c98b76c to 5a90414 Compare March 26, 2026 23:47
lscalabrini01
lscalabrini01 previously approved these changes Mar 27, 2026
@navsalehi navsalehi force-pushed the fix_s3_snapshot_isolation branch 2 times, most recently from 5a13ff2 to 7c49c9b Compare April 1, 2026 17:40
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 1, 2026

S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite TestS3SnapshotRestore
S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite TestS3SnapshotRestore

TestSuites above were modified. TestSuites below use modified code from this PR.

@navsalehi navsalehi requested review from Josh-Diamond and removed request for susesgartner April 1, 2026 17:41
Josh-Diamond
Josh-Diamond previously approved these changes Apr 1, 2026
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 1, 2026

S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite TestS3SnapshotRestore
S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite TestS3SnapshotRestore

TestSuites above were modified. TestSuites below use modified code from this PR.

@navsalehi navsalehi requested a review from Josh-Diamond April 1, 2026 18:07
@navsalehi navsalehi force-pushed the fix_s3_snapshot_isolation branch from 1a024dd to 99f6e81 Compare April 1, 2026 18:17
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 1, 2026

S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite TestS3SnapshotRestore
S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite SetupSuite
S3SnapshotRestoreTestSuite TestS3SnapshotRestore

TestSuites above were modified. TestSuites below use modified code from this PR.

@markusewalker markusewalker merged commit 7806027 into rancher:main Apr 1, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants