Skip to content

Commit

Permalink
rosa: only wait for osd-cluster-ready on non-hcp (openshift#59461)
Browse files Browse the repository at this point in the history
The osd-cluster-ready job is only on Classic.
  • Loading branch information
stbenjam authored Dec 4, 2024
1 parent fd3148f commit f8e54c8
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,16 @@ else
echo "All cluster operators ready after $(( ${end_time} - ${start_time} )) seconds"
fi

# Additionally, OSD has a job "osd-cluster-ready" that determines when
# Additionally, non-HCP has a job "osd-cluster-ready" that determines when
# the managed service operators are done and the cluster is truly ready.
# Don't consider the cluster ready until that's done.
while ! oc get job/osd-cluster-ready -n openshift-monitoring &>/dev/null; do
echo "Waiting for job/osd-cluster-ready to exist..."
sleep 30
done
if [[ "$HOSTED_CP" == "false" ]]
then
while ! oc get job/osd-cluster-ready -n openshift-monitoring &>/dev/null; do
echo "Waiting for job/osd-cluster-ready to exist..."
sleep 30
done

echo "Waiting for job/osd-cluster-ready to complete..."
oc wait --for=condition=complete job/osd-cluster-ready -n openshift-monitoring --timeout=60m
echo "Waiting for job/osd-cluster-ready to complete..."
oc wait --for=condition=complete job/osd-cluster-ready -n openshift-monitoring --timeout=60m
fi
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ ref:
from: rosa-aws-cli
grace_period: 10m
commands: rosa-cluster-wait-ready-operators-commands.sh
env:
- name: HOSTED_CP
default: "false"
documentation: Enable the use of hosted control planes (HyperShift).
resources:
requests:
cpu: 100m
Expand Down

0 comments on commit f8e54c8

Please sign in to comment.