Skip to content

Commit c3e4c8b

Browse files
authored
feat(helm): Add docs for more variables (#13224)
1 parent 169e9d3 commit c3e4c8b

4 files changed

Lines changed: 28 additions & 6 deletions

File tree

helm/defectdojo/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,7 @@ A Helm chart for Kubernetes to install DefectDojo
612612
| django.service.type | string | `""` | |
613613
| django.strategy | object | `{}` | |
614614
| django.tolerations | list | `[]` | |
615+
| django.uwsgi.appSettings.maxFd | int | `0` | |
615616
| django.uwsgi.appSettings.processes | int | `4` | |
616617
| django.uwsgi.appSettings.threads | int | `4` | |
617618
| django.uwsgi.certificates.certFileName | string | `"ca.crt"` | |
@@ -644,7 +645,9 @@ A Helm chart for Kubernetes to install DefectDojo
644645
| django.uwsgi.startupProbe.successThreshold | int | `1` | |
645646
| django.uwsgi.startupProbe.timeoutSeconds | int | `1` | |
646647
| extraConfigs | object | `{}` | |
648+
| extraEnv | list | `[]` | |
647649
| extraLabels | object | `{}` | |
650+
| extraSecrets | object | `{}` | |
648651
| gke.useGKEIngress | bool | `false` | |
649652
| gke.useManagedCertificate | bool | `false` | |
650653
| gke.workloadIdentityEmail | string | `""` | |
@@ -667,6 +670,7 @@ A Helm chart for Kubernetes to install DefectDojo
667670
| initializer.run | bool | `true` | |
668671
| initializer.staticName | bool | `false` | |
669672
| initializer.tolerations | list | `[]` | |
673+
| localsettingspy | string | `""` | |
670674
| monitoring.enabled | bool | `false` | |
671675
| monitoring.prometheus.enabled | bool | `false` | |
672676
| monitoring.prometheus.image | string | `"nginx/nginx-prometheus-exporter:1.4.2"` | |
@@ -722,6 +726,7 @@ A Helm chart for Kubernetes to install DefectDojo
722726
| tests.unitTests.resources.limits.memory | string | `"512Mi"` | |
723727
| tests.unitTests.resources.requests.cpu | string | `"100m"` | |
724728
| tests.unitTests.resources.requests.memory | string | `"128Mi"` | |
729+
| trackConfig | string | `"disabled"` | |
725730
726731
----------------------------------------------
727732
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

helm/defectdojo/templates/configmap.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ data:
4848
DD_UWSGI_PASS: unix:///run/defectdojo/uwsgi.sock
4949
DD_UWSGI_NUM_OF_PROCESSES: '{{ .Values.django.uwsgi.appSettings.processes | default 4 }}'
5050
DD_UWSGI_NUM_OF_THREADS: '{{ .Values.django.uwsgi.appSettings.threads | default 4 }}'
51+
{{- if .Values.django.uwsgi.appSettings.maxFd }}
5152
DD_UWSGI_MAX_FD: '{{ .Values.django.uwsgi.appSettings.maxFd }}'
53+
{{- end }}
5254
DD_DJANGO_METRICS_ENABLED: '{{ .Values.monitoring.enabled }}'
5355
NGINX_METRICS_ENABLED: '{{ .Values.monitoring.enabled }}'
5456
METRICS_HTTP_AUTH_USER: {{ .Values.monitoring.user | default "monitoring" }}

helm/defectdojo/values.schema.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,9 @@
432432
"appSettings": {
433433
"type": "object",
434434
"properties": {
435+
"maxFd": {
436+
"type": "integer"
437+
},
435438
"processes": {
436439
"type": "integer"
437440
},
@@ -569,9 +572,15 @@
569572
"extraConfigs": {
570573
"type": "object"
571574
},
575+
"extraEnv": {
576+
"type": "array"
577+
},
572578
"extraLabels": {
573579
"type": "object"
574580
},
581+
"extraSecrets": {
582+
"type": "object"
583+
},
575584
"gke": {
576585
"type": "object",
577586
"properties": {
@@ -666,6 +675,9 @@
666675
}
667676
}
668677
},
678+
"localsettingspy": {
679+
"type": "string"
680+
},
669681
"monitoring": {
670682
"type": "object",
671683
"properties": {
@@ -986,6 +998,9 @@
986998
}
987999
}
9881000
}
1001+
},
1002+
"trackConfig": {
1003+
"type": "string"
9891004
}
9901005
}
9911006
}

helm/defectdojo/values.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ createPostgresqlSecret: false
1010
# can be:
1111
# - disabled, default
1212
# - enabled, enables tracking configuration changes based on SHA256
13-
# trackConfig: disabled
13+
trackConfig: disabled
1414

1515
# Avoid using pre-install hooks, which might cause issues with ArgoCD
1616
disableHooks: false
@@ -328,7 +328,7 @@ django:
328328
appSettings:
329329
processes: 4
330330
threads: 4
331-
# maxFd: 102400 # Uncomment to set the maximum number of file descriptors. If not set will be detected by uwsgi
331+
maxFd: 0 # 102400 # Use this value to set the maximum number of file descriptors. If set to 0 will be detected by uwsgi
332332
enableDebug: false # this also requires DD_DEBUG to be set to True
333333
certificates:
334334
# includes additional CA certificate as volume, it refrences REQUESTS_CA_BUNDLE env varible
@@ -490,20 +490,19 @@ redis:
490490

491491
# To add extra variables not predefined by helm config it is possible to define in extraConfigs block, e.g. below:
492492
# NOTE Do not store any kind of sensitive information inside of it
493-
# extraConfigs:
493+
extraConfigs: {}
494494
# DD_SOCIAL_AUTH_AUTH0_OAUTH2_ENABLED: 'true'
495495
# DD_SOCIAL_AUTH_AUTH0_KEY: 'dev'
496496
# DD_SOCIAL_AUTH_AUTH0_DOMAIN: 'xxxxx'
497497

498498
# Extra secrets can be created inside of extraSecrets block:
499499
# NOTE This is just an exmaple, do not store sensitive data in plain text form, better inject it during the deployment/upgrade by --set extraSecrets.secret=someSecret
500-
# extraSecrets:
500+
extraSecrets: {}
501501
# DD_SOCIAL_AUTH_AUTH0_SECRET: 'xxx'
502-
extraConfigs: {}
503502

504503
# To add (or override) extra variables which need to be pulled from another configMap, you can
505504
# use extraEnv. For example:
506-
# extraEnv:
505+
extraEnv: []
507506
# - name: DD_DATABASE_HOST
508507
# valueFrom:
509508
# configMapKeyRef:
@@ -513,6 +512,7 @@ extraConfigs: {}
513512
# To add code snippet which would extend setting functionality, you might add it here
514513
# It will be stored as ConfigMap and mounted `dojo/settings/local_settings.py`.
515514
# For more see: https://documentation.defectdojo.com/getting_started/configuration/
515+
localsettingspy: ""
516516
# For example:
517517
# localsettingspy: |
518518
# INSTALLED_APPS += (

0 commit comments

Comments
 (0)