From 8476e07d751732abbc14688a58a13729103b5361 Mon Sep 17 00:00:00 2001 From: Chlins Zhang Date: Wed, 16 Aug 2023 15:05:34 +0800 Subject: [PATCH] [cherry-pick] chore: fix incorrect otel timeout in harbor yaml template (#19121) 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 ++++-- make/photon/prepare/models.py | 2 +- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/make/harbor.yml.tmpl b/make/harbor.yml.tmpl index 7c953b9c6..803a91dd1 100644 --- a/make/harbor.yml.tmpl +++ b/make/harbor.yml.tmpl @@ -244,7 +244,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 2b2ac793c..88dcc30d6 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 @@ -493,7 +493,8 @@ trace: # url_path: /v1/traces # compression: false # insecure: true - # timeout: 10s + # # timeout is in seconds + # timeout: 10 {% endif%} {% else %} # trace: @@ -516,5 +517,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 5e7b63e15..fef21449a 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 @@ -507,7 +507,8 @@ trace: # url_path: /v1/traces # compression: false # insecure: true - # timeout: 10s + # # timeout is in seconds + # timeout: 10 {% endif%} {% else %} # trace: @@ -530,7 +531,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 b97c0a34b..3fbba6d58 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 @@ -507,7 +507,8 @@ trace: # url_path: /v1/traces # compression: false # insecure: true - # timeout: 10s + # # timeout is in seconds + # timeout: 10 {% endif%} {% else %} # trace: @@ -530,7 +531,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 3be0173c1..f19afb939 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 @@ -514,7 +514,8 @@ trace: # url_path: /v1/traces # compression: false # insecure: true - # timeout: 10s + # # timeout is in seconds + # timeout: 10 {% endif%} {% else %} # trace: @@ -537,7 +538,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 1e04b8f95..6e6b71920 100644 --- a/make/photon/prepare/models.py +++ b/make/photon/prepare/models.py @@ -179,7 +179,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: