cerc-io/stack-orchestrator
12
1
Fork 3
Code Issues 112 Pull Requests 22 Actions Packages Projects Releases 481 Wiki Activity

Add port config to deployment spec.

Browse Source
This commit is contained in:
Thomas E Lackey 2023-08-09 22:57:49 -05:00
parent bccf711206
commit 04b311c69d
1 changed files with 64 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
app/deployment_create.py
View File

@ -27,10 +27,27 @@ from app.deploy_types import DeploymentContext, DeployCommandContext
def _make_default_deployment_dir(): def _make_default_deployment_dir():
return "deployment-001" return "deployment-001"
def _get_ports(stack):
ports = {}
parsed_stack = get_parsed_stack_config(stack)
pods = parsed_stack["pods"]
yaml = get_yaml()
for pod in pods:
pod_file_path = os.path.join(get_compose_file_dir(), f"docker-compose-{pod}.yml")
parsed_pod_file = yaml.load(open(pod_file_path, "r"))
if "services" in parsed_pod_file:
for svc_name, svc in parsed_pod_file["services"].items():
if "ports" in svc:
normalized = [ str(x) for x in svc["ports"] ]
if pod in ports:
ports[pod][svc_name] = normalized
else:
ports[pod] = { svc_name: normalized }
return ports
def _get_named_volumes(stack): def _get_named_volumes(stack):
# Parse the compose files looking for named volumes # Parse the compose files looking for named volumes
named_volumes = [] named_volumes = {}
parsed_stack = get_parsed_stack_config(stack) parsed_stack = get_parsed_stack_config(stack)
pods = parsed_stack["pods"] pods = parsed_stack["pods"]
yaml = get_yaml() yaml = get_yaml()
@ -39,10 +56,9 @@ def _get_named_volumes(stack):
parsed_pod_file = yaml.load(open(pod_file_path, "r")) parsed_pod_file = yaml.load(open(pod_file_path, "r"))
if "volumes" in parsed_pod_file: if "volumes" in parsed_pod_file:
volumes = parsed_pod_file["volumes"] volumes = parsed_pod_file["volumes"]
for volume in volumes.keys(): # Volume definition looks like:
# Volume definition looks like: # 'laconicd-data': None
# 'laconicd-data': None named_volumes[pod] = list(volumes.keys())
named_volumes.append(volume)
return named_volumes return named_volumes
@ -61,25 +77,30 @@ def _create_bind_dir_if_relative(volume, path_string, compose_dir):
# See: https://stackoverflow.com/questions/45699189/editing-docker-compose-yml-with-pyyaml # See: https://stackoverflow.com/questions/45699189/editing-docker-compose-yml-with-pyyaml
def _fixup_pod_file(pod, spec, compose_dir): def _fixup_pod_file(pod_name, pod, spec, compose_dir):
# Fix up volumes if pod_name in spec["pods"]:
if "volumes" in spec: # Fix up volumes
spec_volumes = spec["volumes"] if "volumes" in spec["pods"][pod_name]:
if "volumes" in pod: spec_volumes = spec["pods"][pod_name]["volumes"]
pod_volumes = pod["volumes"] if "volumes" in pod:
for volume in pod_volumes.keys(): pod_volumes = pod["volumes"]
if volume in spec_volumes: for volume in pod_volumes.keys():
volume_spec = spec_volumes[volume] if volume in spec_volumes:
volume_spec_fixedup = volume_spec if Path(volume_spec).is_absolute() else f".{volume_spec}" volume_spec = spec_volumes[volume]
_create_bind_dir_if_relative(volume, volume_spec, compose_dir) volume_spec_fixedup = volume_spec if Path(volume_spec).is_absolute() else f".{volume_spec}"
new_volume_spec = {"driver": "local", _create_bind_dir_if_relative(volume, volume_spec, compose_dir)
"driver_opts": { new_volume_spec = {"driver": "local",
"type": "none", "driver_opts": {
"device": volume_spec_fixedup, "type": "none",
"o": "bind" "device": volume_spec_fixedup,
} "o": "bind"
} }
pod["volumes"][volume] = new_volume_spec }
pod["volumes"][volume] = new_volume_spec
# Fix up ports
if "ports" in spec["pods"][pod_name]:
for container_name, container_ports in spec["pods"][pod_name]["ports"].items():
pod["services"][container_name]["ports"] = container_ports
def call_stack_deploy_init(deploy_command_context): def call_stack_deploy_init(deploy_command_context):
@ -148,12 +169,24 @@ def init(ctx, output):
spec_file_content.update(default_spec_file_content) spec_file_content.update(default_spec_file_content)
if verbose: if verbose:
print(f"Creating spec file for stack: {stack}") print(f"Creating spec file for stack: {stack}")
named_volumes = _get_named_volumes(stack)
if named_volumes: parsed_stack = get_parsed_stack_config(stack)
volume_descriptors = {} pods = dict([ (p, {}) for p in parsed_stack["pods"]])
for named_volume in named_volumes:
volume_descriptors[named_volume] = f"./data/{named_volume}" named_volumes_by_pod = _get_named_volumes(stack)
spec_file_content["volumes"] = volume_descriptors if named_volumes_by_pod:
for pod_name in named_volumes_by_pod:
volume_descriptors = {}
for named_volume in named_volumes_by_pod[pod_name]:
volume_descriptors[named_volume] = f"./data/{named_volume}"
pods[pod_name]["volumes"] = volume_descriptors
ports_by_pod = _get_ports(stack)
if ports_by_pod:
for pod_name in ports_by_pod:
pods[pod_name]["ports"] = ports_by_pod[pod_name]
spec_file_content["pods"] = pods
with open(output, "w") as output_file: with open(output, "w") as output_file:
yaml.dump(spec_file_content, output_file) yaml.dump(spec_file_content, output_file)
@ -191,7 +224,7 @@ def create(ctx, spec_file, deployment_dir):
extra_config_dirs = _find_extra_config_dirs(parsed_pod_file, pod) extra_config_dirs = _find_extra_config_dirs(parsed_pod_file, pod)
if global_options(ctx).debug: if global_options(ctx).debug:
print(f"extra config dirs: {extra_config_dirs}") print(f"extra config dirs: {extra_config_dirs}")
_fixup_pod_file(parsed_pod_file, parsed_spec, destination_compose_dir) _fixup_pod_file(pod, parsed_pod_file, parsed_spec, destination_compose_dir)
with open(os.path.join(destination_compose_dir, os.path.basename(pod_file_path)), "w") as output_file: with open(os.path.join(destination_compose_dir, os.path.basename(pod_file_path)), "w") as output_file:
yaml.dump(parsed_pod_file, output_file) yaml.dump(parsed_pod_file, output_file)
# Copy the config files for the pod, if any # Copy the config files for the pod, if any