Skip to content

Commit d4ba0e2

Browse files
committed
Switch duration schema format to matching pattern
Helm 3.18.0 introduce support for JSON Schema 2020. Seems like this is now the only schema validation version that's supported/matched against. To satisfy everyone, let's switch from type:duration to pattern for time validation. Fixes #95
1 parent a0da657 commit d4ba0e2

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

deploy/k8s/chart/values.schema.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,19 +193,19 @@
193193
"type": "string",
194194
"title": "Timeout",
195195
"description": "HTTP request timeout",
196-
"format": "duration"
196+
"pattern": "^[0-9]+[smhd]$"
197197
},
198198
"idle_timeout": {
199199
"type": "string",
200200
"title": "Idle_Timeout",
201201
"description": "HTTP request idle timeout",
202-
"format": "duration"
202+
"pattern": "^[0-9]+[smhd]$"
203203
},
204204
"timeout_shutdown": {
205205
"type": "string",
206206
"title": "Shutdown timeout",
207207
"description": "Timeout to wait on shutdown to allow load balancers detect that we're going away",
208-
"format": "duration"
208+
"pattern": "^[0-9]+[smhd]$"
209209
},
210210
"concurrency": {
211211
"type": "integer",
@@ -227,7 +227,7 @@
227227
"type": "string",
228228
"title": "Max Connection Duration",
229229
"description": "Maximum duration to keep outgoing connections alive (to Cortex/Mimir)",
230-
"format": "duration"
230+
"pattern": "^[0-9]+[smhd]$"
231231
},
232232
"max_conns_per_host": {
233233
"type": "integer",
@@ -497,7 +497,7 @@
497497
],
498498
"title": "Interval",
499499
"description": "ServiceMonitor scrape interval",
500-
"format": "duration"
500+
"pattern": "^[0-9]+[smhd]$"
501501
},
502502
"scrapeTimeout": {
503503
"type": [
@@ -506,7 +506,7 @@
506506
],
507507
"title": "Scrape Timeout",
508508
"description": "ServiceMonitor scrape timeout in Go duration format (e.g. 15s)",
509-
"format": "duration"
509+
"pattern": "^[0-9]+[smhd]$"
510510
},
511511
"relabelings": {
512512
"type": "array",

0 commit comments

Comments
 (0)