Skip to content

Commit 514c86d

Browse files
authored
fix: use duration strings for http collector timeout (#1338)
* fix: use duration strings for http collector timeout This follows the same format that all other collectors use. * Update from PR comment
1 parent b9f4fc4 commit 514c86d

12 files changed

+212
-217
lines changed

config/crds/troubleshoot.sh_collectors.yaml

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -344,12 +344,10 @@ spec:
344344
insecureSkipVerify:
345345
type: boolean
346346
timeout:
347-
description: A Duration represents the elapsed time
348-
between two instants as an int64 nanosecond count.
349-
The representation limits the largest representable
350-
duration to approximately 290 years.
351-
format: int64
352-
type: integer
347+
description: Timeout is the time to wait for a server's
348+
response. Its a duration e.g 15s, 2h30m. Missing value
349+
or empty string or means no timeout.
350+
type: string
353351
url:
354352
type: string
355353
required:
@@ -368,12 +366,10 @@ spec:
368366
insecureSkipVerify:
369367
type: boolean
370368
timeout:
371-
description: A Duration represents the elapsed time
372-
between two instants as an int64 nanosecond count.
373-
The representation limits the largest representable
374-
duration to approximately 290 years.
375-
format: int64
376-
type: integer
369+
description: Timeout is the time to wait for a server's
370+
response. Its a duration e.g 15s, 2h30m. Missing value
371+
or empty string or means no timeout.
372+
type: string
377373
url:
378374
type: string
379375
required:
@@ -390,12 +386,10 @@ spec:
390386
insecureSkipVerify:
391387
type: boolean
392388
timeout:
393-
description: A Duration represents the elapsed time
394-
between two instants as an int64 nanosecond count.
395-
The representation limits the largest representable
396-
duration to approximately 290 years.
397-
format: int64
398-
type: integer
389+
description: Timeout is the time to wait for a server's
390+
response. Its a duration e.g 15s, 2h30m. Missing value
391+
or empty string or means no timeout.
392+
type: string
399393
url:
400394
type: string
401395
required:

config/crds/troubleshoot.sh_hostcollectors.yaml

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,12 +1261,10 @@ spec:
12611261
insecureSkipVerify:
12621262
type: boolean
12631263
timeout:
1264-
description: A Duration represents the elapsed time
1265-
between two instants as an int64 nanosecond count.
1266-
The representation limits the largest representable
1267-
duration to approximately 290 years.
1268-
format: int64
1269-
type: integer
1264+
description: Timeout is the time to wait for a server's
1265+
response. Its a duration e.g 15s, 2h30m. Missing value
1266+
or empty string or means no timeout.
1267+
type: string
12701268
url:
12711269
type: string
12721270
required:
@@ -1283,12 +1281,10 @@ spec:
12831281
insecureSkipVerify:
12841282
type: boolean
12851283
timeout:
1286-
description: A Duration represents the elapsed time
1287-
between two instants as an int64 nanosecond count.
1288-
The representation limits the largest representable
1289-
duration to approximately 290 years.
1290-
format: int64
1291-
type: integer
1284+
description: Timeout is the time to wait for a server's
1285+
response. Its a duration e.g 15s, 2h30m. Missing value
1286+
or empty string or means no timeout.
1287+
type: string
12921288
url:
12931289
type: string
12941290
required:
@@ -1305,12 +1301,10 @@ spec:
13051301
insecureSkipVerify:
13061302
type: boolean
13071303
timeout:
1308-
description: A Duration represents the elapsed time
1309-
between two instants as an int64 nanosecond count.
1310-
The representation limits the largest representable
1311-
duration to approximately 290 years.
1312-
format: int64
1313-
type: integer
1304+
description: Timeout is the time to wait for a server's
1305+
response. Its a duration e.g 15s, 2h30m. Missing value
1306+
or empty string or means no timeout.
1307+
type: string
13141308
url:
13151309
type: string
13161310
required:

config/crds/troubleshoot.sh_hostpreflights.yaml

Lines changed: 24 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,12 +1261,10 @@ spec:
12611261
insecureSkipVerify:
12621262
type: boolean
12631263
timeout:
1264-
description: A Duration represents the elapsed time
1265-
between two instants as an int64 nanosecond count.
1266-
The representation limits the largest representable
1267-
duration to approximately 290 years.
1268-
format: int64
1269-
type: integer
1264+
description: Timeout is the time to wait for a server's
1265+
response. Its a duration e.g 15s, 2h30m. Missing value
1266+
or empty string or means no timeout.
1267+
type: string
12701268
url:
12711269
type: string
12721270
required:
@@ -1283,12 +1281,10 @@ spec:
12831281
insecureSkipVerify:
12841282
type: boolean
12851283
timeout:
1286-
description: A Duration represents the elapsed time
1287-
between two instants as an int64 nanosecond count.
1288-
The representation limits the largest representable
1289-
duration to approximately 290 years.
1290-
format: int64
1291-
type: integer
1284+
description: Timeout is the time to wait for a server's
1285+
response. Its a duration e.g 15s, 2h30m. Missing value
1286+
or empty string or means no timeout.
1287+
type: string
12921288
url:
12931289
type: string
12941290
required:
@@ -1305,12 +1301,10 @@ spec:
13051301
insecureSkipVerify:
13061302
type: boolean
13071303
timeout:
1308-
description: A Duration represents the elapsed time
1309-
between two instants as an int64 nanosecond count.
1310-
The representation limits the largest representable
1311-
duration to approximately 290 years.
1312-
format: int64
1313-
type: integer
1304+
description: Timeout is the time to wait for a server's
1305+
response. Its a duration e.g 15s, 2h30m. Missing value
1306+
or empty string or means no timeout.
1307+
type: string
13141308
url:
13151309
type: string
13161310
required:
@@ -1691,12 +1685,10 @@ spec:
16911685
insecureSkipVerify:
16921686
type: boolean
16931687
timeout:
1694-
description: A Duration represents the elapsed time
1695-
between two instants as an int64 nanosecond count.
1696-
The representation limits the largest representable
1697-
duration to approximately 290 years.
1698-
format: int64
1699-
type: integer
1688+
description: Timeout is the time to wait for a server's
1689+
response. Its a duration e.g 15s, 2h30m. Missing value
1690+
or empty string or means no timeout.
1691+
type: string
17001692
url:
17011693
type: string
17021694
required:
@@ -1713,12 +1705,10 @@ spec:
17131705
insecureSkipVerify:
17141706
type: boolean
17151707
timeout:
1716-
description: A Duration represents the elapsed time
1717-
between two instants as an int64 nanosecond count.
1718-
The representation limits the largest representable
1719-
duration to approximately 290 years.
1720-
format: int64
1721-
type: integer
1708+
description: Timeout is the time to wait for a server's
1709+
response. Its a duration e.g 15s, 2h30m. Missing value
1710+
or empty string or means no timeout.
1711+
type: string
17221712
url:
17231713
type: string
17241714
required:
@@ -1735,12 +1725,10 @@ spec:
17351725
insecureSkipVerify:
17361726
type: boolean
17371727
timeout:
1738-
description: A Duration represents the elapsed time
1739-
between two instants as an int64 nanosecond count.
1740-
The representation limits the largest representable
1741-
duration to approximately 290 years.
1742-
format: int64
1743-
type: integer
1728+
description: Timeout is the time to wait for a server's
1729+
response. Its a duration e.g 15s, 2h30m. Missing value
1730+
or empty string or means no timeout.
1731+
type: string
17441732
url:
17451733
type: string
17461734
required:

config/crds/troubleshoot.sh_preflights.yaml

Lines changed: 24 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1841,12 +1841,10 @@ spec:
18411841
insecureSkipVerify:
18421842
type: boolean
18431843
timeout:
1844-
description: A Duration represents the elapsed time
1845-
between two instants as an int64 nanosecond count.
1846-
The representation limits the largest representable
1847-
duration to approximately 290 years.
1848-
format: int64
1849-
type: integer
1844+
description: Timeout is the time to wait for a server's
1845+
response. Its a duration e.g 15s, 2h30m. Missing value
1846+
or empty string or means no timeout.
1847+
type: string
18501848
url:
18511849
type: string
18521850
required:
@@ -1865,12 +1863,10 @@ spec:
18651863
insecureSkipVerify:
18661864
type: boolean
18671865
timeout:
1868-
description: A Duration represents the elapsed time
1869-
between two instants as an int64 nanosecond count.
1870-
The representation limits the largest representable
1871-
duration to approximately 290 years.
1872-
format: int64
1873-
type: integer
1866+
description: Timeout is the time to wait for a server's
1867+
response. Its a duration e.g 15s, 2h30m. Missing value
1868+
or empty string or means no timeout.
1869+
type: string
18741870
url:
18751871
type: string
18761872
required:
@@ -1887,12 +1883,10 @@ spec:
18871883
insecureSkipVerify:
18881884
type: boolean
18891885
timeout:
1890-
description: A Duration represents the elapsed time
1891-
between two instants as an int64 nanosecond count.
1892-
The representation limits the largest representable
1893-
duration to approximately 290 years.
1894-
format: int64
1895-
type: integer
1886+
description: Timeout is the time to wait for a server's
1887+
response. Its a duration e.g 15s, 2h30m. Missing value
1888+
or empty string or means no timeout.
1889+
type: string
18961890
url:
18971891
type: string
18981892
required:
@@ -10470,12 +10464,10 @@ spec:
1047010464
insecureSkipVerify:
1047110465
type: boolean
1047210466
timeout:
10473-
description: A Duration represents the elapsed time
10474-
between two instants as an int64 nanosecond count.
10475-
The representation limits the largest representable
10476-
duration to approximately 290 years.
10477-
format: int64
10478-
type: integer
10467+
description: Timeout is the time to wait for a server's
10468+
response. Its a duration e.g 15s, 2h30m. Missing value
10469+
or empty string or means no timeout.
10470+
type: string
1047910471
url:
1048010472
type: string
1048110473
required:
@@ -10492,12 +10484,10 @@ spec:
1049210484
insecureSkipVerify:
1049310485
type: boolean
1049410486
timeout:
10495-
description: A Duration represents the elapsed time
10496-
between two instants as an int64 nanosecond count.
10497-
The representation limits the largest representable
10498-
duration to approximately 290 years.
10499-
format: int64
10500-
type: integer
10487+
description: Timeout is the time to wait for a server's
10488+
response. Its a duration e.g 15s, 2h30m. Missing value
10489+
or empty string or means no timeout.
10490+
type: string
1050110491
url:
1050210492
type: string
1050310493
required:
@@ -10514,12 +10504,10 @@ spec:
1051410504
insecureSkipVerify:
1051510505
type: boolean
1051610506
timeout:
10517-
description: A Duration represents the elapsed time
10518-
between two instants as an int64 nanosecond count.
10519-
The representation limits the largest representable
10520-
duration to approximately 290 years.
10521-
format: int64
10522-
type: integer
10507+
description: Timeout is the time to wait for a server's
10508+
response. Its a duration e.g 15s, 2h30m. Missing value
10509+
or empty string or means no timeout.
10510+
type: string
1052310511
url:
1052410512
type: string
1052510513
required:

0 commit comments

Comments
 (0)