Skip to content

Commit cf62d26

Browse files
authored
fix(helm): Empty string values propagated as strings (not as null) (#13200)
1 parent 9159e3d commit cf62d26

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

helm/defectdojo/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -516,13 +516,13 @@ A Helm chart for Kubernetes to install DefectDojo
516516
517517
| Key | Type | Default | Description |
518518
|-----|------|---------|-------------|
519-
| admin.credentialAes256Key | string | `nil` | |
519+
| admin.credentialAes256Key | string | `""` | |
520520
| admin.firstName | string | `"Administrator"` | |
521521
| admin.lastName | string | `"User"` | |
522522
| admin.mail | string | `"admin@defectdojo.local"` | |
523-
| admin.metricsHttpAuthPassword | string | `nil` | |
524-
| admin.password | string | `nil` | |
525-
| admin.secretKey | string | `nil` | |
523+
| admin.metricsHttpAuthPassword | string | `""` | |
524+
| admin.password | string | `""` | |
525+
| admin.secretKey | string | `""` | |
526526
| admin.user | string | `"admin"` | |
527527
| annotations | object | `{}` | |
528528
| celery.annotations | object | `{}` | |
@@ -594,9 +594,9 @@ A Helm chart for Kubernetes to install DefectDojo
594594
| django.mediaPersistentVolume.name | string | `"media"` | |
595595
| django.mediaPersistentVolume.persistentVolumeClaim.accessModes[0] | string | `"ReadWriteMany"` | |
596596
| django.mediaPersistentVolume.persistentVolumeClaim.create | bool | `false` | |
597-
| django.mediaPersistentVolume.persistentVolumeClaim.name | string | `nil` | |
597+
| django.mediaPersistentVolume.persistentVolumeClaim.name | string | `""` | |
598598
| django.mediaPersistentVolume.persistentVolumeClaim.size | string | `"5Gi"` | |
599-
| django.mediaPersistentVolume.persistentVolumeClaim.storageClassName | string | `nil` | |
599+
| django.mediaPersistentVolume.persistentVolumeClaim.storageClassName | string | `""` | |
600600
| django.mediaPersistentVolume.type | string | `"emptyDir"` | |
601601
| django.nginx.extraEnv | list | `[]` | |
602602
| django.nginx.extraVolumeMounts | list | `[]` | |

helm/defectdojo/values.schema.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"type": "object",
77
"properties": {
88
"credentialAes256Key": {
9-
"type": "null"
9+
"type": "string"
1010
},
1111
"firstName": {
1212
"type": "string"
@@ -18,13 +18,13 @@
1818
"type": "string"
1919
},
2020
"metricsHttpAuthPassword": {
21-
"type": "null"
21+
"type": "string"
2222
},
2323
"password": {
24-
"type": "null"
24+
"type": "string"
2525
},
2626
"secretKey": {
27-
"type": "null"
27+
"type": "string"
2828
},
2929
"user": {
3030
"type": "string"
@@ -339,13 +339,13 @@
339339
"type": "boolean"
340340
},
341341
"name": {
342-
"type": "null"
342+
"type": "string"
343343
},
344344
"size": {
345345
"type": "string"
346346
},
347347
"storageClassName": {
348-
"type": "null"
348+
"type": "string"
349349
}
350350
}
351351
},

helm/defectdojo/values.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ tests:
124124

125125
admin:
126126
user: admin
127-
password:
127+
password: ""
128128
firstName: Administrator
129129
lastName: User
130130
mail: admin@defectdojo.local
131-
secretKey:
132-
credentialAes256Key:
133-
metricsHttpAuthPassword:
131+
secretKey: ""
132+
credentialAes256Key: ""
133+
metricsHttpAuthPassword: ""
134134

135135
monitoring:
136136
enabled: false
@@ -356,11 +356,11 @@ django:
356356
persistentVolumeClaim:
357357
# set to true to create a new pvc and if django.mediaPersistentVolume.type is set to pvc
358358
create: false
359-
name:
359+
name: ""
360360
size: 5Gi
361361
accessModes:
362362
- ReadWriteMany # check KUBERNETES.md doc first for option to choose
363-
storageClassName:
363+
storageClassName: ""
364364

365365
initializer:
366366
run: true

0 commit comments

Comments
 (0)