From f1e6ed8c858ecced66f64958e4e8f64835746976 Mon Sep 17 00:00:00 2001 From: Hannes Schmidt Date: Tue, 17 Sep 2024 14:40:55 -0700 Subject: [PATCH 1/3] Add load balancers to GitLab hibernation function --- environment | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/environment b/environment index 14a0a8b7c..845164554 100644 --- a/environment +++ b/environment @@ -341,7 +341,9 @@ _hibernate() { -target aws_ec2_client_vpn_endpoint.gitlab \ -target aws_instance.gitlab \ -target aws_nat_gateway.gitlab_0 \ - -target aws_nat_gateway.gitlab_1 + -target aws_nat_gateway.gitlab_1 \ + -target aws_lb.gitlab_nlb \ + -target aws_lb.gitlab_alb } } else From b1570e2180fd33cbfa26dfb262b7d1b1e165f3e8 Mon Sep 17 00:00:00 2001 From: Hannes Schmidt Date: Tue, 17 Sep 2024 16:01:00 -0700 Subject: [PATCH 2/3] [H] Deploy browser site for HCA prod as TF component of Azul (#6344) --- deployments/prod.browser/environment.py | 41 +++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 deployments/prod.browser/environment.py diff --git a/deployments/prod.browser/environment.py b/deployments/prod.browser/environment.py new file mode 100644 index 000000000..395d75f20 --- /dev/null +++ b/deployments/prod.browser/environment.py @@ -0,0 +1,41 @@ +from collections.abc import ( + Mapping, +) +import json +from typing import ( + Optional, +) + + +def env() -> Mapping[str, Optional[str]]: + """ + Returns a dictionary that maps environment variable names to values. The + values are either None or strings. String values can contain references to + other environment variables in the form `{FOO}` where FOO is the name of an + environment variable. See + + https://docs.python.org/3.11/library/string.html#format-string-syntax + + for the concrete syntax. These references will be resolved *after* the + overall environment has been compiled by merging all relevant + `environment.py` and `environment.local.py` files. + + Entries with a `None` value will be excluded from the environment. They + can be used to document a variable without a default value in which case + other, more specific `environment.py` or `environment.local.py` files must + provide the value. + """ + return { + 'azul_terraform_component': 'browser', + 'azul_browser_sites': json.dumps({ + 'browser': { + 'zone': 'explore.data.humancellatlas.org', + 'domain': 'explore.data.humancellatlas.org', + 'project': 'ucsc/data-browser', + 'branch': 'ucsc/hca/prod', + 'tarball_name': 'hca', + 'tarball_path': 'out', + 'real_path': '' + } + }) + } From 29b44075e92c933bc9e7a472860e7a1d8943301d Mon Sep 17 00:00:00 2001 From: Hannes Schmidt Date: Fri, 20 Sep 2024 15:39:00 -0700 Subject: [PATCH 3/3] [H] Deploy browser site for LungMAP prod as a TF component of Azul (#6347) --- deployments/prod.browser/environment.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/deployments/prod.browser/environment.py b/deployments/prod.browser/environment.py index 395d75f20..fcd8fd071 100644 --- a/deployments/prod.browser/environment.py +++ b/deployments/prod.browser/environment.py @@ -36,6 +36,15 @@ def env() -> Mapping[str, Optional[str]]: 'tarball_name': 'hca', 'tarball_path': 'out', 'real_path': '' + }, + 'lungmap': { + 'zone': 'data-browser.lungmap.net', + 'domain': 'data-browser.lungmap.net', + 'project': 'ucsc/data-browser', + 'branch': 'ucsc/lungmap/prod', + 'tarball_name': 'lungmap', + 'tarball_path': 'out', + 'real_path': '' } }) }