Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-01-05 07:27:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10815 from cd1989/redis-idle-timeout

Browse Source 
Set redis idle timeout for core
This commit is contained in:
Wenkai Yin(尹文开) 2020-03-03 14:10:22 +08:00 committed by GitHub
commit 4fa4c4e74c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
make/harbor.yml.tmpl
View File

@ -142,6 +142,7 @@ _version: 1.10.0
# chartmuseum_db_index: 3 # chartmuseum_db_index: 3
# clair_db_index: 4 # clair_db_index: 4
# trivy_db_index: 5 # trivy_db_index: 5
# idle_timeout_seconds: 30
# Uncomment uaa for trusting the certificate of uaa instance that is hosted via self-signed cert. # Uncomment uaa for trusting the certificate of uaa instance that is hosted via self-signed cert.
# uaa: # uaa:

2
make/photon/prepare/templates/core/env.jinja
View File

@ -1,6 +1,6 @@
CONFIG_PATH=/etc/core/app.conf CONFIG_PATH=/etc/core/app.conf
UAA_CA_ROOT=/etc/core/certificates/uaa_ca.pem UAA_CA_ROOT=/etc/core/certificates/uaa_ca.pem
_REDIS_URL={{redis_host}}:{{redis_port}},100,{{redis_password}} _REDIS_URL={{redis_host}}:{{redis_port}},100,{{redis_password}},0,{{redis_idle_timeout_seconds}}
SYNC_QUOTA=true SYNC_QUOTA=true
CHART_CACHE_DRIVER={{chart_cache_driver}} CHART_CACHE_DRIVER={{chart_cache_driver}}
_REDIS_URL_REG={{redis_url_reg}} _REDIS_URL_REG={{redis_url_reg}}

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

@ -395,6 +395,7 @@ def get_redis_configs(external_redis=None, with_clair=True, with_trivy=True):
'chartmuseum_db_index': 3, 'chartmuseum_db_index': 3,
'clair_db_index': 4, 'clair_db_index': 4,
'trivy_db_index': 5, 'trivy_db_index': 5,
'idle_timeout_seconds': 30,
} }
# overwriting existing keys by external_redis # overwriting existing keys by external_redis
@ -406,6 +407,7 @@ def get_redis_configs(external_redis=None, with_clair=True, with_trivy=True):
configs['redis_db_index_reg'] = redis['registry_db_index'] configs['redis_db_index_reg'] = redis['registry_db_index']
configs['redis_db_index_js'] = redis['jobservice_db_index'] configs['redis_db_index_js'] = redis['jobservice_db_index']
configs['redis_db_index_chart'] = redis['chartmuseum_db_index'] configs['redis_db_index_chart'] = redis['chartmuseum_db_index']
configs['redis_idle_timeout_seconds'] = redis['idle_timeout_seconds']
configs['redis_url_js'] = get_redis_url(configs['redis_db_index_js'], redis) configs['redis_url_js'] = get_redis_url(configs['redis_db_index_js'], redis)
configs['redis_url_reg'] = get_redis_url(configs['redis_db_index_reg'], redis) configs['redis_url_reg'] = get_redis_url(configs['redis_db_index_reg'], redis)