From 704834dfac51489d021c6a1b7e3c2f7789af4730 Mon Sep 17 00:00:00 2001
From: Pete Savage <psavage@redhat.com>
Date: Thu, 13 Jan 2022 15:29:08 +0000
Subject: [PATCH] Fix deployment probes

---
 .../providers/deployment/impl.go              | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/controllers/cloud.redhat.com/providers/deployment/impl.go b/controllers/cloud.redhat.com/providers/deployment/impl.go
index c8f4963aa..6d5c23e87 100644
--- a/controllers/cloud.redhat.com/providers/deployment/impl.go
+++ b/controllers/cloud.redhat.com/providers/deployment/impl.go
@@ -107,42 +107,42 @@ func initDeployment(app *crd.ClowdApp, env *crd.ClowdEnvironment, d *apps.Deploy
 	}
 	if pod.LivenessProbe != nil {
 		livenessProbe = *pod.LivenessProbe
+
+		if livenessProbe.SuccessThreshold == 0 {
+			livenessProbe.SuccessThreshold = 1
+		}
+		if livenessProbe.TimeoutSeconds == 0 {
+			livenessProbe.TimeoutSeconds = 1
+		}
+		if livenessProbe.PeriodSeconds == 0 {
+			livenessProbe.PeriodSeconds = 10
+		}
+		if livenessProbe.FailureThreshold == 0 {
+			livenessProbe.FailureThreshold = 3
+		}
 	} else if bool(deployment.Web) || deployment.WebServices.Public.Enabled {
 		livenessProbe = baseProbe
 	}
 	if pod.ReadinessProbe != nil {
 		readinessProbe = *pod.ReadinessProbe
+
+		if readinessProbe.SuccessThreshold == 0 {
+			readinessProbe.SuccessThreshold = 1
+		}
+		if readinessProbe.TimeoutSeconds == 0 {
+			readinessProbe.TimeoutSeconds = 1
+		}
+		if readinessProbe.PeriodSeconds == 0 {
+			readinessProbe.PeriodSeconds = 10
+		}
+		if readinessProbe.FailureThreshold == 0 {
+			readinessProbe.FailureThreshold = 3
+		}
 	} else if bool(deployment.Web) || deployment.WebServices.Public.Enabled {
 		readinessProbe = baseProbe
 		readinessProbe.InitialDelaySeconds = 45
 	}
 
-	if livenessProbe.SuccessThreshold == 0 {
-		livenessProbe.SuccessThreshold = 1
-	}
-	if livenessProbe.TimeoutSeconds == 0 {
-		livenessProbe.TimeoutSeconds = 1
-	}
-	if livenessProbe.PeriodSeconds == 0 {
-		livenessProbe.PeriodSeconds = 10
-	}
-	if livenessProbe.FailureThreshold == 0 {
-		livenessProbe.FailureThreshold = 3
-	}
-
-	if readinessProbe.SuccessThreshold == 0 {
-		readinessProbe.SuccessThreshold = 1
-	}
-	if readinessProbe.TimeoutSeconds == 0 {
-		readinessProbe.TimeoutSeconds = 1
-	}
-	if readinessProbe.PeriodSeconds == 0 {
-		readinessProbe.PeriodSeconds = 10
-	}
-	if readinessProbe.FailureThreshold == 0 {
-		readinessProbe.FailureThreshold = 3
-	}
-
 	c := core.Container{
 		Name:                     nn.Name,
 		Image:                    pod.Image,