Skip to content
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

Jump to bottom

Sleep longer when waiting for the installation #60

Merged
merged 3 commits into from
Oct 18, 2023
Merged

Sleep longer when waiting for the installation #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec320e0
Sleep longer when waiting for the installation
chaen Oct 18, 2023
41e3d8a
Restore health test for diracx-demo container
chaen Oct 18, 2023
4f6ae4d
Hackily clean cs-mount
chaen Oct 18, 2023
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
16 changes: 8 additions & 8 deletions diracx/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ spec:
- name: http
containerPort: {{ .Values.diracx.service.port }}
protocol: TCP
# livenessProbe:
# httpGet:
# path: /api/docs/
# port: http
# readinessProbe:
# httpGet:
# path: /api/docs/
# port: http
livenessProbe:
httpGet:
path: /api/docs/
port: http
readinessProbe:
httpGet:
path: /api/docs/
port: http
command: ["bash", "/entrypoint.sh"]
args:
- uvicorn
Expand Down
7 changes: 5 additions & 2 deletions run_demo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,9 @@ if [ ${#pkg_dirs[@]} -gt 0 ]; then
done
fi
# Add the mount for the CS
# hack to cleanup the cs-mount content owned by somebody else
# (long term solution is proper security policy in the cluster)
docker run -v "${demo_dir}/cs-mount":/cs-mount busybox:latest rm -rf /cs-mount/initialRepo
rm -rf "${demo_dir}/cs-mount"
mkdir -p "${demo_dir}/cs-mount"
# Make sure the directory is writable by the container
Expand Down Expand Up @@ -293,7 +296,7 @@ printf "%b Waiting for ingress controller to be created...\n" ${UNICORN_EMOJI}
"${demo_dir}/kubectl" wait --namespace ingress-nginx \
--for=condition=ready pod \
--selector=app.kubernetes.io/component=controller \
--timeout=90s
--timeout=300s

# Install the DiracX chart
printf "%b Installing DiracX...\n" ${UNICORN_EMOJI}
Expand All @@ -303,7 +306,7 @@ if ! "${demo_dir}/helm" install diracx-demo "${script_dir}/diracx" "${helm_argum
echo "Failed to run \"helm install\"" >> "${demo_dir}/.failed"
else
printf "%b Waiting for installation to finish...\n" ${UNICORN_EMOJI}
if "${demo_dir}/kubectl" wait --for=condition=ready pod --selector=app.kubernetes.io/name=diracx --timeout=300s; then
if "${demo_dir}/kubectl" wait --for=condition=ready pod --selector=app.kubernetes.io/name=diracx --timeout=900s; then
printf "%b %b %b Pods are ready! %b %b %b\n" "${PARTY_EMOJI}" "${PARTY_EMOJI}" "${PARTY_EMOJI}" "${PARTY_EMOJI}" "${PARTY_EMOJI}" "${PARTY_EMOJI}"

# Dump the CA certificate to a file so that it can be used by the client
Expand Down