chore: fix incorrect otel timeout in harbor yaml template (#19120)

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

Signed-off-by: chlins <chenyuzh@vmware.com>

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:

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 %}

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

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

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

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

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

make/photon/prepare/models.py

@@ -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: