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

Add logic to read clair and notary config

Browse Source 
Signed-off-by: DQ <dengq@vmware.com>
This commit is contained in:
DQ 2019-09-03 12:45:46 +08:00
parent 8fd8c5f345
commit 495a257ab5
2 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/photon/prepare/main.py
View File

@ -29,7 +29,7 @@ old_private_key_pem_path, old_crt_path)
def main(conf, with_notary, with_clair, with_chartmuseum): def main(conf, with_notary, with_clair, with_chartmuseum):
delfile(config_dir) delfile(config_dir)
config_dict = parse_yaml_config(conf) config_dict = parse_yaml_config(conf, with_notary=with_notary, with_clair=with_clair, with_chartmuseum=with_chartmuseum)
validate(config_dict, notary_mode=with_notary) validate(config_dict, notary_mode=with_notary)
prepare_log_configs(config_dict) prepare_log_configs(config_dict)

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

@ -56,7 +56,7 @@ def parse_versions():
versions = yaml.load(f) versions = yaml.load(f)
return versions return versions
def parse_yaml_config(config_file_path): def parse_yaml_config(config_file_path, with_notary, with_clair, with_chartmuseum):
''' '''
:param configs: config_parser object :param configs: config_parser object
:returns: dict of configs :returns: dict of configs
@ -117,27 +117,31 @@ def parse_yaml_config(config_file_path):
config_dict['harbor_db_sslmode'] = 'disable' config_dict['harbor_db_sslmode'] = 'disable'
config_dict['harbor_db_max_idle_conns'] = db_configs.get("max_idle_conns") or default_db_max_idle_conns config_dict['harbor_db_max_idle_conns'] = db_configs.get("max_idle_conns") or default_db_max_idle_conns
config_dict['harbor_db_max_open_conns'] = db_configs.get("max_open_conns") or default_db_max_open_conns config_dict['harbor_db_max_open_conns'] = db_configs.get("max_open_conns") or default_db_max_open_conns
# clari db
config_dict['clair_db_host'] = 'postgresql' if with_clair:
config_dict['clair_db_port'] = 5432 # clair db
config_dict['clair_db_name'] = 'postgres' config_dict['clair_db_host'] = 'postgresql'
config_dict['clair_db_username'] = 'postgres' config_dict['clair_db_port'] = 5432
config_dict['clair_db_password'] = db_configs.get("password") or '' config_dict['clair_db_name'] = 'postgres'
config_dict['clair_db_sslmode'] = 'disable' config_dict['clair_db_username'] = 'postgres'
# notary signer config_dict['clair_db_password'] = db_configs.get("password") or ''
config_dict['notary_signer_db_host'] = 'postgresql' config_dict['clair_db_sslmode'] = 'disable'
config_dict['notary_signer_db_port'] = 5432
config_dict['notary_signer_db_name'] = 'notarysigner' if with_notary:
config_dict['notary_signer_db_username'] = 'signer' # notary signer
config_dict['notary_signer_db_password'] = 'password' config_dict['notary_signer_db_host'] = 'postgresql'
config_dict['notary_signer_db_sslmode'] = 'disable' config_dict['notary_signer_db_port'] = 5432
# notary server config_dict['notary_signer_db_name'] = 'notarysigner'
config_dict['notary_server_db_host'] = 'postgresql' config_dict['notary_signer_db_username'] = 'signer'
config_dict['notary_server_db_port'] = 5432 config_dict['notary_signer_db_password'] = 'password'
config_dict['notary_server_db_name'] = 'notaryserver' config_dict['notary_signer_db_sslmode'] = 'disable'
config_dict['notary_server_db_username'] = 'server' # notary server
config_dict['notary_server_db_password'] = 'password' config_dict['notary_server_db_host'] = 'postgresql'
config_dict['notary_server_db_sslmode'] = 'disable' config_dict['notary_server_db_port'] = 5432
config_dict['notary_server_db_name'] = 'notaryserver'
config_dict['notary_server_db_username'] = 'server'
config_dict['notary_server_db_password'] = 'password'
config_dict['notary_server_db_sslmode'] = 'disable'
# Data path volume # Data path volume
@ -240,27 +244,30 @@ def parse_yaml_config(config_file_path):
config_dict['harbor_db_sslmode'] = external_db_configs['harbor']['ssl_mode'] config_dict['harbor_db_sslmode'] = external_db_configs['harbor']['ssl_mode']
config_dict['harbor_db_max_idle_conns'] = external_db_configs['harbor'].get("max_idle_conns") or default_db_max_idle_conns config_dict['harbor_db_max_idle_conns'] = external_db_configs['harbor'].get("max_idle_conns") or default_db_max_idle_conns
config_dict['harbor_db_max_open_conns'] = external_db_configs['harbor'].get("max_open_conns") or default_db_max_open_conns config_dict['harbor_db_max_open_conns'] = external_db_configs['harbor'].get("max_open_conns") or default_db_max_open_conns
# clair db
config_dict['clair_db_host'] = external_db_configs['clair']['host'] if with_clair:
config_dict['clair_db_port'] = external_db_configs['clair']['port'] # clair db
config_dict['clair_db_name'] = external_db_configs['clair']['db_name'] config_dict['clair_db_host'] = external_db_configs['clair']['host']
config_dict['clair_db_username'] = external_db_configs['clair']['username'] config_dict['clair_db_port'] = external_db_configs['clair']['port']
config_dict['clair_db_password'] = external_db_configs['clair']['password'] config_dict['clair_db_name'] = external_db_configs['clair']['db_name']
config_dict['clair_db_sslmode'] = external_db_configs['clair']['ssl_mode'] config_dict['clair_db_username'] = external_db_configs['clair']['username']
# notary signer config_dict['clair_db_password'] = external_db_configs['clair']['password']
config_dict['notary_signer_db_host'] = external_db_configs['notary_signer']['host'] config_dict['clair_db_sslmode'] = external_db_configs['clair']['ssl_mode']
config_dict['notary_signer_db_port'] = external_db_configs['notary_signer']['port'] if with_notary:
config_dict['notary_signer_db_name'] = external_db_configs['notary_signer']['db_name'] # notary signer
config_dict['notary_signer_db_username'] = external_db_configs['notary_signer']['username'] config_dict['notary_signer_db_host'] = external_db_configs['notary_signer']['host']
config_dict['notary_signer_db_password'] = external_db_configs['notary_signer']['password'] config_dict['notary_signer_db_port'] = external_db_configs['notary_signer']['port']
config_dict['notary_signer_db_sslmode'] = external_db_configs['notary_signer']['ssl_mode'] config_dict['notary_signer_db_name'] = external_db_configs['notary_signer']['db_name']
# notary server config_dict['notary_signer_db_username'] = external_db_configs['notary_signer']['username']
config_dict['notary_server_db_host'] = external_db_configs['notary_server']['host'] config_dict['notary_signer_db_password'] = external_db_configs['notary_signer']['password']
config_dict['notary_server_db_port'] = external_db_configs['notary_server']['port'] config_dict['notary_signer_db_sslmode'] = external_db_configs['notary_signer']['ssl_mode']
config_dict['notary_server_db_name'] = external_db_configs['notary_server']['db_name'] # notary server
config_dict['notary_server_db_username'] = external_db_configs['notary_server']['username'] config_dict['notary_server_db_host'] = external_db_configs['notary_server']['host']
config_dict['notary_server_db_password'] = external_db_configs['notary_server']['password'] config_dict['notary_server_db_port'] = external_db_configs['notary_server']['port']
config_dict['notary_server_db_sslmode'] = external_db_configs['notary_server']['ssl_mode'] config_dict['notary_server_db_name'] = external_db_configs['notary_server']['db_name']
config_dict['notary_server_db_username'] = external_db_configs['notary_server']['username']
config_dict['notary_server_db_password'] = external_db_configs['notary_server']['password']
config_dict['notary_server_db_sslmode'] = external_db_configs['notary_server']['ssl_mode']
else: else:
config_dict['external_database'] = False config_dict['external_database'] = False