From bfbe13fa803921aedc6f48c364a8080f7134b716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20S=C4=99k?= <tomasz.sek.88@gmail.com>
Date: Sun, 16 Jun 2019 01:44:30 +0200
Subject: [PATCH] #30 Change Jenkins master pod name

---
 pkg/controller/jenkins/configuration/base/reconcile.go   | 4 ++++
 .../jenkins/configuration/base/resources/pod.go          | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkg/controller/jenkins/configuration/base/reconcile.go b/pkg/controller/jenkins/configuration/base/reconcile.go
index 74ba31e4..e0a20e44 100644
--- a/pkg/controller/jenkins/configuration/base/reconcile.go
+++ b/pkg/controller/jenkins/configuration/base/reconcile.go
@@ -587,6 +587,10 @@ func (r *ReconcileJenkinsBaseConfiguration) detectJenkinsMasterPodStartingIssues
 
 			filteredEvents := r.filterEvents(*events, *jenkinsMasterPod)
 
+			if len(filteredEvents) == 0 {
+				return false, nil
+			}
+
 			r.logger.Info(fmt.Sprintf("Jenkins master pod starting timeout, events '%+v'", filteredEvents))
 			return true, nil
 		}
diff --git a/pkg/controller/jenkins/configuration/base/resources/pod.go b/pkg/controller/jenkins/configuration/base/resources/pod.go
index f1575872..c53df583 100644
--- a/pkg/controller/jenkins/configuration/base/resources/pod.go
+++ b/pkg/controller/jenkins/configuration/base/resources/pod.go
@@ -257,17 +257,24 @@ func newContainers(jenkins *v1alpha2.Jenkins) (containers []corev1.Container) {
 	return
 }
 
+// GetJenkinsMasterPodName returns Jenkins pod name for given CR
+func GetJenkinsMasterPodName(jenkins v1alpha2.Jenkins) string {
+	return fmt.Sprintf("jenkins-%s", jenkins.Name)
+}
+
 // NewJenkinsMasterPod builds Jenkins Master Kubernetes Pod resource
 func NewJenkinsMasterPod(objectMeta metav1.ObjectMeta, jenkins *v1alpha2.Jenkins) *corev1.Pod {
 	runAsUser := jenkinsUserUID
 
+	serviceAccountName := objectMeta.Name
 	objectMeta.Annotations = jenkins.Spec.Master.Annotations
+	objectMeta.Name = GetJenkinsMasterPodName(*jenkins)
 
 	return &corev1.Pod{
 		TypeMeta:   buildPodTypeMeta(),
 		ObjectMeta: objectMeta,
 		Spec: corev1.PodSpec{
-			ServiceAccountName: objectMeta.Name,
+			ServiceAccountName: serviceAccountName,
 			RestartPolicy:      corev1.RestartPolicyNever,
 			SecurityContext: &corev1.PodSecurityContext{
 				RunAsUser:  &runAsUser,