Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion helm/defectdojo/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ dependencies:
condition: redis.enabled
annotations:
artifacthub.io/prerelease: "true"
artifacthub.io/changes: ""
artifacthub.io/changes: |
- kind: added
description: Add support for automountServiceAccountToken
5 changes: 5 additions & 0 deletions helm/defectdojo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,7 @@ A Helm chart for Kubernetes to install DefectDojo
| celery.annotations | object | `{}` | |
| celery.beat.affinity | object | `{}` | |
| celery.beat.annotations | object | `{}` | |
| celery.beat.automountServiceAccountToken | bool | `false` | |
| celery.beat.extraEnv | list | `[]` | |
| celery.beat.extraInitContainers | list | `[]` | |
| celery.beat.extraVolumeMounts | list | `[]` | |
Expand All @@ -548,6 +549,7 @@ A Helm chart for Kubernetes to install DefectDojo
| celery.worker.affinity | object | `{}` | |
| celery.worker.annotations | object | `{}` | |
| celery.worker.appSettings.poolType | string | `"solo"` | |
| celery.worker.automountServiceAccountToken | bool | `false` | |
| celery.worker.extraEnv | list | `[]` | |
| celery.worker.extraInitContainers | list | `[]` | |
| celery.worker.extraVolumeMounts | list | `[]` | |
Expand Down Expand Up @@ -582,6 +584,7 @@ A Helm chart for Kubernetes to install DefectDojo
| disableHooks | bool | `false` | |
| django.affinity | object | `{}` | |
| django.annotations | object | `{}` | |
| django.automountServiceAccountToken | bool | `false` | |
| django.extraInitContainers | list | `[]` | |
| django.extraVolumes | list | `[]` | |
| django.ingress.activateTLS | bool | `true` | |
Expand Down Expand Up @@ -656,6 +659,7 @@ A Helm chart for Kubernetes to install DefectDojo
| imagePullSecrets | string | `nil` | |
| initializer.affinity | object | `{}` | |
| initializer.annotations | object | `{}` | |
| initializer.automountServiceAccountToken | bool | `false` | |
| initializer.extraEnv | list | `[]` | |
| initializer.extraVolumeMounts | list | `[]` | |
| initializer.extraVolumes | list | `[]` | |
Expand Down Expand Up @@ -722,6 +726,7 @@ A Helm chart for Kubernetes to install DefectDojo
| serviceAccount.create | bool | `true` | |
| serviceAccount.labels | object | `{}` | |
| tag | string | `"latest"` | |
| tests.unitTests.automountServiceAccountToken | bool | `false` | |
| tests.unitTests.resources.limits.cpu | string | `"500m"` | |
| tests.unitTests.resources.limits.memory | string | `"512Mi"` | |
| tests.unitTests.resources.requests.cpu | string | `"100m"` | |
Expand Down
1 change: 1 addition & 0 deletions helm/defectdojo/templates/celery-beat-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ spec:
{{- end }}
spec:
serviceAccountName: {{ include "defectdojo.serviceAccountName" . }}
automountServiceAccountToken: {{ .Values.celery.beat.automountServiceAccountToken }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
- name: {{ . }}
Expand Down
1 change: 1 addition & 0 deletions helm/defectdojo/templates/celery-worker-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ spec:
{{- end }}
spec:
serviceAccountName: {{ include "defectdojo.serviceAccountName" . }}
automountServiceAccountToken: {{ .Values.celery.worker.automountServiceAccountToken }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
- name: {{ . }}
Expand Down
1 change: 1 addition & 0 deletions helm/defectdojo/templates/django-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ spec:
{{- end }}
spec:
serviceAccountName: {{ include "defectdojo.serviceAccountName" . }}
automountServiceAccountToken: {{ .Values.django.automountServiceAccountToken }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
- name: {{ quote . }}
Expand Down
1 change: 1 addition & 0 deletions helm/defectdojo/templates/initializer-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ spec:
{{- end }}
spec:
serviceAccountName: {{ include "defectdojo.serviceAccountName" . }}
automountServiceAccountToken: {{ .Values.initializer.automountServiceAccountToken }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
- name: {{ . }}
Expand Down
1 change: 1 addition & 0 deletions helm/defectdojo/templates/tests/unit-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ metadata:
helm.sh/hook: test-success
spec:
serviceAccountName: {{ include "defectdojo.serviceAccountName" . }}
automountServiceAccountToken: {{ .Values.tests.unitTests.automountServiceAccountToken }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
- name: {{ . }}
Expand Down
15 changes: 15 additions & 0 deletions helm/defectdojo/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
"annotations": {
"type": "object"
},
"automountServiceAccountToken": {
"type": "boolean"
},
"extraEnv": {
"type": "array"
},
Expand Down Expand Up @@ -134,6 +137,9 @@
}
}
},
"automountServiceAccountToken": {
"type": "boolean"
},
"extraEnv": {
"type": "array"
},
Expand Down Expand Up @@ -288,6 +294,9 @@
"annotations": {
"type": "object"
},
"automountServiceAccountToken": {
"type": "boolean"
},
"extraInitContainers": {
"type": "array"
},
Expand Down Expand Up @@ -616,6 +625,9 @@
"annotations": {
"type": "object"
},
"automountServiceAccountToken": {
"type": "boolean"
},
"extraEnv": {
"type": "array"
},
Expand Down Expand Up @@ -968,6 +980,9 @@
"unitTests": {
"type": "object",
"properties": {
"automountServiceAccountToken": {
"type": "boolean"
},
"resources": {
"type": "object",
"properties": {
Expand Down
5 changes: 5 additions & 0 deletions helm/defectdojo/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ dbMigrationChecker:

tests:
unitTests:
automountServiceAccountToken: false
resources:
requests:
cpu: 100m
Expand Down Expand Up @@ -153,6 +154,7 @@ celery:
# Common annotations to worker and beat deployments and pods.
annotations: {}
beat:
automountServiceAccountToken: false
# Annotations for the Celery beat deployment.
annotations: {}
affinity: {}
Expand Down Expand Up @@ -192,6 +194,7 @@ celery:
startupProbe: {}
tolerations: []
worker:
automountServiceAccountToken: false
# Annotations for the Celery worker deployment.
annotations: {}
affinity: {}
Expand Down Expand Up @@ -241,6 +244,7 @@ celery:
# prefetchMultiplier: 128

django:
automountServiceAccountToken: false
annotations: {}
service:
annotations: {}
Expand Down Expand Up @@ -364,6 +368,7 @@ django:

initializer:
run: true
automountServiceAccountToken: false
jobAnnotations: {}
annotations: {}
labels: {}
Expand Down