From ad6f9946ccf8160883df4b20ba5e1faa09280132 Mon Sep 17 00:00:00 2001 From: jkhelil Date: Thu, 30 Apr 2020 15:44:31 +0200 Subject: [PATCH] #351 Reconcile yaml user configuration before groovy one --- .../jenkins/configuration/user/reconcile.go | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkg/controller/jenkins/configuration/user/reconcile.go b/pkg/controller/jenkins/configuration/user/reconcile.go index cd688c93..b7155474 100644 --- a/pkg/controller/jenkins/configuration/user/reconcile.go +++ b/pkg/controller/jenkins/configuration/user/reconcile.go @@ -78,9 +78,17 @@ func (r *ReconcileUserConfiguration) ensureSeedJobs() (reconcile.Result, error) } func (r *ReconcileUserConfiguration) ensureUserConfiguration(jenkinsClient jenkinsclient.Jenkins) (reconcile.Result, error) { - groovyClient := groovy.New(jenkinsClient, r.Client, r.logger, r.Configuration.Jenkins, "user-groovy", r.Configuration.Jenkins.Spec.GroovyScripts.Customization) + configurationAsCodeClient := casc.New(jenkinsClient, r.Client, r.logger, r.Configuration.Jenkins) + requeue, err := configurationAsCodeClient.Ensure(r.Configuration.Jenkins) + if err != nil { + return reconcile.Result{}, err + } + if requeue { + return reconcile.Result{Requeue: true}, nil + } - requeue, err := groovyClient.WaitForSecretSynchronization(resources.GroovyScriptsSecretVolumePath) + groovyClient := groovy.New(jenkinsClient, r.Client, r.logger, r.Configuration.Jenkins, "user-groovy", r.Configuration.Jenkins.Spec.GroovyScripts.Customization) + requeue, err = groovyClient.WaitForSecretSynchronization(resources.GroovyScriptsSecretVolumePath) if err != nil { return reconcile.Result{}, err } @@ -97,14 +105,5 @@ func (r *ReconcileUserConfiguration) ensureUserConfiguration(jenkinsClient jenki return reconcile.Result{Requeue: true}, nil } - configurationAsCodeClient := casc.New(jenkinsClient, r.Client, r.logger, r.Configuration.Jenkins) - requeue, err = configurationAsCodeClient.Ensure(r.Configuration.Jenkins) - if err != nil { - return reconcile.Result{}, err - } - if requeue { - return reconcile.Result{Requeue: true}, nil - } - return reconcile.Result{}, nil }