ETCD-636: add automated backup sidecar #1287
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| apiVersion: config.openshift.io/v1alpha1 | ||
| kind: Backup | ||
| metadata: | ||
| name: default | ||
| annotations: | ||
| default: "true" | ||
| spec: | ||
| etcd: | ||
| schedule: "20 4 * * *" | ||
| timeZone: "UTC" | ||
| retentionPolicy: | ||
| retentionType: RetentionNumber | ||
| retentionNumber: | ||
| maxNumberOfBackups: 5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| package backuprestore | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "io" | ||
|
|
||
| "k8s.io/klog/v2" | ||
|
|
||
| "github.com/adhocore/gronx/pkg/tasker" | ||
| "github.com/spf13/cobra" | ||
| "github.com/spf13/pflag" | ||
| ) | ||
|
|
||
| type backupNoConfig struct { | ||
| schedule string | ||
| timeZone string | ||
| scheduler *tasker.Tasker | ||
| backupOptions | ||
| } | ||
|
|
||
| func NewBackupNoConfigCommand(errOut io.Writer) *cobra.Command { | ||
| backupNoConf := &backupNoConfig{ | ||
| backupOptions: backupOptions{errOut: errOut}, | ||
| } | ||
|
|
||
| cmd := &cobra.Command{ | ||
| Use: "backup-server", | ||
| Short: "Backs up a snapshot of etcd database and static pod resources without config", | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
| must := func(fn func() error) { | ||
| if err := fn(); err != nil { | ||
| if cmd.HasParent() { | ||
| klog.Fatal(err) | ||
| } | ||
| fmt.Fprint(backupNoConf.errOut, err.Error()) | ||
| } | ||
| } | ||
|
|
||
| must(backupNoConf.Validate) | ||
| must(backupNoConf.Run) | ||
| }, | ||
| } | ||
| backupNoConf.AddFlags(cmd.Flags()) | ||
| return cmd | ||
| } | ||
|
|
||
| func (b *backupNoConfig) AddFlags(fs *pflag.FlagSet) { | ||
| fs.StringVar(&b.schedule, "schedule", "", "schedule specifies the cron schedule to run the backup") | ||
| fs.StringVar(&b.timeZone, "timezone", "", "timezone specifies the timezone of the cron schedule to run the backup") | ||
|
|
||
| b.backupOptions.AddFlags(fs) | ||
| } | ||
|
|
||
| func (b *backupNoConfig) Validate() error { | ||
| return b.backupOptions.Validate() | ||
| } | ||
|
|
||
| func (b *backupNoConfig) Run() error { | ||
|
There was a problem hiding this comment. You don't need to use this scheduler here, but rather you want to just write a simple controller, similar in concept to https://github.com/kubernetes/kubernetes/blob/master/pkg/controller/cronjob/cronjob_controllerv2.go. The main bits are:
|
||
| b.scheduler = tasker.New(tasker.Option{ | ||
| Verbose: true, | ||
| Tz: b.timeZone, | ||
| }) | ||
|
|
||
| err := b.scheduleBackup() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| doneCh := make(chan struct{}) | ||
| go func() { | ||
| b.scheduler.Run() | ||
| doneCh <- struct{}{} | ||
| }() | ||
|
|
||
| <-doneCh | ||
| return nil | ||
| } | ||
|
|
||
| func (b *backupNoConfig) scheduleBackup() error { | ||
| var err error | ||
| b.scheduler.Task(b.schedule, func(ctx context.Context) (int, error) { | ||
| err = backup(&b.backupOptions) | ||
| return 0, err | ||
| }, false) | ||
|
|
||
| return err | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still have to review to this later and see if all of this aligns with what's outlined in the enhancement, but manifest changes related to this feature like this need to be feature gated and can't be in GA by default.