From c7841d9fc36fcb4e25eb0c46244f665d04642be2 Mon Sep 17 00:00:00 2001
From: Jakub Al-Khalili <jakubalkhalili@gmail.com>
Date: Tue, 29 Oct 2019 09:42:06 +0100
Subject: [PATCH] Refactor configuration in jenkins_controller.go

---
 pkg/controller/jenkins/jenkins_controller.go | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkg/controller/jenkins/jenkins_controller.go b/pkg/controller/jenkins/jenkins_controller.go
index 41015067..5a2fcad7 100644
--- a/pkg/controller/jenkins/jenkins_controller.go
+++ b/pkg/controller/jenkins/jenkins_controller.go
@@ -3,11 +3,11 @@ package jenkins
 import (
 	"context"
 	"fmt"
-	"github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration"
 	"reflect"
 
 	"github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2"
 	jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client"
+	"github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration"
 	"github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base"
 	"github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources"
 	"github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/user"
@@ -202,13 +202,16 @@ func (r *ReconcileJenkins) reconcile(request reconcile.Request, logger logr.Logg
 	if err != nil {
 		return reconcile.Result{}, jenkins, err
 	}
-	// Reconcile base configuration
-	baseConfiguration := base.New(configuration.Configuration{
+
+	config := configuration.Configuration{
 		Client:        r.client,
 		ClientSet:     r.clientSet,
 		Notifications: r.notificationEvents,
 		Jenkins:       jenkins,
-	}, r.scheme, logger, r.local, r.minikube, &r.config)
+	}
+
+	// Reconcile base configuration
+	baseConfiguration := base.New(config, r.scheme, logger, r.local, r.minikube, &r.config)
 
 	messages, err := baseConfiguration.Validate(jenkins)
 	if err != nil {
@@ -261,12 +264,7 @@ func (r *ReconcileJenkins) reconcile(request reconcile.Request, logger logr.Logg
 		logger.Info(message)
 	}
 	// Reconcile user configuration
-	userConfiguration := user.New(configuration.Configuration{
-		Client:        r.client,
-		ClientSet:     r.clientSet,
-		Notifications: r.notificationEvents,
-		Jenkins:       jenkins,
-	}, jenkinsClient, logger, r.config)
+	userConfiguration := user.New(config, jenkinsClient, logger, r.config)
 
 	messages, err = userConfiguration.Validate(jenkins)
 	if err != nil {