upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2025-04-22 02:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add chart absolute url item in config

Browse Source 
Add a config item to enable and disalbe chart_url

Signed-off-by: Qian Deng <dengq@vmware.com>
This commit is contained in:
Qian Deng 2019-05-08 12:59:44 +08:00
parent cd6c5a9f10
commit 3022b617f2
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
make/harbor.yml
View File

@ -64,6 +64,9 @@ jobservice:
# Maximum number of job workers in job service # Maximum number of job workers in job service
max_job_workers: 10 max_job_workers: 10
chart:
absolute_url: disabled
# Log configurations # Log configurations
log: log:
# options are debug, info, warn, error # options are debug, info, warn, error

4
make/photon/prepare/templates/chartserver/env.jinja
View File

@ -28,7 +28,11 @@ DISABLE_METRICS=false
DISABLE_API=false DISABLE_API=false
DISABLE_STATEFILES=false DISABLE_STATEFILES=false
ALLOW_OVERWRITE=true ALLOW_OVERWRITE=true
{% if chart_absolute_url %}
CHART_URL={{public_url}}/chartrepo CHART_URL={{public_url}}/chartrepo
{% else %}
CHART_URL=
{% endif %}
AUTH_ANONYMOUS_GET=false AUTH_ANONYMOUS_GET=false
TLS_CERT= TLS_CERT=
TLS_KEY= TLS_KEY=

3
make/photon/prepare/utils/chart.py
View File

@ -100,4 +100,5 @@ def prepare_chartmuseum(config_dict):
core_secret=config_dict['core_secret'], core_secret=config_dict['core_secret'],
storage_driver=storage_driver, storage_driver=storage_driver,
all_storage_driver_configs=all_storage_provider_configs, all_storage_driver_configs=all_storage_provider_configs,
public_url=config_dict['public_url']) public_url=config_dict['public_url'],
chart_absolute_url=config_dict['chart_absolute_url'])

4
make/photon/prepare/utils/configs.py
View File

@ -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_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' 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 # jobservice config
js_config = configs.get('jobservice') or {} js_config = configs.get('jobservice') or {}
config_dict['max_job_workers'] = js_config["max_job_workers"] config_dict['max_job_workers'] = js_config["max_job_workers"]