Tweaks for running the container registry in k8s
All checks were successful
Lint Checks / Run linter (pull_request) Successful in 37s
Webapp Test / Run webapp test suite (pull_request) Successful in 3m28s
Deploy Test / Run deploy test suite (pull_request) Successful in 5m37s
Smoke Test / Run basic test suite (pull_request) Successful in 4m18s
K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Successful in 8m57s

This commit is contained in:
Thomas E Lackey 2024-02-22 15:04:12 -06:00
parent 642c0ead0d
commit d4c5961bba
2 changed files with 9 additions and 5 deletions

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:

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:
error_exit("--kube-config must be supplied with --deploy-to k8s")
if image_registry is None:
error_exit("--image-registry must be supplied with --deploy-to k8s")
spec_file_content.update({constants.kube_config_key: kube_config}) spec_file_content.update({constants.kube_config_key: kube_config})
else:
error_exit("--kube-config must be supplied with --deploy-to k8s")
if image_registry:
spec_file_content.update({constants.image_registry_key: image_registry}) spec_file_content.update({constants.image_registry_key: image_registry})
else:
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: