Skip to content

gcp_upi: Add exit clause to approve_csr while loop #16089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Feb 22, 2021
Merged

gcp_upi: Add exit clause to approve_csr while loop #16089

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ci-operator/step-registry/upi/install/gcp/upi-install-gcp-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,10 +488,10 @@ gcloud deployment-manager deployments delete -q "${INFRA_ID}-bootstrap"
## Approving the CSR requests for nodes
echo "$(date -u --rfc-3339=seconds) - Approving the CSR requests for nodes..."
function approve_csrs() {
while true; do
oc get csr -ojson | jq -r '.items[] | select(.status == {} ) | .metadata.name' | xargs --no-run-if-empty oc adm certificate approve
sleep 15 & wait
continue
while [[ ! -f /tmp/install-complete ]]; do
# even if oc get csr fails continue
oc get csr -ojson | jq -r '.items[] | select(.status == {} ) | .metadata.name' | xargs --no-run-if-empty oc adm certificate approve || true
sleep 15 & wait
done
}
approve_csrs &
Expand Down Expand Up @@ -541,3 +541,4 @@ cp -t "${SHARED_DIR}" \
"${dir}/auth/kubeconfig"

popd
touch /tmp/install-complete