rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-22 16:45:57 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1957 from psliwka/fix-restoring-backups-when-custom-certs-are-used

Browse Source 
Fix restoring backups when custom certs are used
This commit is contained in:
Sebastiaan van Steenis 2020-07-07 11:25:24 +02:00 committed by GitHub
commit e2b5828e5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/etcd.go
View File

@ -65,7 +65,20 @@ func EtcdCommand() cli.Command {
Usage: "Specify s3 folder name", Usage: "Specify s3 folder name",
}, },
} }
snapshotFlags = append(snapshotFlags, commonFlags...)
snapshotSaveFlags := append(snapshotFlags, commonFlags...)
snapshotRestoreFlags := []cli.Flag{
cli.StringFlag{
Name: "cert-dir",
Usage: "Specify a certificate dir path",
},
cli.BoolFlag{
Name: "custom-certs",
Usage: "Use custom certificates from a cert dir",
},
}
snapshotRestoreFlags = append(append(snapshotFlags, snapshotRestoreFlags...), commonFlags...)
return cli.Command{ return cli.Command{
Name: "etcd", Name: "etcd",
@ -74,13 +87,13 @@ func EtcdCommand() cli.Command {
{ {
Name: "snapshot-save", Name: "snapshot-save",
Usage: "Take snapshot on all etcd hosts", Usage: "Take snapshot on all etcd hosts",
Flags: snapshotFlags, Flags: snapshotSaveFlags,
Action: SnapshotSaveEtcdHostsFromCli, Action: SnapshotSaveEtcdHostsFromCli,
}, },
{ {
Name: "snapshot-restore", Name: "snapshot-restore",
Usage: "Restore existing snapshot", Usage: "Restore existing snapshot",
Flags: snapshotFlags, Flags: snapshotRestoreFlags,
Action: RestoreEtcdSnapshotFromCli, Action: RestoreEtcdSnapshotFromCli,
}, },
}, },
@ -275,6 +288,9 @@ func RestoreEtcdSnapshotFromCli(ctx *cli.Context) error {
} }
// setting up the flags // setting up the flags
flags := cluster.GetExternalFlags(false, false, false, "", filePath) flags := cluster.GetExternalFlags(false, false, false, "", filePath)
// Custom certificates and certificate dir flags
flags.CertificateDir = ctx.String("cert-dir")
flags.CustomCerts = ctx.Bool("custom-certs")
_, _, _, _, _, err = RestoreEtcdSnapshot(context.Background(), rkeConfig, hosts.DialersOptions{}, flags, map[string]interface{}{}, etcdSnapshotName) _, _, _, _, _, err = RestoreEtcdSnapshot(context.Background(), rkeConfig, hosts.DialersOptions{}, flags, map[string]interface{}{}, etcdSnapshotName)
return err return err