Skip to content

STAC-24122: Settings list job creates all the required resources #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
viliakov merged 2 commits into from
Dec 30, 2025
Merged

STAC-24122: Settings list job creates all the required resources #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d73636
STAC-24122: Settings list job creates all the required resources
viliakov Dec 30, 2025
6c72bf7
STAC-24122: Address linter issuer
viliakov Dec 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cmd/settings/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...")
Expand Down
2 changes: 1 addition & 1 deletion cmd/settings/restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/stackgraph/restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/victoriametrics/restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions internal/orchestration/restore/resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...")

Expand Down