Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-23 10:45:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7268 from ninjadq/fix_clair_env_none_issue

Browse Source 
Fix: clair env file should using empty string is not exist
This commit is contained in:
Qian Deng 2019-04-02 10:25:26 +08:00 committed by GitHub
commit e93d931834
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,27 +146,16 @@ def parse_yaml_config(config_file_path):
config_dict['admiral_url'] = "" config_dict['admiral_url'] = ""
# Clair configs # Clair configs
clair_configs = configs.get("clair") clair_configs = configs.get("clair") or {}
if clair_configs: config_dict['clair_db_password'] = clair_configs.get("db_password") or ''
config_dict['clair_db_password'] = clair_configs.get("db_password") config_dict['clair_db_host'] = clair_configs.get("db_host") or ''
config_dict['clair_db_host'] = clair_configs.get("db_host") config_dict['clair_db_port'] = clair_configs.get("db_port") or ''
config_dict['clair_db_port'] = clair_configs.get("db_port") config_dict['clair_db_username'] = clair_configs.get("db_username") or ''
config_dict['clair_db_username'] = clair_configs.get("db_username") config_dict['clair_db'] = clair_configs.get("db") or ''
config_dict['clair_db'] = clair_configs.get("db") config_dict['clair_updaters_interval'] = clair_configs.get("updaters_interval") or ''
config_dict['clair_updaters_interval'] = clair_configs.get("updaters_interval") config_dict['clair_http_proxy'] = clair_configs.get('http_proxy') or ''
config_dict['clair_http_proxy'] = clair_configs.get('http_proxy') config_dict['clair_https_proxy'] = clair_configs.get('https_proxy') or ''
config_dict['clair_https_proxy'] = clair_configs.get('https_proxy') config_dict['clair_no_proxy'] = clair_configs.get('no_proxy') or ''
config_dict['clair_no_proxy'] = clair_configs.get('no_proxy')
else:
config_dict['clair_db_password'] = ''
config_dict['clair_db_host'] = ''
config_dict['clair_db_port'] = ''
config_dict['clair_db_username'] = ''
config_dict['clair_db'] = ''
config_dict['clair_updaters_interval'] = ''
config_dict['clair_http_proxy'] = ''
config_dict['clair_https_proxy'] = ''
config_dict['clair_no_proxy'] = ''
# UAA configs # UAA configs
config_dict['uaa_endpoint'] = configs.get("uaa_endpoint") config_dict['uaa_endpoint'] = configs.get("uaa_endpoint")