public_git/kubernetes-operator
1
0
Fork 0
mirror of https://github.com/jenkinsci/kubernetes-operator.git synced 2026-09-30 05:01:10 +02:00
Code Issues Releases Wiki Activity

feat: attempt to move restore before seed job creation (#844)

Browse Source
This commit is contained in:
Luigi Operoso
2023-06-04 13:35:14 +02:00
committed by GitHub
parent 00bb04745b
commit d9ea2ee83b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/configuration/user/reconcile.go
+4 -4
View File
@@ -56,6 +56,10 @@ func (r *reconcileUserConfiguration) ReconcileCasc() (reconcile.Result, error) {
func (r *reconcileUserConfiguration) ReconcileOthers() (reconcile.Result, error) { func (r *reconcileUserConfiguration) ReconcileOthers() (reconcile.Result, error) {
backupAndRestore := backuprestore.New(r.Configuration, r.logger) backupAndRestore := backuprestore.New(r.Configuration, r.logger)
if err := backupAndRestore.Restore(r.jenkinsClient); err != nil {
return reconcile.Result{}, err
}
result, err := r.ensureSeedJobs() result, err := r.ensureSeedJobs()
if err != nil { if err != nil {
return reconcile.Result{}, err return reconcile.Result{}, err
@@ -64,10 +68,6 @@ func (r *reconcileUserConfiguration) ReconcileOthers() (reconcile.Result, error)
return result, nil return result, nil
} }
if err := backupAndRestore.Restore(r.jenkinsClient); err != nil {
return reconcile.Result{}, err
}
if err := backupAndRestore.Backup(false); err != nil { if err := backupAndRestore.Backup(false); err != nil {
return reconcile.Result{}, err return reconcile.Result{}, err
} }