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.

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

output check fix #1244

Merged
merged 1 commit into from
Apr 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion qhub/stages/checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,6 @@ def _attempt_connect_url(
services = stage_outputs[directory]["service_urls"]["value"]
for service_name, service in services.items():
service_url = service["health_url"]
if not _attempt_connect_url(service_url):
if service_url and not _attempt_connect_url(service_url):
print(f"ERROR: Service {service_name} DOWN when checking url={service_url}")
sys.exit(1)
8 changes: 4 additions & 4 deletions qhub/template/stages/07-kubernetes-services/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ output "service_urls" {
url = "https://${var.endpoint}/"
health_url = "https://${var.endpoint}/hub/api/"
}
monitoring = {
url = "https://${var.endpoint}/monitoring/"
health_url = "https://${var.endpoint}/monitoring/api/health"
}
keycloak = {
url = "https://${var.endpoint}/auth/"
health_url = "https://${var.endpoint}/auth/realms/master"
}
monitoring = {
url = var.monitoring-enabled ? "https://${var.endpoint}/monitoring/" : null
health_url = var.monitoring-enabled ? "https://${var.endpoint}/monitoring/api/health" : null
}
}
}