Add Readiness and Liveness probes

pkg/controller/jenkins/configuration/base/reconcile.go

@@ -407,6 +407,18 @@ func (r *ReconcileJenkinsBaseConfiguration) isRecreatePodNeeded(currentJenkinsMa
 		return true
 	}
 
+	if !reflect.DeepEqual(r.jenkins.Spec.Master.ReadinessProbe, currentJenkinsMasterPod.Spec.Containers[0].ReadinessProbe) {
+		r.logger.Info(fmt.Sprintf("Jenkins pod readinessProbe have changed, actual '%+v' required '%+v' - recreating pod",
+			currentJenkinsMasterPod.Spec.Containers[0].ReadinessProbe, r.jenkins.Spec.Master.ReadinessProbe))
+		return true
+	}
+
+	if !reflect.DeepEqual(r.jenkins.Spec.Master.LivenessProbe, currentJenkinsMasterPod.Spec.Containers[0].LivenessProbe) {
+		r.logger.Info(fmt.Sprintf("Jenkins pod livenessProbe have changed, actual '%+v' required '%+v' - recreating pod",
+			currentJenkinsMasterPod.Spec.Containers[0].LivenessProbe, r.jenkins.Spec.Master.LivenessProbe))
+		return true
+	}
+
 	if !reflect.DeepEqual(r.jenkins.Spec.Master.NodeSelector, currentJenkinsMasterPod.Spec.NodeSelector) {
 		r.logger.Info(fmt.Sprintf("Jenkins pod node selector has changed, actual '%+v' required '%+v' - recreating pod",
 			currentJenkinsMasterPod.Spec.NodeSelector, r.jenkins.Spec.Master.NodeSelector))

pkg/controller/jenkins/configuration/base/resources/pod.go

@@ -8,7 +8,6 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
 const (
@@ -75,9 +74,6 @@ func GetJenkinsMasterPodBaseEnvs() []corev1.EnvVar {
 
 // NewJenkinsMasterPod builds Jenkins Master Kubernetes Pod resource
 func NewJenkinsMasterPod(objectMeta metav1.ObjectMeta, jenkins *v1alpha1.Jenkins) *corev1.Pod {
-	initialDelaySeconds := int32(30)
-	timeoutSeconds := int32(5)
-	failureThreshold := int32(12)
 	runAsUser := jenkinsUserUID
 
 	objectMeta.Annotations = jenkins.Spec.Master.Annotations
@@ -104,28 +100,8 @@ func NewJenkinsMasterPod(objectMeta metav1.ObjectMeta, jenkins *v1alpha1.Jenkins
 						"bash",
 						fmt.Sprintf("%s/%s", jenkinsScriptsVolumePath, initScriptName),
 					},
-					LivenessProbe: &corev1.Probe{
-						Handler: corev1.Handler{
-							HTTPGet: &corev1.HTTPGetAction{
-								Path:   "/login",
-								Port:   intstr.FromString(httpPortName),
-								Scheme: corev1.URISchemeHTTP,
-							},
-						},
-						InitialDelaySeconds: initialDelaySeconds,
-						TimeoutSeconds:      timeoutSeconds,
-						FailureThreshold:    failureThreshold,
-					},
-					ReadinessProbe: &corev1.Probe{
-						Handler: corev1.Handler{
-							HTTPGet: &corev1.HTTPGetAction{
-								Path:   "/login",
-								Port:   intstr.FromString(httpPortName),
-								Scheme: corev1.URISchemeHTTP,
-							},
-						},
-						InitialDelaySeconds: initialDelaySeconds,
-					},
+					LivenessProbe:  jenkins.Spec.Master.LivenessProbe,
+					ReadinessProbe: jenkins.Spec.Master.ReadinessProbe,
 					Ports: []corev1.ContainerPort{
 						{
 							Name:          httpPortName,

pkg/controller/jenkins/jenkins_controller.go

@@ -3,6 +3,7 @@ package jenkins
 import (
 	"context"
 	"fmt"
+	"k8s.io/apimachinery/pkg/util/intstr"
 	"reflect"
 
 	"github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1"
@@ -136,7 +137,6 @@ func (r *ReconcileJenkins) reconcile(request reconcile.Request, logger logr.Logg
 		// Error reading the object - requeue the request.
 		return reconcile.Result{}, errors.WithStack(err)
 	}
-
 	err = r.setDefaults(jenkins, logger)
 	if err != nil {
 		return reconcile.Result{}, err
@@ -227,6 +227,36 @@ func (r *ReconcileJenkins) setDefaults(jenkins *v1alpha1.Jenkins, logger logr.Lo
 		changed = true
 		jenkins.Spec.Master.ImagePullPolicy = corev1.PullAlways
 	}
+	if jenkins.Spec.Master.ReadinessProbe == nil {
+		logger.Info("Setting default Jenkins readinessProbe")
+		changed = true
+		jenkins.Spec.Master.ReadinessProbe = &corev1.Probe{
+			Handler: corev1.Handler{
+				HTTPGet: &corev1.HTTPGetAction{
+					Path:   "/login",
+					Port:   intstr.FromString("http"),
+					Scheme: corev1.URISchemeHTTP,
+				},
+			},
+			InitialDelaySeconds: int32(30),
+		}
+	}
+	if jenkins.Spec.Master.LivenessProbe == nil {
+		logger.Info("Setting default Jenkins livenessProbe")
+		changed = true
+		jenkins.Spec.Master.LivenessProbe = &corev1.Probe{
+			Handler: corev1.Handler{
+				HTTPGet: &corev1.HTTPGetAction{
+					Path:   "/login",
+					Port:   intstr.FromString("http"),
+					Scheme: corev1.URISchemeHTTP,
+				},
+			},
+			InitialDelaySeconds: int32(30),
+			TimeoutSeconds:      int32(5),
+			FailureThreshold:    int32(12),
+		}
+	}
 	if len(jenkins.Spec.Master.OperatorPlugins) == 0 {
 		logger.Info("Setting default operator plugins")
 		changed = true