Skip to content

vsphere: make sure CSRs are approved, run imageregistry patch in a thread #3573

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 2 commits into from
Apr 24, 2019
Merged

vsphere: make sure CSRs are approved, run imageregistry patch in a thread #3573

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00d8d88
vsphere: make sure CSRs are approved, run imageregistry patch in a th…
Apr 24, 2019
3dc122d
Run CSR approval until install-complete finishes
Apr 24, 2019
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
28 changes: 23 additions & 5 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,17 +427,35 @@ objects:
terraform apply -auto-approve -var 'bootstrap_complete=true' -no-color &
wait "$!"

function approve_csrs() {
while true; do
if [[ ! -f /tmp/install-complete ]]; then
Copy link
Contributor

@staebler staebler Apr 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Am I reading this wrong or does this wait for the install-complete file to exist before approving the CSRs?

I was expecting something like the following.

function approve_csrs() {
  while [[ ! -f /tmp/install-complete ]]; do
    sleep 15;
    oc get csr -ojson | jq -r '.items[] | select(.status == {} ) | .metadata.name' | xargs --no-run-if-empty oc adm certificate approve
  done
}

Copy link
Contributor Author

@vrutkovs vrutkovs Apr 24, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, correct, this won't ever finish, as CSR should be approved earlier. Fixed

Copy link
Contributor

@staebler staebler Apr 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are we gaining by having an if statement that does a continue in one branch and a break in the other rather than moving the check up to the while statement?

oc get csr -ojson | jq -r '.items[] | select(.status == {} ) | .metadata.name' | xargs --no-run-if-empty oc adm certificate approve
sleep 15 & wait
continue
else
break
fi
done
}

function update_image_registry() {
while true; do
sleep 10;
oc get configs.imageregistry.operator.openshift.io/cluster > /dev/null && break
done
oc patch configs.imageregistry.operator.openshift.io cluster --type merge --patch '{"spec":{"storage":{"emptyDir":{}}}}'
}

echo "Approving pending CSRs"
export KUBECONFIG=/tmp/artifacts/installer/auth/kubeconfig
oc get csr -ojson | jq -r '.items[] | select(.status == {} ) | .metadata.name' | xargs oc adm certificate approve

echo "Set registry storage to emptyDir"
while true; do oc get configs.imageregistry.operator.openshift.io/cluster && break; done
oc patch configs.imageregistry.operator.openshift.io cluster --type merge --patch '{"spec":{"storage":{"emptyDir":{}}}}'
approve_csrs &
update_image_registry &

echo "Completing UPI setup"
openshift-install --dir=/tmp/artifacts/installer wait-for install-complete &
wait "$!"
touch /tmp/install-complete

# Performs cleanup of all created resources
- name: teardown
Expand Down