snowball/stack-orchestrator
2
0
Fork 0
forked from cerc-io/stack-orchestrator
Code Pull Requests Activity

Tweaks for running the container registry in k8s (#760)

Browse Source 
Minor tweaks for running the container-registry in k8s.  The big change is not requiring --image-registry.

Reviewed-on: cerc-io/stack-orchestrator#760
Reviewed-by: David Boreham <dboreham@noreply.git.vdb.to>
This commit is contained in:
Thomas E Lackey 2024-02-22 21:11:06 +00:00
parent 7bb86cf35e
commit 2af6ffce77
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stack_orchestrator/data/compose/docker-compose-container-registry.yml
View File

@ -5,9 +5,11 @@ services:
environment: environment:
REGISTRY_LOG_LEVEL: ${REGISTRY_LOG_LEVEL} REGISTRY_LOG_LEVEL: ${REGISTRY_LOG_LEVEL}
volumes: volumes:
- config:/config:ro
- registry-data:/var/lib/registry - registry-data:/var/lib/registry
ports: ports:
- "5000" - "5000"
volumes: volumes:
config:
registry-data: registry-data:

12
stack_orchestrator/deploy/deployment_create.py
View File

@ -327,12 +327,14 @@ def init_operation(deploy_command_context, stack, deployer_type, config,
default_spec_file_content = call_stack_deploy_init(deploy_command_context) default_spec_file_content = call_stack_deploy_init(deploy_command_context)
spec_file_content = {"stack": stack, constants.deploy_to_key: deployer_type} spec_file_content = {"stack": stack, constants.deploy_to_key: deployer_type}
if deployer_type == "k8s": if deployer_type == "k8s":
if kube_config is None: if kube_config:
spec_file_content.update({constants.kube_config_key: kube_config})
else:
error_exit("--kube-config must be supplied with --deploy-to k8s") error_exit("--kube-config must be supplied with --deploy-to k8s")
if image_registry is None: if image_registry:
error_exit("--image-registry must be supplied with --deploy-to k8s") spec_file_content.update({constants.image_registry_key: image_registry})
spec_file_content.update({constants.kube_config_key: kube_config}) else:
spec_file_content.update({constants.image_registry_key: image_registry}) print("WARNING: --image-registry not specified, only default container registries (eg, Docker Hub) will be available")
else: else:
# Check for --kube-config supplied for non-relevant deployer types # Check for --kube-config supplied for non-relevant deployer types
if kube_config is not None: if kube_config is not None: