Skip to content

Use etcd-snapshot-retention as default for s3 if etcd-s3-retention is not set #13770

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
brandond merged 1 commit into from
Mar 10, 2026
Merged

Use etcd-snapshot-retention as default for s3 if etcd-s3-retention is not set #13770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion pkg/cli/etcdsnapshot/etcd_snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,12 @@ func commandSetup(app *cli.Context, cfg *cmds.Server) (*etcd.SnapshotRequest, *c
if app.IsSet("etcd-snapshot-retention") {
sr.Retention = &cfg.EtcdSnapshotRetention
}

if cfg.EtcdS3 {
// set default s3 retention from local snapshot retention
// preserves legacy behavior of local snapshot retention also affecting s3
if !app.IsSet("etcd-s3-retention") && app.IsSet("etcd-snapshot-retention") {
cfg.EtcdS3Retention = cfg.EtcdSnapshotRetention
}
sr.S3 = &config.EtcdS3{
AccessKey: cfg.EtcdS3AccessKey,
Bucket: cfg.EtcdS3BucketName,
Expand Down
5 changes: 5 additions & 0 deletions pkg/cli/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,11 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont
if cfg.EtcdS3Timeout <= 0 {
return errors.New("etcd-s3-timeout must be greater than 0s")
}
// set default s3 retention from local snapshot retention
// preserves legacy behavior of local snapshot retention also affecting s3
if !app.IsSet("etcd-s3-retention") && app.IsSet("etcd-snapshot-retention") {
cfg.EtcdS3Retention = cfg.EtcdSnapshotRetention
}
serverConfig.ControlConfig.EtcdS3 = &config.EtcdS3{
AccessKey: cfg.EtcdS3AccessKey,
Bucket: cfg.EtcdS3BucketName,
Expand Down
2 changes: 2 additions & 0 deletions pkg/etcd/s3/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ func (c *Controller) GetClient(ctx context.Context, etcdS3 *config.EtcdS3) (*Cli
// update ConfigSecret in defaults so that comparisons between current and default config
// ignore ConfigSecret when deciding if CLI configuration is present.
defaultEtcdS3.ConfigSecret = etcdS3.ConfigSecret
// also ignore retention, as it may have been defaulted from the etcd-snapshot-retention flag.
defaultEtcdS3.Retention = etcdS3.Retention

// If config is default, try to load config from secret, and fail if it cannot be retrieved or if the secret name is not set.
// If config is not default, and secret name is set, warn that the secret is being ignored
Expand Down