From b14c0331c0c84dfd3d7abe0c110d2b5ab8f2d953 Mon Sep 17 00:00:00 2001
From: Eric Fried <efried@redhat.com>
Date: Fri, 19 Mar 2021 14:01:46 -0500
Subject: [PATCH] osd-cluster-ready: Remove MAX_CLUSTER_AGE_MINUTES

This was missed in #760 when we bumped osd-cluster-ready to include
https://github.com/openshift/osd-cluster-ready/pull/7, which removed
max cluster age logic.

OSD-6646
---
 deploy/osd-cluster-ready/60-osd-ready.Job.yaml    | 15 ++++-----------
 ...d-managed-cluster-config-integration.yaml.tmpl |  5 +----
 ...sd-managed-cluster-config-production.yaml.tmpl |  5 +----
 .../00-osd-managed-cluster-config-stage.yaml.tmpl |  5 +----
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/deploy/osd-cluster-ready/60-osd-ready.Job.yaml b/deploy/osd-cluster-ready/60-osd-ready.Job.yaml
index 6081626ae8..3f064b00dd 100644
--- a/deploy/osd-cluster-ready/60-osd-ready.Job.yaml
+++ b/deploy/osd-cluster-ready/60-osd-ready.Job.yaml
@@ -4,23 +4,16 @@ metadata:
     name: osd-cluster-ready
     namespace: openshift-monitoring
 spec:
-    # NOTE: We're making this ridiculously high to ensure that
-    # we exceed MAX_CLUSTER_AGE_MINUTES even in the fastest
-    # case. We rely on the logic in the job to exit cleanly when
-    # that max age is reached.
+    # NOTE: We're making this ridiculously high to ensure that the
+    # actual code gets a chance to run to completion. However, consumers
+    # should implement a sensible timeout rather than waiting forever.
     backoffLimit: 500
     template:
         metadata:
             name: osd-cluster-ready
         spec:
             containers:
-            # TODO: Remove this override once
-            # https://bugzilla.redhat.com/show_bug.cgi?id=1921413
-            # is resolved
-            - env:
-              - name: MAX_CLUSTER_AGE_MINUTES
-                value: "240"
-              name: osd-cluster-ready
+            - name: osd-cluster-ready
               image: quay.io/openshift-sre/osd-cluster-ready:v0.1.45-c9f1f45
               command: ["/root/main"]
             restartPolicy: OnFailure
diff --git a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl
index 1df89c9dc9..07e0241190 100644
--- a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl
+++ b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl
@@ -5193,10 +5193,7 @@ objects:
             name: osd-cluster-ready
           spec:
             containers:
-            - env:
-              - name: MAX_CLUSTER_AGE_MINUTES
-                value: '240'
-              name: osd-cluster-ready
+            - name: osd-cluster-ready
               image: quay.io/openshift-sre/osd-cluster-ready:v0.1.45-c9f1f45
               command:
               - /root/main
diff --git a/hack/00-osd-managed-cluster-config-production.yaml.tmpl b/hack/00-osd-managed-cluster-config-production.yaml.tmpl
index d0dfd250a9..0e9d95b89b 100644
--- a/hack/00-osd-managed-cluster-config-production.yaml.tmpl
+++ b/hack/00-osd-managed-cluster-config-production.yaml.tmpl
@@ -5193,10 +5193,7 @@ objects:
             name: osd-cluster-ready
           spec:
             containers:
-            - env:
-              - name: MAX_CLUSTER_AGE_MINUTES
-                value: '240'
-              name: osd-cluster-ready
+            - name: osd-cluster-ready
               image: quay.io/openshift-sre/osd-cluster-ready:v0.1.45-c9f1f45
               command:
               - /root/main
diff --git a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl
index 0e87b32a4e..47f86ce9f5 100644
--- a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl
+++ b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl
@@ -5193,10 +5193,7 @@ objects:
             name: osd-cluster-ready
           spec:
             containers:
-            - env:
-              - name: MAX_CLUSTER_AGE_MINUTES
-                value: '240'
-              name: osd-cluster-ready
+            - name: osd-cluster-ready
               image: quay.io/openshift-sre/osd-cluster-ready:v0.1.45-c9f1f45
               command:
               - /root/main