status check fixes

roles/deploy-rhsso-instance/tasks/main.yml

@@ -66,6 +66,7 @@
   register: sso_cr
   until:
     - (sso_cr.resources | length) == 1
+    - sso_cr.resources[0].status is defined
     - sso_cr.resources[0].status.ready
     - sso_cr.resources[0].status.phase == "reconciling"
   retries: 30

roles/deploy-rhsso-operator/tasks/main.yml

@@ -97,6 +97,7 @@
   until:
     - sso_csv.resources is defined
     - (sso_csv.resources | length) > 0
+    - sso_csv.resources[0].status is defined
     - sso_csv.resources[0].status.phase == "Succeeded"
   retries: 30
   delay: 10
@@ -114,6 +115,7 @@
   until:
     - sso_pod.resources is defined
     - (sso_pod.resources | length) > 0
+    - sso_pod.resources[0].status is defined
     - sso_pod.resources[0].status.phase == "Running"
   retries: 30
   delay: 10

roles/fix-operators/tasks/main.yml

@@ -118,6 +118,8 @@
     name: rhsso-operator
   register: sso_mft
 
+# TODO: remove the catalogsource also if it's not referencing the secret, the
+#       pod is older than the secret, or its state is not "running"
 - name: Remove existing catalogsource from openshift-marketplace if rhsso-operator belongs to it
   k8s:
     kubeconfig: tmp/kubeconfig-ocp4
@@ -132,8 +134,7 @@
     - (sso_mft.resources | length) > 0
     - sso_mft.resources[0].status.catalogSource == "do280-catalog"
 
-# TODO: remove the catalogsource also if it's not referencing the secret, the
-#       pod is older than the secret, or its state is not "running"
+# TODO: Wait for the do280-catalog pod to disappear.
 
 - name: Make certain the "standard" catalog source is updated
   k8s:
@@ -188,8 +189,6 @@
   retries: 30
   delay: 10
 
-# TODO: wait for the do280-catalog and do280-sso pods to be back up as well?
-
 - name: Wait for the rhsso-operator packagemanifest to appear.
   k8s_info:
     kubeconfig: tmp/kubeconfig-ocp4