upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-20 15:25:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change storage_service.redirect.disabled in harbor.yml.tmpl to storage_service.redirect.deactivate (#14615)

Browse Source 
* set to disable

Signed-off-by: Peter Jakubis <balonik32@gmail.com>

* move pr-14615 prepare migration version from 2.7.0 to 2.8.0

Signed-off-by: yminer <yminer@vmware.com>

---------

Signed-off-by: Peter Jakubis <balonik32@gmail.com>
Signed-off-by: yminer <yminer@vmware.com>
Co-authored-by: Peter Jakubis <peter.jakubis@piano.io>
Co-authored-by: Vadim Bauer <vb@container-registry.com>
Co-authored-by: Wang Yan <wangyan@vmware.com>
Co-authored-by: yminer <yminer@vmware.com>
This commit is contained in:
Peter Jakubis 2023-03-22 06:55:22 +01:00 committed by GitHub
parent 2f380495bf
commit 284d58453c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/harbor.yml.tmpl
View File

@ -65,7 +65,7 @@ data_volume: /data
# maxthreads: 100
# # set disable to true when you want to disable registry redirect
# redirect:
# disabled: false
# disable: false
# Trivy configuration
#

8
make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja
View File

@ -105,7 +105,11 @@ storage_service:
{% elif key == 'redirect' %}
# # set disable to true when you want to disable registry redirect
redirect:
disabled: {{ value.disabled }}
{% if value.disabled is not none %}
disable: {{ value.disabled }}
{% else %}
disable: {{ value.disable }}
{% endif %}
{% else %}
# # storage backend, default is filesystem, options include filesystem, azure, gcs, s3, swift and oss
# # for more info about this configuration please refer https://docs.docker.com/registry/configuration/
@ -129,7 +133,7 @@ storage_service:
# maxthreads: 100
# # set disable to true when you want to disable registry redirect
# redirect:
# disabled: false
# disable: false
{% endif %}
# Trivy configuration

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

@ -210,7 +210,7 @@ def parse_yaml_config(config_file_path, with_notary, with_trivy):
config_dict['storage_provider_config'] = {}
if storage_config.get('redirect'):
config_dict['storage_redirect_disabled'] = storage_config['redirect']['disabled']
config_dict['storage_redirect_disabled'] = storage_config['redirect']['disable']
# Global proxy configs
proxy_config = configs.get('proxy') or {}