diff --git a/make/harbor.yml b/make/harbor.yml index 3d41187b4..36181fe07 100644 --- a/make/harbor.yml +++ b/make/harbor.yml @@ -64,6 +64,9 @@ jobservice: # Maximum number of job workers in job service max_job_workers: 10 +chart: + absolute_url: disabled + # Log configurations log: # options are debug, info, warn, error diff --git a/make/photon/prepare/templates/chartserver/env.jinja b/make/photon/prepare/templates/chartserver/env.jinja index d2a5fb9dd..e9d7f98b1 100644 --- a/make/photon/prepare/templates/chartserver/env.jinja +++ b/make/photon/prepare/templates/chartserver/env.jinja @@ -28,7 +28,11 @@ DISABLE_METRICS=false DISABLE_API=false DISABLE_STATEFILES=false ALLOW_OVERWRITE=true +{% if chart_absolute_url %} CHART_URL={{public_url}}/chartrepo +{% else %} +CHART_URL= +{% endif %} AUTH_ANONYMOUS_GET=false TLS_CERT= TLS_KEY= diff --git a/make/photon/prepare/utils/chart.py b/make/photon/prepare/utils/chart.py index f0c07c469..942cb7b35 100644 --- a/make/photon/prepare/utils/chart.py +++ b/make/photon/prepare/utils/chart.py @@ -100,4 +100,5 @@ def prepare_chartmuseum(config_dict): core_secret=config_dict['core_secret'], storage_driver=storage_driver, all_storage_driver_configs=all_storage_provider_configs, - public_url=config_dict['public_url']) \ No newline at end of file + public_url=config_dict['public_url'], + chart_absolute_url=config_dict['chart_absolute_url']) \ No newline at end of file diff --git a/make/photon/prepare/utils/configs.py b/make/photon/prepare/utils/configs.py index c0b849300..48ca7e6a8 100644 --- a/make/photon/prepare/utils/configs.py +++ b/make/photon/prepare/utils/configs.py @@ -170,6 +170,10 @@ def parse_yaml_config(config_file_path): config_dict['clair_https_proxy'] = clair_configs.get('https_proxy') or '' config_dict['clair_no_proxy'] = clair_configs.get('no_proxy') or '127.0.0.1,localhost,core,registry' + # Chart configs + chart_configs = configs.get("chart") or {} + config_dict['chart_absolute_url'] = chart_configs.get('absolute_url') or '' + # jobservice config js_config = configs.get('jobservice') or {} config_dict['max_job_workers'] = js_config["max_job_workers"]