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

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

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:09:41 +08:00 committed by GitHub
parent adf8c73b3b
commit 0de5006edf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
make/harbor.yml.tmpl
View File

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

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

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

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

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

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

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

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

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

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

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

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

@ -172,7 +172,7 @@ class OtelExporter:
self.url_path = config.get('url_path') self.url_path = config.get('url_path')
self.compression = config.get('compression') or False self.compression = config.get('compression') or False
self.insecure = config.get('insecure') 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): def validate(self):
if not self.endpoint: if not self.endpoint: