Skip to content

Commit ad7dbb4

Browse files
semnellsemnell
authored
fix(helm): update helm schema (#5297)
* fix(helm): update helm schema * chore(helm): fix values file and update schema * test(helm): add tests for null livenessProbe and readinessProbe * docs(helm): update README with default readinessProbe configuration for webhook container * fix(helm): update livenessProbe and readinessProbe schema types in values.yaml * chore(helm): update livenessProbe and readinessProbe schema types in values.yaml * fix(helm): correct type definitions for webhook probes and update CHANGELOG * chore(changelog): fix typo * fix(lint): fix linter * fix(changelog): Fix location of change * docs(helm): update to reference default values for readinessProbe configuration
1 parent 09ec020 commit ad7dbb4

File tree

4 files changed

+86
-28
lines changed

4 files changed

+86
-28
lines changed

‎charts/external-dns/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1818

1919
## [UNRELEASED]
2020

21+
### Fixed
22+
23+
- Fixed wrong type definitions for webhook probes. ([#5297](https://github.com/kubernetes-sigs/external-dns/pull/5297)) _@semnell_
24+
2125
## [v1.16.1] - 2025-04-10
2226

2327
### Changed

‎charts/external-dns/tests/json-schema_test.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,15 @@ tests:
5050
labelFilter: "mydomain.io/enable-dns-record in (true)"
5151
asserts:
5252
- notFailedTemplate: {}
53+
54+
- it: should not fail when livenessProbe is null
55+
set:
56+
livenessProbe: null
57+
asserts:
58+
- notFailedTemplate: {}
59+
60+
- it: should not fail when readinessProbe is null
61+
set:
62+
readinessProbe: null
63+
asserts:
64+
- notFailedTemplate: {}

‎charts/external-dns/values.schema.json‎

Lines changed: 56 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -308,61 +308,103 @@
308308
"livenessProbe": {
309309
"properties": {
310310
"failureThreshold": {
311-
"type": "integer"
311+
"type": [
312+
"integer",
313+
"null"
314+
]
312315
},
313316
"httpGet": {
314317
"properties": {
315318
"path": {
316-
"type": "string"
319+
"type": [
320+
"string",
321+
"null"
322+
]
317323
},
318324
"port": {
319-
"type": "string"
325+
"type": [
326+
"integer",
327+
"string"
328+
]
320329
}
321330
},
322331
"type": "object"
323332
},
324333
"initialDelaySeconds": {
325-
"type": "integer"
334+
"type": [
335+
"integer",
336+
"null"
337+
]
326338
},
327339
"periodSeconds": {
328-
"type": "integer"
340+
"type": [
341+
"integer",
342+
"null"
343+
]
329344
},
330345
"successThreshold": {
331-
"type": "integer"
346+
"type": [
347+
"integer",
348+
"null"
349+
]
332350
},
333351
"timeoutSeconds": {
334-
"type": "integer"
352+
"type": [
353+
"integer",
354+
"null"
355+
]
335356
}
336357
},
337358
"type": "object"
338359
},
339360
"readinessProbe": {
340361
"properties": {
341362
"failureThreshold": {
342-
"type": "integer"
363+
"type": [
364+
"integer",
365+
"null"
366+
]
343367
},
344368
"httpGet": {
345369
"properties": {
346370
"path": {
347-
"type": "string"
371+
"type": [
372+
"string",
373+
"null"
374+
]
348375
},
349376
"port": {
350-
"type": "string"
377+
"type": [
378+
"integer",
379+
"string"
380+
]
351381
}
352382
},
353383
"type": "object"
354384
},
355385
"initialDelaySeconds": {
356-
"type": "integer"
386+
"type": [
387+
"integer",
388+
"null"
389+
]
357390
},
358391
"periodSeconds": {
359-
"type": "integer"
392+
"type": [
393+
"integer",
394+
"null"
395+
]
360396
},
361397
"successThreshold": {
362-
"type": "integer"
398+
"type": [
399+
"integer",
400+
"null"
401+
]
363402
},
364403
"timeoutSeconds": {
365-
"type": "integer"
404+
"type": [
405+
"integer",
406+
"null"
407+
]
366408
}
367409
},
368410
"type": "object"

‎charts/external-dns/values.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -263,24 +263,24 @@ provider: # @schema type: [object, string];
263263
# @default -- See _values.yaml_
264264
livenessProbe:
265265
httpGet:
266-
path: /healthz
267-
port: http-webhook
268-
initialDelaySeconds: 10
269-
periodSeconds: 10
270-
timeoutSeconds: 5
271-
failureThreshold: 2
272-
successThreshold: 1
266+
path: /healthz # @schema type:[string, null]; default: null
267+
port: http-webhook # @schema type:[integer,string]; default: string
268+
initialDelaySeconds: 10 # @schema type:[integer, null]; default: null
269+
periodSeconds: 10 # @schema type:[integer, null]; default: null
270+
timeoutSeconds: 5 # @schema type:[integer, null]; default: null
271+
failureThreshold: 2 # @schema type:[integer, null]; default: null
272+
successThreshold: 1 # @schema type:[integer, null]; default: null
273273
# -- [Readiness probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) configuration for the `webhook` container.
274274
# @default -- See _values.yaml_
275275
readinessProbe:
276276
httpGet:
277-
path: /healthz
278-
port: http-webhook
279-
initialDelaySeconds: 5
280-
periodSeconds: 10
281-
timeoutSeconds: 5
282-
failureThreshold: 6
283-
successThreshold: 1
277+
path: /healthz # @schema type:[string, null]; default: null
278+
port: http-webhook # @schema type:[integer,string]; default: string
279+
initialDelaySeconds: 5 # @schema type:[integer, null]; default: null
280+
periodSeconds: 10 # @schema type:[integer, null]; default: null
281+
timeoutSeconds: 5 # @schema type:[integer, null]; default: null
282+
failureThreshold: 6 # @schema type:[integer, null]; default: null
283+
successThreshold: 1 # @schema type:[integer, null]; default: null
284284
service:
285285
# -- Webhook exposed HTTP port for the service.
286286
port: 8080

0 commit comments

Comments
 (0)