deep-stack/stack-orchestrator
3
0
Fork 0
forked from cerc-io/stack-orchestrator
Code Pull Requests Activity

Configure spec with all given URLs

Browse Source
This commit is contained in:
Prathamesh Musale 2025-02-05 18:45:46 +05:30
parent f5947a8a65
commit 3d1a455344
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
stack_orchestrator/deploy/webapp/deploy_webapp.py
View File

@ -36,25 +36,29 @@ def _fixup_container_tag(deployment_dir: str, image: str):
wfile.write(contents) wfile.write(contents)
def _fixup_url_spec(spec_file_name: str, url: str): def _fixup_url_spec(spec_file_name: str, urls: list[str]):
# url is like: https://example.com/path http_proxy_entries = []
for url in urls:
parsed_url = urlparse(url) parsed_url = urlparse(url)
http_proxy_spec = f''' http_proxy_entries.append(f'''
http-proxy:
- host-name: {parsed_url.hostname} - host-name: {parsed_url.hostname}
routes: routes:
- path: '{parsed_url.path if parsed_url.path else "/"}' - path: '{parsed_url.path if parsed_url.path else "/"}'
proxy-to: webapp:80 proxy-to: webapp:80''')
http_proxy_spec = f'''
http-proxy:{''.join(http_proxy_entries)}
''' '''
spec_file_path = Path(spec_file_name) spec_file_path = Path(spec_file_name)
with open(spec_file_path) as rfile: with open(spec_file_path, "r") as rfile:
contents = rfile.read() contents = rfile.read()
contents = contents + http_proxy_spec contents += http_proxy_spec
with open(spec_file_path, "w") as wfile: with open(spec_file_path, "w") as wfile:
wfile.write(contents) wfile.write(contents)
def create_deployment(ctx, deployment_dir, image, url, kube_config, image_registry, env_file): def create_deployment(ctx, deployment_dir, image, urls, kube_config, image_registry, env_file):
# Do the equivalent of: # Do the equivalent of:
# 1. laconic-so --stack webapp-template deploy --deploy-to k8s init --output webapp-spec.yml # 1. laconic-so --stack webapp-template deploy --deploy-to k8s init --output webapp-spec.yml
# --config (eqivalent of the contents of my-config.env) # --config (eqivalent of the contents of my-config.env)
@ -86,7 +90,7 @@ def create_deployment(ctx, deployment_dir, image, url, kube_config, image_regist
None None
) )
# Add the TLS and DNS spec # Add the TLS and DNS spec
_fixup_url_spec(spec_file_name, url) _fixup_url_spec(spec_file_name, urls)
create_operation( create_operation(
deploy_command_context, deploy_command_context,
spec_file_name, spec_file_name,
@ -120,4 +124,4 @@ def command(ctx):
def create(ctx, deployment_dir, image, url, kube_config, image_registry, env_file): def create(ctx, deployment_dir, image, url, kube_config, image_registry, env_file):
'''create a deployment for the specified webapp container''' '''create a deployment for the specified webapp container'''
return create_deployment(ctx, deployment_dir, image, url, kube_config, image_registry, env_file) return create_deployment(ctx, deployment_dir, image, [url], kube_config, image_registry, env_file)

4
stack_orchestrator/deploy/webapp/deploy_webapp_from_registry.py
View File

@ -189,12 +189,11 @@ def process_app_deployment_request(
logger.log( logger.log(
f"Creating webapp deployment in: {deployment_dir} with container id: {deployment_container_tag}" f"Creating webapp deployment in: {deployment_dir} with container id: {deployment_container_tag}"
) )
# TODO: Pass URLs for all fqdns
deploy_webapp.create_deployment( deploy_webapp.create_deployment(
ctx, ctx,
deployment_dir, deployment_dir,
deployment_container_tag, deployment_container_tag,
f"https://{fqdns[-1]}", [f"https://{fqdn}" for fqdn in fqdns],
kube_config, kube_config,
image_registry, image_registry,
env_filename, env_filename,
@ -649,7 +648,6 @@ def command( # noqa: C901
requests_to_check_for_payment.append(r) requests_to_check_for_payment.append(r)
requests_to_execute = [] requests_to_execute = []
# TODO: Charge more for multiple dns?
for r in requests_to_check_for_payment: for r in requests_to_check_for_payment:
if r.attributes.auction: if r.attributes.auction:
if auction_requests: if auction_requests: