From 9d7363636a6ebace1f580c2719abf42cc2f96ccc Mon Sep 17 00:00:00 2001 From: Vladimir Iliakov Date: Tue, 30 Dec 2025 13:25:11 +0100 Subject: [PATCH 1/2] STAC-24122: Settings list job creates all the required resources --- cmd/settings/list.go | 7 +++++++ cmd/settings/restore.go | 2 +- cmd/stackgraph/restore.go | 2 +- cmd/victoriametrics/restore.go | 2 +- internal/orchestration/restore/resources.go | 4 ++-- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/cmd/settings/list.go b/cmd/settings/list.go index a6ccd1c..1010212 100644 --- a/cmd/settings/list.go +++ b/cmd/settings/list.go @@ -160,6 +160,13 @@ 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...") From 6c72bf7e76455c279c34199afcb4d4e869cd72d8 Mon Sep 17 00:00:00 2001 From: Vladimir Iliakov Date: Tue, 30 Dec 2025 13:59:56 +0100 Subject: [PATCH 2/2] STAC-24122: Address linter issuer --- cmd/settings/list.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/settings/list.go b/cmd/settings/list.go index 1010212..e8505d7 100644 --- a/cmd/settings/list.go +++ b/cmd/settings/list.go @@ -160,7 +160,6 @@ 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 {