bstein/ananke
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hecate: make etcd-restore dry-run non-fatal

Browse Source
This commit is contained in:
Brad Stein 2026-04-04 20:57:54 -03:00
parent 522df2f6e8
commit 773e0234b8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/cluster/orchestrator.go
View File

@ -248,6 +248,14 @@ func (o *Orchestrator) EtcdRestore(ctx context.Context, opts EtcdRestoreOptions)
if !o.sshManaged(controlPlane) { if !o.sshManaged(controlPlane) {
return fmt.Errorf("cannot restore etcd on %s: node not in ssh_managed_nodes", controlPlane) return fmt.Errorf("cannot restore etcd on %s: node not in ssh_managed_nodes", controlPlane)
} }
snapshotPath := strings.TrimSpace(opts.SnapshotPath)
if o.runner.DryRun {
if snapshotPath == "" {
snapshotPath = "<latest-snapshot-on-" + controlPlane + ">"
}
o.log.Printf("etcd restore target=%s snapshot=%s (dry-run; datastore-mode and snapshot checks skipped)", controlPlane, snapshotPath)
return nil
}
externalDatastore, err := o.controlPlaneUsesExternalDatastore(ctx, controlPlane) externalDatastore, err := o.controlPlaneUsesExternalDatastore(ctx, controlPlane)
if err != nil { if err != nil {
return err return err
@ -256,7 +264,6 @@ func (o *Orchestrator) EtcdRestore(ctx context.Context, opts EtcdRestoreOptions)
return fmt.Errorf("%w: %s uses --datastore-endpoint", ErrEtcdRestoreNotApplicable, controlPlane) return fmt.Errorf("%w: %s uses --datastore-endpoint", ErrEtcdRestoreNotApplicable, controlPlane)
} }
snapshotPath := strings.TrimSpace(opts.SnapshotPath)
if snapshotPath == "" { if snapshotPath == "" {
resolved, err := o.latestEtcdSnapshotPath(ctx, controlPlane) resolved, err := o.latestEtcdSnapshotPath(ctx, controlPlane)
if err != nil { if err != nil {
@ -265,9 +272,6 @@ func (o *Orchestrator) EtcdRestore(ctx context.Context, opts EtcdRestoreOptions)
snapshotPath = resolved snapshotPath = resolved
} }
o.log.Printf("etcd restore target=%s snapshot=%s", controlPlane, snapshotPath) o.log.Printf("etcd restore target=%s snapshot=%s", controlPlane, snapshotPath)
if o.runner.DryRun {
return nil
}
for _, cp := range o.cfg.ControlPlanes { for _, cp := range o.cfg.ControlPlanes {
cp := cp cp := cp