public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactor configuration in jenkins_controller.go

This commit is contained in:
Jakub Al-Khalili 2019-10-29 09:42:06 +01:00
parent c249288a2d
commit c7841d9fc3
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/controller/jenkins/jenkins_controller.go
View File

@ -3,11 +3,11 @@ package jenkins
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration"
"reflect" "reflect"
"github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2"
jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" 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"
"github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources"
"github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/user" "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 { if err != nil {
return reconcile.Result{}, jenkins, err return reconcile.Result{}, jenkins, err
} }
// Reconcile base configuration
baseConfiguration := base.New(configuration.Configuration{ config := configuration.Configuration{
Client: r.client, Client: r.client,
ClientSet: r.clientSet, ClientSet: r.clientSet,
Notifications: r.notificationEvents, Notifications: r.notificationEvents,
Jenkins: jenkins, 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) messages, err := baseConfiguration.Validate(jenkins)
if err != nil { if err != nil {
@ -261,12 +264,7 @@ func (r *ReconcileJenkins) reconcile(request reconcile.Request, logger logr.Logg
logger.Info(message) logger.Info(message)
} }
// Reconcile user configuration // Reconcile user configuration
userConfiguration := user.New(configuration.Configuration{ userConfiguration := user.New(config, jenkinsClient, logger, r.config)
Client: r.client,
ClientSet: r.clientSet,
Notifications: r.notificationEvents,
Jenkins: jenkins,
}, jenkinsClient, logger, r.config)
messages, err = userConfiguration.Validate(jenkins) messages, err = userConfiguration.Validate(jenkins)
if err != nil { if err != nil {