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

Add parameter for s3 folder

Browse Source
This commit is contained in:
Sebastiaan van Steenis 2019-07-18 18:43:07 +02:00 committed by Alena Prokharchyk
parent 217e1b41b8
commit 2b53fefbee
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/common.go
View File

@ -117,6 +117,7 @@ func setS3OptionsFromCLI(c *cli.Context) *v3.S3BackupConfig {
accessKey := c.String("access-key") accessKey := c.String("access-key")
secretKey := c.String("secret-key") secretKey := c.String("secret-key")
endpointCA := c.String("s3-endpoint-ca") endpointCA := c.String("s3-endpoint-ca")
folder := c.String("folder")
var s3BackupBackend = &v3.S3BackupConfig{} var s3BackupBackend = &v3.S3BackupConfig{}
if len(endpoint) != 0 { if len(endpoint) != 0 {
s3BackupBackend.Endpoint = endpoint s3BackupBackend.Endpoint = endpoint
@ -141,6 +142,9 @@ func setS3OptionsFromCLI(c *cli.Context) *v3.S3BackupConfig {
s3BackupBackend.CustomCA = caStr s3BackupBackend.CustomCA = caStr
} }
} }
if len(folder) != 0 {
s3BackupBackend.Folder = folder
}
return s3BackupBackend return s3BackupBackend
} }

4
cmd/etcd.go
View File

@ -58,6 +58,10 @@ func EtcdCommand() cli.Command {
Name: "region", Name: "region",
Usage: "Specify the s3 bucket location (optional)", Usage: "Specify the s3 bucket location (optional)",
}, },
cli.StringFlag{
Name: "folder",
Usage: "Specify s3 folder name",
},
} }
snapshotFlags = append(snapshotFlags, commonFlags...) snapshotFlags = append(snapshotFlags, commonFlags...)

6
services/etcd.go
View File

@ -381,6 +381,9 @@ func DownloadEtcdSnapshotFromS3(ctx context.Context, etcdHost *hosts.Host, prsMa
caStr := base64.StdEncoding.EncodeToString([]byte(s3Backend.CustomCA)) caStr := base64.StdEncoding.EncodeToString([]byte(s3Backend.CustomCA))
imageCfg.Cmd = append(imageCfg.Cmd, "--s3-endpoint-ca="+caStr) imageCfg.Cmd = append(imageCfg.Cmd, "--s3-endpoint-ca="+caStr)
} }
if s3Backend.Folder != "" {
imageCfg.Cmd = append(imageCfg.Cmd, "--s3-folder="+s3Backend.Folder)
}
hostCfg := &container.HostConfig{ hostCfg := &container.HostConfig{
Binds: []string{ Binds: []string{
fmt.Sprintf("%s:/backup:z", EtcdSnapshotPath), fmt.Sprintf("%s:/backup:z", EtcdSnapshotPath),
@ -571,6 +574,9 @@ func configS3BackupImgCmd(ctx context.Context, imageCfg *container.Config, bc *v
caStr := base64.StdEncoding.EncodeToString([]byte(bc.S3BackupConfig.CustomCA)) caStr := base64.StdEncoding.EncodeToString([]byte(bc.S3BackupConfig.CustomCA))
cmd = append(cmd, "--s3-endpoint-ca="+caStr) cmd = append(cmd, "--s3-endpoint-ca="+caStr)
} }
if bc.S3BackupConfig.Folder != "" {
cmd = append(cmd, "--s3-folder="+bc.S3BackupConfig.Folder)
}
} }
imageCfg.Cmd = append(imageCfg.Cmd, cmd...) imageCfg.Cmd = append(imageCfg.Cmd, cmd...)
return imageCfg return imageCfg