Merge pull request #638 from openshift-cherrypick-robot/cherry-pick-6…

…12-to-release-4.13 [release-4.13] OCPBUGS-22210: increase timeout for probes
openshift · Oct 30, 2023 · 2c226ab · 2c226ab
2 parents a044dd9 + 7c58ba7
commit 2c226ab
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/bindata/oauth-apiserver/deploy.yaml b/bindata/oauth-apiserver/deploy.yaml
@@ -107,7 +107,7 @@ spec:
             path: healthz
           initialDelaySeconds: 0
           periodSeconds: 10
-          timeoutSeconds: 1
+          timeoutSeconds: 10
           successThreshold: 1
           failureThreshold: 3
         readinessProbe:
@@ -117,7 +117,7 @@ spec:
             path: readyz
           initialDelaySeconds: 0
           periodSeconds: 5
-          timeoutSeconds: 1
+          timeoutSeconds: 10
           successThreshold: 1
           failureThreshold: 1
         startupProbe:
@@ -127,7 +127,7 @@ spec:
             path: healthz
           initialDelaySeconds: 0
           periodSeconds: 5
-          timeoutSeconds: 1
+          timeoutSeconds: 10
           successThreshold: 1
           failureThreshold: 30
       terminationGracePeriodSeconds: 90 # a bit more than the 60 seconds timeout of non-long-running requests + the shutdown delay

diff --git a/pkg/operator/assets/bindata.go b/pkg/operator/assets/bindata.go
diff --git a/pkg/operator/workload/testdata/sync_ds_scenario_1.yaml b/pkg/operator/workload/testdata/sync_ds_scenario_1.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   annotations:
     openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
-    operator.openshift.io/spec-hash: "ec8656884875dc86e53a4ac56860dab6e0b75174cb05727c11be347f0706eff0"
+    operator.openshift.io/spec-hash: "8ee33dafe676726b34f44c7d7ea1db1d8e318c29232044323695da5d52342f56"
   creationTimestamp: ~
   labels:
     apiserver: "true"
@@ -66,7 +66,7 @@ spec:
               path: healthz
             initialDelaySeconds: 0
             periodSeconds: 10
-            timeoutSeconds: 1
+            timeoutSeconds: 10
             successThreshold: 1
             failureThreshold: 3
           readinessProbe:
@@ -76,7 +76,7 @@ spec:
               path: readyz
             initialDelaySeconds: 0
             periodSeconds: 5
-            timeoutSeconds: 1
+            timeoutSeconds: 10
             successThreshold: 1
             failureThreshold: 1
           startupProbe:
@@ -86,7 +86,7 @@ spec:
               path: healthz
             initialDelaySeconds: 0
             periodSeconds: 5
-            timeoutSeconds: 1
+            timeoutSeconds: 10
             successThreshold: 1
             failureThreshold: 30
           name: oauth-apiserver

diff --git a/pkg/operator/workload/testdata/sync_ds_scenario_2.yaml b/pkg/operator/workload/testdata/sync_ds_scenario_2.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   annotations:
     openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
-    operator.openshift.io/spec-hash: "c6b69eb66aa5315d99749b9562ed2a54f6f4758e71d29929d6d1e4174b373ce2"
+    operator.openshift.io/spec-hash: "fc856dccb78052f4091e81833aaad06e7354f1e3a2a6fd15927b75e91f0cafde"
   creationTimestamp: ~
   labels:
     apiserver: "true"
@@ -75,7 +75,7 @@ spec:
               path: healthz
             initialDelaySeconds: 0
             periodSeconds: 10
-            timeoutSeconds: 1
+            timeoutSeconds: 10
             successThreshold: 1
             failureThreshold: 3
           readinessProbe:
@@ -85,7 +85,7 @@ spec:
               path: readyz
             initialDelaySeconds: 0
             periodSeconds: 5
-            timeoutSeconds: 1
+            timeoutSeconds: 10
             successThreshold: 1
             failureThreshold: 1
           startupProbe:
@@ -95,7 +95,7 @@ spec:
               path: healthz
             initialDelaySeconds: 0
             periodSeconds: 5
-            timeoutSeconds: 1
+            timeoutSeconds: 10
             successThreshold: 1
             failureThreshold: 30
           name: oauth-apiserver

diff --git a/pkg/operator/workload/testdata/sync_ds_scenario_3.yaml b/pkg/operator/workload/testdata/sync_ds_scenario_3.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   annotations:
     openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
-    operator.openshift.io/spec-hash: "0b7f0eb3f3af25e1b7e70cd3a798c6f694348a5d62e6665dade9964499ce1f24"
+    operator.openshift.io/spec-hash: "12ebf32bd21d3cd5a2a3a2eb7f7689fdcced34406acd9b62dfd3859b97e2b931"
   creationTimestamp: ~
   labels:
     apiserver: "true"
@@ -70,7 +70,7 @@ spec:
               path: healthz
             initialDelaySeconds: 0
             periodSeconds: 10
-            timeoutSeconds: 1
+            timeoutSeconds: 10
             successThreshold: 1
             failureThreshold: 3
           readinessProbe:
@@ -80,7 +80,7 @@ spec:
               path: readyz
             initialDelaySeconds: 0
             periodSeconds: 5
-            timeoutSeconds: 1
+            timeoutSeconds: 10
             successThreshold: 1
             failureThreshold: 1
           startupProbe:
@@ -90,7 +90,7 @@ spec:
               path: healthz
             initialDelaySeconds: 0
             periodSeconds: 5
-            timeoutSeconds: 1
+            timeoutSeconds: 10
             successThreshold: 1
             failureThreshold: 30
           name: oauth-apiserver