🐛 Fix setting folder S3 on etcd backups #549
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
furkatgofurov7
force-pushed
the
fix-setting-s3folder
branch
from
13c5bb4 to
8b543cb
Compare
|
@furkatgofurov7 will the revert cause a regression? AFAIK #264 addressed a bug we saw when testing etcd restore POC |
furkatgofurov7
force-pushed
the
fix-setting-s3folder
branch
from
8b543cb to
32c596a
Compare
Signed-off-by: Furkat Gofurov <[email protected]>
furkatgofurov7
force-pushed
the
fix-setting-s3folder
branch
from
32c596a to
54c9eec
Compare
furkatgofurov7
commented
Jan 10, 2025
| rke2ServerConfig.EtcdS3SkipSslVerify = !opts.ServerConfig.Etcd.BackupConfig.S3.EnforceSSLVerify | ||
| } else { | ||
| rke2ServerConfig.EtcdSnapshotDir = opts.ServerConfig.Etcd.BackupConfig.Directory |
There was a problem hiding this comment.
@alexander-demicev @Danil-Grigorev thanks for reviews, PTAL once again. I updated the code so that EtcdSnapshotDir (local snapshot dir) set to S3.Folder logic is removed and it being set inside else condition is moved out of it, since the condition is redundant here.
Danil-Grigorev
approved these changes
Jan 10, 2025
alexander-demicev
approved these changes
Jan 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Fixes #499
Reverts: 261395eSpecial notes for your reviewer:
Checklist: