Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-01 22:54:20 +01:00
Code Issues Projects Releases Wiki Activity

Enhance: remove the reload key item

Browse Source 
Remove the reload_config item in config file

Signed-off-by: Qian Deng <dengq@vmware.com>
This commit is contained in:
Qian Deng 2019-04-01 14:23:31 +08:00
parent cd65b68ab3
commit ac1b7bb1fb
3 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
make/photon/prepare/templates/core/config_env.jinja
View File

@ -48,7 +48,6 @@ CLAIR_DB_PORT={{clair_db_port}}
CLAIR_DB_USERNAME={{clair_db_username}} CLAIR_DB_USERNAME={{clair_db_username}}
CLAIR_DB={{clair_db}} CLAIR_DB={{clair_db}}
CLAIR_DB_SSLMODE=disable CLAIR_DB_SSLMODE=disable
RESET={{reload_config}}
UAA_ENDPOINT={{uaa_endpoint}} UAA_ENDPOINT={{uaa_endpoint}}
UAA_CLIENTID={{uaa_clientid}} UAA_CLIENTID={{uaa_clientid}}
UAA_CLIENTSECRET={{uaa_clientsecret}} UAA_CLIENTSECRET={{uaa_clientsecret}}

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

@ -70,11 +70,6 @@ def parse_yaml_config(config_file_path):
config_dict['notary_url'] = "http://notary-server:4443" config_dict['notary_url'] = "http://notary-server:4443"
config_dict['chart_repository_url'] = "http://chartmuseum:9999" config_dict['chart_repository_url'] = "http://chartmuseum:9999"
if configs.get("reload_config"):
config_dict['reload_config'] = configs.get("reload_config")
else:
config_dict['reload_config'] = "false"
config_dict['hostname'] = configs.get("hostname") config_dict['hostname'] = configs.get("hostname")
config_dict['protocol'] = configs.get("ui_url_protocol") config_dict['protocol'] = configs.get("ui_url_protocol")
config_dict['public_url'] = config_dict['protocol'] + "://" + config_dict['hostname'] config_dict['public_url'] = config_dict['protocol'] + "://" + config_dict['hostname']

2
make/photon/prepare/utils/core.py
View File

@ -43,7 +43,6 @@ def copy_core_config(core_templates_path, core_config_path):
def render_config_env(config_dict, with_notary, with_clair, with_chartmuseum): def render_config_env(config_dict, with_notary, with_clair, with_chartmuseum):
# Use reload_key to avoid reload config after restart harbor # Use reload_key to avoid reload config after restart harbor
reload_key = generate_random_string(6) if config_dict['reload_config'] == "true" else ""
render_jinja( render_jinja(
core_config_env_template, core_config_env_template,
@ -51,6 +50,5 @@ def render_config_env(config_dict, with_notary, with_clair, with_chartmuseum):
with_notary=with_notary, with_notary=with_notary,
with_clair=with_clair, with_clair=with_clair,
with_chartmuseum=with_chartmuseum, with_chartmuseum=with_chartmuseum,
reload_key=reload_key,
**config_dict **config_dict
) )