Skip to content

Commit f40d1c9

Browse files
[batch] Support deployment mode as a Terra on Azure app (#13944)
First draft of a helm chart for packaging up Hail Batch as a Terra on Azure App. This will likely need numerous bug fixes as we set up a proper testing strategy, but the rough shape of everything should be pretty stable.
1 parent 426e16b commit f40d1c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1601
-125
lines changed

auth/auth/auth.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
from hailtop.auth import AzureFlow, Flow, GoogleFlow, IdentityProvider
3737
from hailtop.config import get_deploy_config
3838
from hailtop.hail_logging import AccessLogger
39-
from hailtop.tls import internal_server_ssl_context
4039
from hailtop.utils import secret_alnum_string
4140
from web_common import render_template, set_message, setup_aiohttp_jinja2, setup_common_static_routes
4241

@@ -905,5 +904,5 @@ def run():
905904
host='0.0.0.0',
906905
port=443,
907906
access_log_class=AuthAccessLogger,
908-
ssl_context=internal_server_ssl_context(),
907+
ssl_context=deploy_config.server_ssl_context(),
909908
)

batch/batch/cloud/driver.py

+5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
import os
2+
13
from gear import Database
24
from gear.cloud_config import get_global_config
35

46
from ..driver.driver import CloudDriver
57
from ..inst_coll_config import InstanceCollectionConfigs
68
from .azure.driver.driver import AzureDriver
79
from .gcp.driver.driver import GCPDriver
10+
from .terra.azure.driver.driver import TerraAzureDriver
811

912

1013
async def get_cloud_driver(
@@ -17,6 +20,8 @@ async def get_cloud_driver(
1720
cloud = get_global_config()['cloud']
1821

1922
if cloud == 'azure':
23+
if os.environ.get('HAIL_TERRA'):
24+
return await TerraAzureDriver.create(app, db, machine_name_prefix, namespace, inst_coll_configs)
2025
return await AzureDriver.create(app, db, machine_name_prefix, namespace, inst_coll_configs)
2126

2227
assert cloud == 'gcp', cloud

batch/batch/cloud/terra/__init__.py

Whitespace-only changes.

batch/batch/cloud/terra/azure/__init__.py

Whitespace-only changes.

batch/batch/cloud/terra/azure/driver/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)