Merge pull request #18832 from gabemontero/jenkins-template-adjust

Automatic merge from submit-queue (batch tested with PRs 18780, 18802, 18391, 18832, 18808).

adjust jenkins template setting to account for effects of constrained…

… default max heap

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1551500
Fixes openshift/jenkins#501

@openshift/sig-developer-experience ptal

Author: openshift-merge-robot

examples/jenkins/jenkins-ephemeral-template.json

@@ -26,7 +26,8 @@
       "metadata": {
         "name": "${JENKINS_SERVICE_NAME}",
         "annotations": {
-          "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}"
+          "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}",
+          "haproxy.router.openshift.io/timeout": "2m"
         }
       },
       "spec": {
@@ -90,17 +91,18 @@
                 "name": "jenkins",
                 "image": " ",
                 "readinessProbe": {
-                  "timeoutSeconds": 3,
+                  "timeoutSeconds": 240,
                   "initialDelaySeconds": 3,
                   "httpGet": {
                     "path": "/login",
                     "port": 8080
                   }
                 },
                 "livenessProbe": {
-                    "timeoutSeconds": 3,
+                    "timeoutSeconds": 240,
+                    "periodSeconds": 360,  
                     "initialDelaySeconds": 420,
-                    "failureThreshold" : 30,
+                    "failureThreshold" : 2,
                     "httpGet": {
                         "path": "/login",
                         "port": 8080

examples/jenkins/jenkins-persistent-template.json

@@ -26,7 +26,8 @@
       "metadata": {
         "name": "${JENKINS_SERVICE_NAME}",
         "annotations": {
-          "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}"
+          "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}",
+          "haproxy.router.openshift.io/timeout": "2m"
         }
       },
       "spec": {
@@ -107,17 +108,18 @@
                 "name": "jenkins",
                 "image": " ",
                 "readinessProbe": {
-                  "timeoutSeconds": 3,
+                  "timeoutSeconds": 240,
                   "initialDelaySeconds": 3,
                   "httpGet": {
                     "path": "/login",
                     "port": 8080
                   }
                 },
                 "livenessProbe": {
-                    "timeoutSeconds": 3,
+                    "timeoutSeconds": 240,
+                    "periodSeconds": 360,  
                     "initialDelaySeconds": 420,
-                    "failureThreshold" : 30,
+                    "failureThreshold" : 2,
                     "httpGet": {
                         "path": "/login",
                         "port": 8080