From ec0287c3b2c070e152776fa3af7996cfe0713cd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20S=C4=99k?= <tomasz.sek.88@gmail.com>
Date: Fri, 11 Jan 2019 13:51:16 +0100
Subject: [PATCH] Small fixes

---
 .../jenkins/configuration/base/reconcile.go      |  4 ++--
 .../configuration/user/seedjobs/seedjobs.go      | 16 ++++++++--------
 pkg/controller/jenkins/handler.go                |  2 +-
 pkg/controller/jenkins/jenkins_controller.go     |  9 +++------
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkg/controller/jenkins/configuration/base/reconcile.go b/pkg/controller/jenkins/configuration/base/reconcile.go
index c7af77dd..a134dcc1 100644
--- a/pkg/controller/jenkins/configuration/base/reconcile.go
+++ b/pkg/controller/jenkins/configuration/base/reconcile.go
@@ -232,8 +232,8 @@ func (r *ReconcileJenkinsBaseConfiguration) createUserConfigurationConfigMap(met
 
 func (r *ReconcileJenkinsBaseConfiguration) createRBAC(meta metav1.ObjectMeta) error {
 	serviceAccount := resources.NewServiceAccount(meta)
-	err := r.createOrUpdateResource(serviceAccount)
-	if err != nil {
+	err := r.createResource(serviceAccount)
+	if err != nil && !errors.IsAlreadyExists(err) {
 		return err
 	}
 
diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go
index 6adbe87c..332ce734 100644
--- a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go
+++ b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go
@@ -20,7 +20,7 @@ import (
 
 const (
 	// ConfigureSeedJobsName this is the fixed seed job name
-	ConfigureSeedJobsName = "Configure Seed Jobs"
+	ConfigureSeedJobsName = constants.OperatorName + "-configure-seed-job"
 
 	deployKeyIDParameterName      = "DEPLOY_KEY_ID"
 	privateKeyParameterName       = "PRIVATE_KEY"
@@ -128,42 +128,42 @@ func (s *SeedJobs) privateKeyFromSecret(namespace string, seedJob virtuslabv1alp
 var seedJobConfigXML = `
 <flow-definition plugin="workflow-job@2.30">
   <actions/>
-  <description></description>
+  <description>Configure Seed Jobs</description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
-          <name>DEPLOY_KEY_ID</name>
+          <name>` + deployKeyIDParameterName + `</name>
           <description></description>
           <defaultValue></defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
-          <name>PRIVATE_KEY</name>
+          <name>` + privateKeyParameterName + `</name>
           <description></description>
           <defaultValue></defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
-          <name>REPOSITORY_URL</name>
+          <name>` + repositoryURLParameterName + `</name>
           <description></description>
           <defaultValue></defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
-          <name>REPOSITORY_BRANCH</name>
+          <name>` + repositoryBranchParameterName + `</name>
           <description></description>
           <defaultValue>master</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
-          <name>SEED_JOB_DISPLAY_NAME</name>
+          <name>` + displayNameParameterName + `</name>
           <description></description>
           <defaultValue></defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
-          <name>TARGETS</name>
+          <name>` + targetsParameterName + `</name>
           <description></description>
           <defaultValue>cicd/jobs/*.jenkins</defaultValue>
           <trim>false</trim>
diff --git a/pkg/controller/jenkins/handler.go b/pkg/controller/jenkins/handler.go
index 1f655f19..5b52de5e 100644
--- a/pkg/controller/jenkins/handler.go
+++ b/pkg/controller/jenkins/handler.go
@@ -15,7 +15,7 @@ type enqueueRequestForJenkins struct{}
 
 func (e *enqueueRequestForJenkins) Create(evt event.CreateEvent, q workqueue.RateLimitingInterface) {
 	if req := e.getOwnerReconcileRequests(evt.Meta); req != nil {
-		q.Add(req)
+		q.Add(*req)
 	}
 }
 
diff --git a/pkg/controller/jenkins/jenkins_controller.go b/pkg/controller/jenkins/jenkins_controller.go
index 352571fb..1cdd9440 100644
--- a/pkg/controller/jenkins/jenkins_controller.go
+++ b/pkg/controller/jenkins/jenkins_controller.go
@@ -2,7 +2,6 @@ package jenkins
 
 import (
 	"context"
-	"fmt"
 
 	virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1"
 	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/base"
@@ -91,11 +90,9 @@ func (r *ReconcileJenkins) Reconcile(request reconcile.Request) (reconcile.Resul
 	logger.Info("Reconciling Jenkins")
 
 	result, err := r.reconcile(request, logger)
-	if err != nil {
-		if errors.IsConflict(err) {
-			logger.V(log.VWarn).Info(fmt.Sprintf("The %s object has been modified, requeue reconciliation loop", request.Name))
-			return reconcile.Result{Requeue: true}, nil
-		}
+	if err != nil && errors.IsConflict(err) {
+		logger.V(log.VWarn).Info(err.Error())
+		return reconcile.Result{Requeue: true}, nil
 	}
 	return result, err
 }