github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add "etcd-" prefix to etcd-snapshot commands as aliases (#4161) (#4171) 

* Add "etcd-" prefix to etcd-snapshot commands as alias

Signed-off-by: dereknola <derek.nola@suse.com>
pull/4201/head
Derek Nola 2021-10-07 12:26:36 -07:00 committed by GitHub
parent 724ef700ba
commit 3ee5098225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/cli/cmds/etcd_snapshot.go
View File

@ -23,57 +23,57 @@ var EtcdSnapshotFlags = []cli.Flag{
Destination: &ServerConfig.DataDir, Destination: &ServerConfig.DataDir,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "name", Name: "name,etcd-snapshot-name",
Usage: "(db) Set the base name of the etcd on-demand snapshot (appended with UNIX timestamp).", Usage: "(db) Set the base name of the etcd on-demand snapshot (appended with UNIX timestamp).",
Destination: &ServerConfig.EtcdSnapshotName, Destination: &ServerConfig.EtcdSnapshotName,
Value: "on-demand", Value: "on-demand",
}, },
&cli.BoolFlag{ &cli.BoolFlag{
Name: "s3", Name: "s3,etcd-s3",
Usage: "(db) Enable backup to S3", Usage: "(db) Enable backup to S3",
Destination: &ServerConfig.EtcdS3, Destination: &ServerConfig.EtcdS3,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "s3-endpoint", Name: "s3-endpoint,etcd-s3-endpoint",
Usage: "(db) S3 endpoint url", Usage: "(db) S3 endpoint url",
Destination: &ServerConfig.EtcdS3Endpoint, Destination: &ServerConfig.EtcdS3Endpoint,
Value: "s3.amazonaws.com", Value: "s3.amazonaws.com",
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "s3-endpoint-ca", Name: "s3-endpoint-ca,etcd-s3-endpoint-ca",
Usage: "(db) S3 custom CA cert to connect to S3 endpoint", Usage: "(db) S3 custom CA cert to connect to S3 endpoint",
Destination: &ServerConfig.EtcdS3EndpointCA, Destination: &ServerConfig.EtcdS3EndpointCA,
}, },
&cli.BoolFlag{ &cli.BoolFlag{
Name: "s3-skip-ssl-verify", Name: "s3-skip-ssl-verify,etcd-s3-skip-ssl-verify",
Usage: "(db) Disables S3 SSL certificate validation", Usage: "(db) Disables S3 SSL certificate validation",
Destination: &ServerConfig.EtcdS3SkipSSLVerify, Destination: &ServerConfig.EtcdS3SkipSSLVerify,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "s3-access-key", Name: "s3-access-key,etcd-s3-access-key",
Usage: "(db) S3 access key", Usage: "(db) S3 access key",
EnvVar: "AWS_ACCESS_KEY_ID", EnvVar: "AWS_ACCESS_KEY_ID",
Destination: &ServerConfig.EtcdS3AccessKey, Destination: &ServerConfig.EtcdS3AccessKey,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "s3-secret-key", Name: "s3-secret-key,etcd-s3-secret-key",
Usage: "(db) S3 secret key", Usage: "(db) S3 secret key",
EnvVar: "AWS_SECRET_ACCESS_KEY", EnvVar: "AWS_SECRET_ACCESS_KEY",
Destination: &ServerConfig.EtcdS3SecretKey, Destination: &ServerConfig.EtcdS3SecretKey,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "s3-bucket", Name: "s3-bucket,etcd-s3-bucket",
Usage: "(db) S3 bucket name", Usage: "(db) S3 bucket name",
Destination: &ServerConfig.EtcdS3BucketName, Destination: &ServerConfig.EtcdS3BucketName,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "s3-region", Name: "s3-region,etcd-s3-region",
Usage: "(db) S3 region / bucket location (optional)", Usage: "(db) S3 region / bucket location (optional)",
Destination: &ServerConfig.EtcdS3Region, Destination: &ServerConfig.EtcdS3Region,
Value: "us-east-1", Value: "us-east-1",
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "s3-folder", Name: "s3-folder,etcd-s3-folder",
Usage: "(db) S3 folder", Usage: "(db) S3 folder",
Destination: &ServerConfig.EtcdS3Folder, Destination: &ServerConfig.EtcdS3Folder,
}, },
@ -88,7 +88,7 @@ func NewEtcdSnapshotCommand(action func(*cli.Context) error, subcommands []cli.C
Action: action, Action: action,
Subcommands: subcommands, Subcommands: subcommands,
Flags: append(EtcdSnapshotFlags, &cli.StringFlag{ Flags: append(EtcdSnapshotFlags, &cli.StringFlag{
Name: "dir", Name: "dir,etcd-snapshot-dir",
Usage: "(db) Directory to save etcd on-demand snapshot. (default: ${data-dir}/db/snapshots)", Usage: "(db) Directory to save etcd on-demand snapshot. (default: ${data-dir}/db/snapshots)",
Destination: &ServerConfig.EtcdSnapshotDir, Destination: &ServerConfig.EtcdSnapshotDir,
}), }),