From 170b834c2b69a4ecabd80e00495651c256e55590 Mon Sep 17 00:00:00 2001 From: chlins Date: Tue, 8 Aug 2023 10:02:29 +0800 Subject: [PATCH] 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 --- make/harbor.yml.tmpl | 3 ++- .../prepare/migrations/version_2_4_0/harbor.yml.jinja | 6 ++++-- .../prepare/migrations/version_2_5_0/harbor.yml.jinja | 6 ++++-- .../prepare/migrations/version_2_6_0/harbor.yml.jinja | 6 ++++-- .../prepare/migrations/version_2_7_0/harbor.yml.jinja | 6 ++++-- .../prepare/migrations/version_2_8_0/harbor.yml.jinja | 6 ++++-- .../prepare/migrations/version_2_9_0/harbor.yml.jinja | 6 ++++-- make/photon/prepare/models.py | 2 +- 8 files changed, 27 insertions(+), 14 deletions(-) diff --git a/make/harbor.yml.tmpl b/make/harbor.yml.tmpl index 457d24e5388..cc5db0fbed9 100644 --- a/make/harbor.yml.tmpl +++ b/make/harbor.yml.tmpl @@ -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: diff --git a/make/photon/prepare/migrations/version_2_4_0/harbor.yml.jinja b/make/photon/prepare/migrations/version_2_4_0/harbor.yml.jinja index 26100256d26..2b761d6fed2 100644 --- a/make/photon/prepare/migrations/version_2_4_0/harbor.yml.jinja +++ b/make/photon/prepare/migrations/version_2_4_0/harbor.yml.jinja @@ -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 %} diff --git a/make/photon/prepare/migrations/version_2_5_0/harbor.yml.jinja b/make/photon/prepare/migrations/version_2_5_0/harbor.yml.jinja index e6bec1d9c39..ab02ac47ef6 100644 --- a/make/photon/prepare/migrations/version_2_5_0/harbor.yml.jinja +++ b/make/photon/prepare/migrations/version_2_5_0/harbor.yml.jinja @@ -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 diff --git a/make/photon/prepare/migrations/version_2_6_0/harbor.yml.jinja b/make/photon/prepare/migrations/version_2_6_0/harbor.yml.jinja index 4dafe665efb..1b91abc7f82 100644 --- a/make/photon/prepare/migrations/version_2_6_0/harbor.yml.jinja +++ b/make/photon/prepare/migrations/version_2_6_0/harbor.yml.jinja @@ -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 diff --git a/make/photon/prepare/migrations/version_2_7_0/harbor.yml.jinja b/make/photon/prepare/migrations/version_2_7_0/harbor.yml.jinja index b62eaedd896..59daf5ae9f1 100644 --- a/make/photon/prepare/migrations/version_2_7_0/harbor.yml.jinja +++ b/make/photon/prepare/migrations/version_2_7_0/harbor.yml.jinja @@ -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 diff --git a/make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja b/make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja index 17fabd8ab17..bea786619cb 100644 --- a/make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja +++ b/make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja @@ -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 diff --git a/make/photon/prepare/migrations/version_2_9_0/harbor.yml.jinja b/make/photon/prepare/migrations/version_2_9_0/harbor.yml.jinja index 56887fdb5f1..718353ae6bc 100644 --- a/make/photon/prepare/migrations/version_2_9_0/harbor.yml.jinja +++ b/make/photon/prepare/migrations/version_2_9_0/harbor.yml.jinja @@ -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 diff --git a/make/photon/prepare/models.py b/make/photon/prepare/models.py index d60246184c8..76e20dbf63b 100644 --- a/make/photon/prepare/models.py +++ b/make/photon/prepare/models.py @@ -165,7 +165,7 @@ def __init__(self, config: dict): 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: