From 322c712a370b564efa3e2ba99ec4c6ac77ceee4f Mon Sep 17 00:00:00 2001 From: Jean-Marc Andre Date: Tue, 21 Mar 2023 13:34:33 +0100 Subject: [PATCH] Preparing RestoreSession init container for OnlineKind restores --- cmd/root.go | 4 +-- session/create.go | 41 ++++++++++++++++++++++ backupsession/create.go => session/init.go | 37 +------------------ 3 files changed, 44 insertions(+), 38 deletions(-) create mode 100644 session/create.go rename backupsession/create.go => session/init.go (51%) diff --git a/cmd/root.go b/cmd/root.go index b3ee38a..92644f7 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -5,8 +5,8 @@ package cmd import ( "fmt" - "github.com/desmo999r/formolcli/backupsession" "github.com/desmo999r/formolcli/controllers" + "github.com/desmo999r/formolcli/session" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" "os" @@ -19,7 +19,7 @@ var createBackupSessionCmd = &cobra.Command{ name, _ := cmd.Flags().GetString("name") namespace, _ := cmd.Flags().GetString("namespace") fmt.Println("create backupsession called") - backupsession.CreateBackupSession(corev1.ObjectReference{ + session.CreateBackupSession(corev1.ObjectReference{ Namespace: namespace, Name: name, }) diff --git a/session/create.go b/session/create.go new file mode 100644 index 0000000..d76a59e --- /dev/null +++ b/session/create.go @@ -0,0 +1,41 @@ +package session + +import ( + formolv1alpha1 "github.com/desmo999r/formol/api/v1alpha1" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "os" + "strconv" + "strings" + "time" +) + +func CreateBackupSession(ref corev1.ObjectReference) { + log := logger.WithName("CreateBackupSession") + log.V(0).Info("CreateBackupSession called") + backupConf := formolv1alpha1.BackupConfiguration{} + if err := cl.Get(ctx, types.NamespacedName{ + Namespace: ref.Namespace, + Name: ref.Name, + }, &backupConf); err != nil { + log.Error(err, "unable to get backupconf") + os.Exit(1) + } + log.V(0).Info("got backupConf", "backupConf", backupConf) + + backupSession := &formolv1alpha1.BackupSession{ + ObjectMeta: metav1.ObjectMeta{ + Name: strings.Join([]string{"backupsession", ref.Name, strconv.FormatInt(time.Now().Unix(), 10)}, "-"), + Namespace: ref.Namespace, + }, + Spec: formolv1alpha1.BackupSessionSpec{ + Ref: ref, + }, + } + log.V(1).Info("create backupsession", "backupSession", backupSession) + if err := cl.Create(ctx, backupSession); err != nil { + log.Error(err, "unable to create backupsession") + os.Exit(1) + } +} diff --git a/backupsession/create.go b/session/init.go similarity index 51% rename from backupsession/create.go rename to session/init.go index 713e97e..9dbda44 100644 --- a/backupsession/create.go +++ b/session/init.go @@ -1,13 +1,10 @@ -package backupsession +package session import ( "context" formolv1alpha1 "github.com/desmo999r/formol/api/v1alpha1" "github.com/go-logr/logr" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/types" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" @@ -16,9 +13,6 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "strconv" - "strings" - "time" ) var ( @@ -51,32 +45,3 @@ func init() { os.Exit(1) } } - -func CreateBackupSession(ref corev1.ObjectReference) { - log := logger.WithName("CreateBackupSession") - log.V(0).Info("CreateBackupSession called") - backupConf := formolv1alpha1.BackupConfiguration{} - if err := cl.Get(ctx, types.NamespacedName{ - Namespace: ref.Namespace, - Name: ref.Name, - }, &backupConf); err != nil { - log.Error(err, "unable to get backupconf") - os.Exit(1) - } - log.V(0).Info("got backupConf", "backupConf", backupConf) - - backupSession := &formolv1alpha1.BackupSession{ - ObjectMeta: metav1.ObjectMeta{ - Name: strings.Join([]string{"backupsession", ref.Name, strconv.FormatInt(time.Now().Unix(), 10)}, "-"), - Namespace: ref.Namespace, - }, - Spec: formolv1alpha1.BackupSessionSpec{ - Ref: ref, - }, - } - log.V(1).Info("create backupsession", "backupSession", backupSession) - if err := cl.Create(ctx, backupSession); err != nil { - log.Error(err, "unable to create backupsession") - os.Exit(1) - } -}