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

[cherry-pick] chore: fix incorrect otel timeout in harbor yaml template (#19123)

Browse Source 
chore: fix incorrect otel timeout in harbor yaml template

Update the incorrect otel timeout sample value in the harbor YAML
configuration template.

Signed-off-by: chlins <chenyuzh@vmware.com>
This commit is contained in:
Chlins Zhang 2023-08-15 10:38:34 +08:00 committed by GitHub
parent 8ad19e785b
commit 6050cb6325
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
make/harbor.yml.tmpl
View File

@ -240,7 +240,8 @@ proxy:
# # url_path: /v1/traces
# # compression: false
# # insecure: true
# # timeout: 10s
# # # timeout is in seconds
# # timeout: 10
# Enable purge _upload directories
upload_purging:

6
make/photon/prepare/migrations/version_2_4_0/harbor.yml.jinja
View File

@ -495,7 +495,8 @@ trace:
# url_path: /v1/traces
# compression: false
# insecure: true
# timeout: 10s
# # timeout is in seconds
# timeout: 10
{% endif%}
{% else %}
# trace:
@ -518,5 +519,6 @@ trace:
# # url_path: /v1/traces
# # compression: false
# # insecure: true
# # timeout: 10s
# # # timeout is in seconds
# # timeout: 10
{% endif %}

6
make/photon/prepare/migrations/version_2_5_0/harbor.yml.jinja
View File

@ -509,7 +509,8 @@ trace:
# url_path: /v1/traces
# compression: false
# insecure: true
# timeout: 10s
# # timeout is in seconds
# timeout: 10
{% endif%}
{% else %}
# trace:
@ -532,7 +533,8 @@ trace:
# # url_path: /v1/traces
# # compression: false
# # insecure: true
# # timeout: 10s
# # # timeout is in seconds
# # timeout: 10
{% endif %}
# enable purge _upload directories

6
make/photon/prepare/migrations/version_2_6_0/harbor.yml.jinja
View File

@ -509,7 +509,8 @@ trace:
# url_path: /v1/traces
# compression: false
# insecure: true
# timeout: 10s
# # timeout is in seconds
# timeout: 10
{% endif%}
{% else %}
# trace:
@ -532,7 +533,8 @@ trace:
# # url_path: /v1/traces
# # compression: false
# # insecure: true
# # timeout: 10s
# # # timeout is in seconds
# # timeout: 10
{% endif %}
# enable purge _upload directories

6
make/photon/prepare/migrations/version_2_7_0/harbor.yml.jinja
View File

@ -516,7 +516,8 @@ trace:
# url_path: /v1/traces
# compression: false
# insecure: true
# timeout: 10s
# # timeout is in seconds
# timeout: 10
{% endif%}
{% else %}
# trace:
@ -539,7 +540,8 @@ trace:
# # url_path: /v1/traces
# # compression: false
# # insecure: true
# # timeout: 10s
# # # timeout is in seconds
# # timeout: 10
{% endif %}
# enable purge _upload directories

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

@ -534,7 +534,8 @@ trace:
# url_path: /v1/traces
# compression: false
# insecure: true
# timeout: 10s
# # timeout is in seconds
# timeout: 10
{% endif%}
{% else %}
# trace:
@ -557,7 +558,8 @@ trace:
# # url_path: /v1/traces
# # compression: false
# # insecure: true
# # timeout: 10s
# # # timeout is in seconds
# # timeout: 10
{% endif %}
# enable purge _upload directories

6
make/photon/prepare/migrations/version_2_9_0/harbor.yml.jinja
View File

@ -527,7 +527,8 @@ trace:
# url_path: /v1/traces
# compression: false
# insecure: true
# timeout: 10s
# # timeout is in seconds
# timeout: 10
{% endif%}
{% else %}
# trace:
@ -550,7 +551,8 @@ trace:
# # url_path: /v1/traces
# # compression: false
# # insecure: true
# # timeout: 10s
# # # timeout is in seconds
# # timeout: 10
{% endif %}
# enable purge _upload directories

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

@ -165,7 +165,7 @@ class OtelExporter:
self.url_path = config.get('url_path')
self.compression = config.get('compression') or False
self.insecure = config.get('insecure') or False
self.timeout = config.get('timeout') or '10s'
self.timeout = config.get('timeout') or '10'
def validate(self):
if not self.endpoint: