bindata: deploy: Set progressDeadlineSeconds to 900

tchap · tchap · commit 8a3becae2a42 · 2026-02-23T15:42:27.000+01:00
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.
diff --git a/bindata/oauth-apiserver/deploy.yaml b/bindata/oauth-apiserver/deploy.yaml
@@ -22,6 +22,7 @@ spec:
     matchLabels:
       app: openshift-oauth-apiserver
       apiserver: "true"
+  progressDeadlineSeconds: 900
   template:
     metadata:
       name: openshift-oauth-apiserver
diff --git a/bindata/oauth-openshift/deployment.yaml b/bindata/oauth-openshift/deployment.yaml
@@ -15,6 +15,7 @@ spec:
   selector:
     matchLabels:
       app: oauth-openshift
+  progressDeadlineSeconds: 900
   template:
     metadata:
       namespace: openshift-authentication
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: "92b16c3a4fed15e36762fdaea811c16499cd59d97aa342cd6f93dfe74b977a57"
+    operator.openshift.io/spec-hash: "7a9fc412104ef9bccb83ca436fc0564c6103b603441b8ec5677d3fb86c0999a4"
   creationTimestamp: ~
   labels:
     apiserver: "true"
@@ -22,6 +22,7 @@ spec:
     rollingUpdate:
       maxUnavailable: 1
       maxSurge: 0
+  progressDeadlineSeconds: 900
   template:
     metadata:
       creationTimestamp: ~
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: "eaa7741231940e5279e2a2e6394a9c6516fcf3ba2573136dcf0319776f21f47d"
+    operator.openshift.io/spec-hash: "129c97247fdc00a33eb2bafe37f39fbc0a2bd29f8efffc21a77f359fcc202d60"
   creationTimestamp: ~
   labels:
     apiserver: "true"
@@ -22,6 +22,7 @@ spec:
     rollingUpdate:
       maxUnavailable: 1
       maxSurge: 0
+  progressDeadlineSeconds: 900
   template:
     metadata:
       creationTimestamp: ~
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: "187e7046690e53bab0761a419280e536304f3767614ab909e8e430d5264ac6ba"
+    operator.openshift.io/spec-hash: "1744ae66ec6576d4137244fe0c6528d0cd7cc20cf50c9faec2aa73cbf8af5b97"
   creationTimestamp: ~
   labels:
     apiserver: "true"
@@ -22,6 +22,7 @@ spec:
     rollingUpdate:
       maxUnavailable: 1
       maxSurge: 0
+  progressDeadlineSeconds: 900
   template:
     metadata:
       creationTimestamp: ~
diff --git a/test-data/apply-configuration/overall/oauth-apiserver-creation-minimal/expected-output/Management/ApplyStatus/cluster-scoped-resources/operator.openshift.io/authentications/c5b3-body-cluster.yaml b/test-data/apply-configuration/overall/oauth-apiserver-creation-minimal/expected-output/Management/ApplyStatus/cluster-scoped-resources/operator.openshift.io/authentications/c5b3-body-cluster.yaml
@@ -5,17 +5,18 @@ metadata:
 status:
   conditions:
   - lastTransitionTime: "2024-10-14T22:38:20Z"
-    message: no apiserver.openshift-oauth-apiserver pods available on any node.
+    message: no apiserver.openshift-oauth-apiserver pods available on any node
     reason: NoPod
     status: "False"
     type: APIServerDeploymentAvailable
-  - lastTransitionTime: "2025-09-09T00:08:37Z"
-    reason: AsExpected
-    status: "False"
+  - lastTransitionTime: "2024-10-14T22:38:20Z"
+    message: no apiserver.openshift-oauth-apiserver pods available on any node
+    reason: Unavailable
+    status: "True"
     type: APIServerDeploymentDegraded
   - lastTransitionTime: "2024-10-14T22:38:20Z"
     message: 'deployment/apiserver.openshift-oauth-apiserver: 0/1 pods have been updated
-      to the latest generation and 0/1 pods are available'
+      to the latest revision and 0/1 pods are available'
     reason: PodsUpdating
     status: "True"
     type: APIServerDeploymentProgressing
diff --git a/test-data/apply-configuration/overall/oauth-apiserver-creation-minimal/expected-output/Management/Create/namespaces/openshift-oauth-apiserver/apps/deployments/7350-body-apiserver.yaml b/test-data/apply-configuration/overall/oauth-apiserver-creation-minimal/expected-output/Management/Create/namespaces/openshift-oauth-apiserver/apps/deployments/7350-body-apiserver.yaml
@@ -3,14 +3,15 @@ kind: Deployment
 metadata:
   annotations:
     openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
-    operator.openshift.io/spec-hash: b8ea01ab9a9bcf14e72373c020dfae9a968e1b8e5cd4b467a3fc6ae9fdbacff1
+    operator.openshift.io/spec-hash: eb0817f2a3f0fed0fee4b6bed759e7c7ef24752833a3d84b8141a02a0d333ffd
   labels:
     apiserver: "true"
     app: openshift-oauth-apiserver
     revision: "1"
   name: apiserver
   namespace: openshift-oauth-apiserver
 spec:
+  progressDeadlineSeconds: 900
   replicas: 0
   selector:
     matchLabels:
diff --git a/test-data/apply-configuration/overall/oauth-server-creation-minimal/expected-output/Management/ApplyStatus/cluster-scoped-resources/operator.openshift.io/authentications/5749-body-cluster.yaml b/test-data/apply-configuration/overall/oauth-server-creation-minimal/expected-output/Management/ApplyStatus/cluster-scoped-resources/operator.openshift.io/authentications/5749-body-cluster.yaml
@@ -5,17 +5,18 @@ metadata:
 status:
   conditions:
   - lastTransitionTime: "2025-08-07T22:38:20Z"
-    message: no oauth-openshift.openshift-authentication pods available on any node.
+    message: no oauth-openshift.openshift-authentication pods available on any node
     reason: NoPod
     status: "False"
     type: OAuthServerDeploymentAvailable
-  - lastTransitionTime: "2025-08-01T18:45:36Z"
-    reason: AsExpected
-    status: "False"
+  - lastTransitionTime: "2025-08-07T22:38:20Z"
+    message: no oauth-openshift.openshift-authentication pods available on any node
+    reason: Unavailable
+    status: "True"
     type: OAuthServerDeploymentDegraded
   - lastTransitionTime: "2025-08-07T22:38:20Z"
     message: 'deployment/oauth-openshift.openshift-authentication: 0/1 pods have been
-      updated to the latest generation and 0/1 pods are available'
+      updated to the latest revision and 0/1 pods are available'
     reason: PodsUpdating
     status: "True"
     type: OAuthServerDeploymentProgressing
diff --git a/test-data/apply-configuration/overall/oauth-server-creation-minimal/expected-output/Management/Create/namespaces/openshift-authentication/apps/deployments/a3d6-body-oauth-openshift.yaml b/test-data/apply-configuration/overall/oauth-server-creation-minimal/expected-output/Management/Create/namespaces/openshift-authentication/apps/deployments/a3d6-body-oauth-openshift.yaml
@@ -3,12 +3,13 @@ kind: Deployment
 metadata:
   annotations:
     operator.openshift.io/rvs-hash: f4V-TOKKLhC7zxXahsybviIQ6XFZf_Ua2SFe2jckw9gL4UuCiEXYmFPtjUvFGC13xB72tEYqR0N1somiZq0-JQ
-    operator.openshift.io/spec-hash: 0a0b624d81acaa84b703ae631aa8552ec31f538924445ffe696cf9a6c39d7dac
+    operator.openshift.io/spec-hash: 5097c5990047d75248d34d13299d208892a1cef4b827575b927549c549562778
   labels:
     app: oauth-openshift
   name: oauth-openshift
   namespace: openshift-authentication
 spec:
+  progressDeadlineSeconds: 900
   replicas: 3
   selector:
     matchLabels:
