diff --git a/cmd/settings/list.go b/cmd/settings/list.go index a6ccd1c..e8505d7 100644 --- a/cmd/settings/list.go +++ b/cmd/settings/list.go @@ -160,6 +160,12 @@ func getBackupListFromS3(appCtx *app.Context) ([]BackupFileInfo, error) { } func getBackupListFromPVC(appCtx *app.Context) ([]BackupFileInfo, error) { + // Setup Kubernetes resources for list job + appCtx.Logger.Println() + if err := restore.EnsureResources(appCtx.K8sClient, appCtx.Namespace, appCtx.Config, appCtx.Logger); err != nil { + return nil, err + } + // Create list job appCtx.Logger.Println() appCtx.Logger.Infof("Creating job to list Settings backups stored on PVC...") diff --git a/cmd/settings/restore.go b/cmd/settings/restore.go index 68131a2..7442bac 100644 --- a/cmd/settings/restore.go +++ b/cmd/settings/restore.go @@ -98,7 +98,7 @@ func runRestore(appCtx *app.Context) error { // Setup Kubernetes resources for restore job appCtx.Logger.Println() - if err := restore.EnsureRestoreResources(appCtx.K8sClient, appCtx.Namespace, appCtx.Config, appCtx.Logger); err != nil { + if err := restore.EnsureResources(appCtx.K8sClient, appCtx.Namespace, appCtx.Config, appCtx.Logger); err != nil { return err } diff --git a/cmd/stackgraph/restore.go b/cmd/stackgraph/restore.go index d6036f4..cbf2d17 100644 --- a/cmd/stackgraph/restore.go +++ b/cmd/stackgraph/restore.go @@ -104,7 +104,7 @@ func runRestore(appCtx *app.Context) error { // Setup Kubernetes resources for restore job appCtx.Logger.Println() - if err := restore.EnsureRestoreResources(appCtx.K8sClient, appCtx.Namespace, appCtx.Config, appCtx.Logger); err != nil { + if err := restore.EnsureResources(appCtx.K8sClient, appCtx.Namespace, appCtx.Config, appCtx.Logger); err != nil { return err } diff --git a/cmd/victoriametrics/restore.go b/cmd/victoriametrics/restore.go index 725be16..4a7ecae 100644 --- a/cmd/victoriametrics/restore.go +++ b/cmd/victoriametrics/restore.go @@ -102,7 +102,7 @@ func runRestore(appCtx *app.Context) error { // Setup Kubernetes resources for restore job appCtx.Logger.Println() - if err := restore.EnsureRestoreResources(appCtx.K8sClient, appCtx.Namespace, appCtx.Config, appCtx.Logger); err != nil { + if err := restore.EnsureResources(appCtx.K8sClient, appCtx.Namespace, appCtx.Config, appCtx.Logger); err != nil { return err } diff --git a/internal/orchestration/restore/resources.go b/internal/orchestration/restore/resources.go index 74f56a5..d5128c4 100644 --- a/internal/orchestration/restore/resources.go +++ b/internal/orchestration/restore/resources.go @@ -16,8 +16,8 @@ const ( RestoreScriptsConfigMap = "suse-observability-backup-cli-restore-scripts" ) -// EnsureRestoreResources ensures that required Kubernetes resources exist for the restore job -func EnsureRestoreResources(k8sClient *k8s.Client, namespace string, config *config.Config, log *logger.Logger) error { +// EnsureResources ensures that required Kubernetes resources exist for the restore job +func EnsureResources(k8sClient *k8s.Client, namespace string, config *config.Config, log *logger.Logger) error { // Ensure backup scripts ConfigMap exists log.Infof("Ensuring backup scripts ConfigMap exists...")