|
|
@ -23,62 +23,62 @@ 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, |
|
|
|
}, |
|
|
|
}, |
|
|
|
&cli.BoolFlag{ |
|
|
|
&cli.BoolFlag{ |
|
|
|
Name: "s3-insecure", |
|
|
|
Name: "s3-insecure,etcd-s3-insecure", |
|
|
|
Usage: "(db) Disables S3 over HTTPS", |
|
|
|
Usage: "(db) Disables S3 over HTTPS", |
|
|
|
Destination: &ServerConfig.EtcdS3Insecure, |
|
|
|
Destination: &ServerConfig.EtcdS3Insecure, |
|
|
|
}, |
|
|
|
}, |
|
|
@ -93,7 +93,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, |
|
|
|
}), |
|
|
|
}), |
|
|
|