From fc06cabac81a8fab8ed16e3664c27a4ff053e947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C4=99k?= Date: Tue, 21 Jan 2020 11:19:51 +0100 Subject: [PATCH] #252 Handle Jenkins CR replace gracefully --- pkg/controller/jenkins/configuration/base/reconcile.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/controller/jenkins/configuration/base/reconcile.go b/pkg/controller/jenkins/configuration/base/reconcile.go index c6d71e63..f3f2209d 100644 --- a/pkg/controller/jenkins/configuration/base/reconcile.go +++ b/pkg/controller/jenkins/configuration/base/reconcile.go @@ -839,6 +839,10 @@ func (r *ReconcileJenkinsBaseConfiguration) detectJenkinsMasterPodStartingIssues return false, err } + if r.Configuration.Jenkins.Status.ProvisionStartTime == nil { + return true, nil + } + if jenkinsMasterPod.Status.Phase == corev1.PodPending { timeout := r.Configuration.Jenkins.Status.ProvisionStartTime.Add(time.Minute * 2).UTC() now := time.Now().UTC()