Skip to content

Commit c8b8deb

Browse files
committed
bindata: deploy: Set progressDeadlineSeconds to 900
This only makes the latest library-go update compatible with the current behaviour. library-go now uses deployment controller deadline exceeded to check for progress timeout, not a hardcoded value, which was set to 15 minutes in the past, hence 900 seconds.
1 parent 5aa3b3c commit c8b8deb

5 files changed

Lines changed: 8 additions & 3 deletions

File tree

bindata/oauth-apiserver/deploy.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ spec:
2222
matchLabels:
2323
app: openshift-oauth-apiserver
2424
apiserver: "true"
25+
progressDeadlineSeconds: 900
2526
template:
2627
metadata:
2728
name: openshift-oauth-apiserver

bindata/oauth-openshift/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ spec:
1515
selector:
1616
matchLabels:
1717
app: oauth-openshift
18+
progressDeadlineSeconds: 900
1819
template:
1920
metadata:
2021
namespace: openshift-authentication

pkg/operator/workload/testdata/sync_ds_scenario_1.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Deployment
33
metadata:
44
annotations:
55
openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
6-
operator.openshift.io/spec-hash: "92b16c3a4fed15e36762fdaea811c16499cd59d97aa342cd6f93dfe74b977a57"
6+
operator.openshift.io/spec-hash: "7a9fc412104ef9bccb83ca436fc0564c6103b603441b8ec5677d3fb86c0999a4"
77
creationTimestamp: ~
88
labels:
99
apiserver: "true"
@@ -22,6 +22,7 @@ spec:
2222
rollingUpdate:
2323
maxUnavailable: 1
2424
maxSurge: 0
25+
progressDeadlineSeconds: 900
2526
template:
2627
metadata:
2728
creationTimestamp: ~

pkg/operator/workload/testdata/sync_ds_scenario_2.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Deployment
33
metadata:
44
annotations:
55
openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
6-
operator.openshift.io/spec-hash: "eaa7741231940e5279e2a2e6394a9c6516fcf3ba2573136dcf0319776f21f47d"
6+
operator.openshift.io/spec-hash: "129c97247fdc00a33eb2bafe37f39fbc0a2bd29f8efffc21a77f359fcc202d60"
77
creationTimestamp: ~
88
labels:
99
apiserver: "true"
@@ -22,6 +22,7 @@ spec:
2222
rollingUpdate:
2323
maxUnavailable: 1
2424
maxSurge: 0
25+
progressDeadlineSeconds: 900
2526
template:
2627
metadata:
2728
creationTimestamp: ~

pkg/operator/workload/testdata/sync_ds_scenario_3.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Deployment
33
metadata:
44
annotations:
55
openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
6-
operator.openshift.io/spec-hash: "187e7046690e53bab0761a419280e536304f3767614ab909e8e430d5264ac6ba"
6+
operator.openshift.io/spec-hash: "1744ae66ec6576d4137244fe0c6528d0cd7cc20cf50c9faec2aa73cbf8af5b97"
77
creationTimestamp: ~
88
labels:
99
apiserver: "true"
@@ -22,6 +22,7 @@ spec:
2222
rollingUpdate:
2323
maxUnavailable: 1
2424
maxSurge: 0
25+
progressDeadlineSeconds: 900
2526
template:
2627
metadata:
2728
creationTimestamp: ~

0 commit comments

Comments
 (0)