diff --git a/diracx/templates/NOTES.txt b/diracx/templates/NOTES.txt index 0ad295b..72a232f 100644 --- a/diracx/templates/NOTES.txt +++ b/diracx/templates/NOTES.txt @@ -1,8 +1,8 @@ -{{- if .Values.developer.enabled -}} +{{- if .Values.developer.enabled }} 🚧 Chart has been installed in developer mode. -ℹ️ To interact with the cluster directly using kubectl/helm you'll need to set the +ℹ️ To interact with the cluster directly using kubectl/helm you'll need to set the first following environment variables: export KUBECONFIG={{ .Values.developer.demoDir }}/kube.conf @@ -11,23 +11,23 @@ first following environment variables: Then see the chart README for more information on how to use kubectl/helm. -ℹ️ To use the demo with the DiracX client set: +ℹ️ To use the demo with the DiracX client set: export DIRACX_URL={{ .Values.developer.urls.diracx }} -ℹ️ To access the interactive API documentation visit: +ℹ️ To access the interactive API documentation visit: {{ .Values.developer.urls.diracx }}/docs -ℹ️ When prompted to login the credentials are: +ℹ️ When prompted to login the credentials are: Username: admin@example.com Password: password -{{- else -}} +{{ else }} Installed in chart production mode. TODO: Add notes... -{{- end -}} +{{ end -}} diff --git a/run_demo.sh b/run_demo.sh index d5e66dd..79bd27d 100755 --- a/run_demo.sh +++ b/run_demo.sh @@ -277,18 +277,6 @@ else if "${demo_dir}/kubectl" wait --for=condition=ready pod --selector=app.kubernetes.io/name=diracx --timeout=300s; then printf "%b %b %b Pods are ready! %b %b %b\n" "${PARTY_EMOJI}" "${PARTY_EMOJI}" "${PARTY_EMOJI}" "${PARTY_EMOJI}" "${PARTY_EMOJI}" "${PARTY_EMOJI}" touch "${demo_dir}/.success" - - echo "" - printf "%b To interact with the cluster:\n" "${INFO_EMOJI}" - echo "export KUBECONFIG=${KUBECONFIG}" - echo "export HELM_DATA_HOME=${HELM_DATA_HOME}" - echo "export PATH=\${PATH}:${demo_dir}" - echo "" - printf "%b You can access swagger at http://%s:8000/docs\n" "${INFO_EMOJI}" "${machine_hostname}" - echo "To login, use the OAuth Authroization Code flow, and enter the following credentials" - echo "in the DEX web interface" - echo "Username: admin@example.com" - echo "Password: password" else printf "%b Installation did not start sucessfully!\n" ${WARN_EMOJI} echo "Installation did not start sucessfully!" >> "${demo_dir}/.failed"