rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-12 04:03:01 +00:00
Code Issues Releases Wiki Activity

Add BackupConfig Enabled flag

Browse Source
This commit is contained in:
moelsayed 2019-03-08 06:05:38 +02:00 committed by Alena Prokharchyk
parent efab83d804
commit 1e34a7c5fa
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/defaults.go
View File

@ -11,7 +11,7 @@ import (
"github.com/rancher/rke/log" "github.com/rancher/rke/log"
"github.com/rancher/rke/services" "github.com/rancher/rke/services"
"github.com/rancher/rke/templates" "github.com/rancher/rke/templates"
"github.com/rancher/types/apis/management.cattle.io/v3" v3 "github.com/rancher/types/apis/management.cattle.io/v3"
) )
const ( const (
@ -201,7 +201,7 @@ func (c *Cluster) setClusterServicesDefaults() {
c.Services.Etcd.ExtraArgs[DefaultEtcdHeartbeatIntervalName] = DefaultEtcdHeartbeatIntervalValue c.Services.Etcd.ExtraArgs[DefaultEtcdHeartbeatIntervalName] = DefaultEtcdHeartbeatIntervalValue
} }
if c.Services.Etcd.BackupConfig != nil { if c.Services.Etcd.BackupConfig != nil && c.Services.Etcd.BackupConfig.Enabled != nil && *c.Services.Etcd.BackupConfig.Enabled {
if c.Services.Etcd.BackupConfig.IntervalHours == 0 { if c.Services.Etcd.BackupConfig.IntervalHours == 0 {
c.Services.Etcd.BackupConfig.IntervalHours = DefaultEtcdBackupConfigIntervalHours c.Services.Etcd.BackupConfig.IntervalHours = DefaultEtcdBackupConfigIntervalHours
} }

6
cluster/etcd.go
View File

@ -59,7 +59,7 @@ func (c *Cluster) PrepareBackup(ctx context.Context, snapshotPath string) error
if !util.IsRancherBackupSupported(c.SystemImages.Alpine) { if !util.IsRancherBackupSupported(c.SystemImages.Alpine) {
log.Warnf(ctx, "Auto local backup sync is not supported in `%s`. Using `%s` instead.", c.SystemImages.Alpine, backupImage) log.Warnf(ctx, "Auto local backup sync is not supported in `%s`. Using `%s` instead.", c.SystemImages.Alpine, backupImage)
} }
if c.Services.Etcd.BackupConfig == nil || // legacy rke local backup if c.Services.Etcd.BackupConfig == nil || (c.Services.Etcd.BackupConfig.Enabled != nil && !*c.Services.Etcd.BackupConfig.Enabled) || // legacy rke local backup
(c.Services.Etcd.BackupConfig != nil && c.Services.Etcd.BackupConfig.S3BackupConfig == nil) { // rancher local backup, no s3 (c.Services.Etcd.BackupConfig != nil && c.Services.Etcd.BackupConfig.S3BackupConfig == nil) { // rancher local backup, no s3
// stop etcd on all etcd nodes, we need this because we start the backup server on the same port // stop etcd on all etcd nodes, we need this because we start the backup server on the same port
for _, host := range c.EtcdHosts { for _, host := range c.EtcdHosts {
@ -101,7 +101,9 @@ func (c *Cluster) PrepareBackup(ctx context.Context, snapshotPath string) error
} }
// s3 backup case // s3 backup case
if c.Services.Etcd.BackupConfig != nil && c.Services.Etcd.BackupConfig.S3BackupConfig != nil { if c.Services.Etcd.BackupConfig != nil &&
c.Services.Etcd.BackupConfig.Enabled != nil && *c.Services.Etcd.BackupConfig.Enabled &&
c.Services.Etcd.BackupConfig.S3BackupConfig != nil {
for _, host := range c.EtcdHosts { for _, host := range c.EtcdHosts {
if err := services.DownloadEtcdSnapshotFromS3(ctx, host, c.PrivateRegistriesMap, backupImage, snapshotPath, c.Services.Etcd); err != nil { if err := services.DownloadEtcdSnapshotFromS3(ctx, host, c.PrivateRegistriesMap, backupImage, snapshotPath, c.Services.Etcd); err != nil {
return err return err

5
cluster/validation.go
View File

@ -8,7 +8,7 @@ import (
"github.com/rancher/rke/log" "github.com/rancher/rke/log"
"github.com/rancher/rke/services" "github.com/rancher/rke/services"
"github.com/rancher/rke/util" "github.com/rancher/rke/util"
"github.com/rancher/types/apis/management.cattle.io/v3" v3 "github.com/rancher/types/apis/management.cattle.io/v3"
"k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation"
) )
@ -139,7 +139,8 @@ func validateServicesOptions(c *Cluster) error {
} }
func validateEtcdBackupOptions(c *Cluster) error { func validateEtcdBackupOptions(c *Cluster) error {
if c.Services.Etcd.BackupConfig != nil { if c.Services.Etcd.BackupConfig != nil &&
c.Services.Etcd.BackupConfig.Enabled != nil && *c.Services.Etcd.BackupConfig.Enabled {
if c.Services.Etcd.BackupConfig.S3BackupConfig != nil { if c.Services.Etcd.BackupConfig.S3BackupConfig != nil {
if len(c.Services.Etcd.BackupConfig.S3BackupConfig.Endpoint) == 0 { if len(c.Services.Etcd.BackupConfig.S3BackupConfig.Endpoint) == 0 {
return fmt.Errorf("etcd s3 backup backend endpoint can't be empty") return fmt.Errorf("etcd s3 backup backend endpoint can't be empty")

2
cmd/common.go
View File

@ -10,7 +10,7 @@ import (
"github.com/rancher/rke/cluster" "github.com/rancher/rke/cluster"
"github.com/rancher/rke/hosts" "github.com/rancher/rke/hosts"
"github.com/rancher/rke/log" "github.com/rancher/rke/log"
"github.com/rancher/types/apis/management.cattle.io/v3" v3 "github.com/rancher/types/apis/management.cattle.io/v3"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
services/etcd.go
View File

@ -293,7 +293,7 @@ func RunEtcdSnapshotSave(ctx context.Context, etcdHost *hosts.Host, prsMap map[s
imageCfg.Cmd = append(imageCfg.Cmd, "--creation="+es.Creation) imageCfg.Cmd = append(imageCfg.Cmd, "--creation="+es.Creation)
} }
if es.BackupConfig != nil { if es.BackupConfig != nil && es.BackupConfig.Enabled != nil && *es.BackupConfig.Enabled {
imageCfg = configS3BackupImgCmd(ctx, imageCfg, es.BackupConfig) imageCfg = configS3BackupImgCmd(ctx, imageCfg, es.BackupConfig)
} }
hostCfg := &container.HostConfig{ hostCfg := &container.HostConfig{