Merge branch 'bugfix' into master-into-bugfix/2.51.1-2.52.0-dev

Author: rossops

helm/defectdojo/Chart.yaml

@@ -19,4 +19,8 @@ dependencies:
     condition: redis.enabled
 annotations:
   artifacthub.io/prerelease: "true"
-  artifacthub.io/changes: ""
+  artifacthub.io/changes: |
+    - kind: fixed
+      description: Drop initialDelaySeconds if eq. zero
+    - kind: added
+      description: Add support for automountServiceAccountToken

helm/defectdojo/templates/django-deployment.yaml

@@ -225,7 +225,9 @@ spec:
             - name: Host
               value: {{ .Values.host }}
           failureThreshold: {{ .Values.django.uwsgi.livenessProbe.failureThreshold }}
+          {{- if .Values.django.uwsgi.livenessProbe.initialDelaySeconds }}
           initialDelaySeconds: {{ .Values.django.uwsgi.livenessProbe.initialDelaySeconds }}
+          {{- end }}
           periodSeconds: {{ .Values.django.uwsgi.livenessProbe.periodSeconds }}
           successThreshold: {{ .Values.django.uwsgi.livenessProbe.successThreshold }}
           timeoutSeconds: {{ .Values.django.uwsgi.livenessProbe.timeoutSeconds }}
@@ -284,7 +286,9 @@ spec:
             - name: Host
               value: {{ .Values.host }}
           failureThreshold: {{ .Values.django.uwsgi.livenessProbe.failureThreshold }}
+          {{- if .Values.django.uwsgi.livenessProbe.initialDelaySeconds }}
           initialDelaySeconds: {{ .Values.django.uwsgi.livenessProbe.initialDelaySeconds }}
+          {{- end }}
           periodSeconds: {{ .Values.django.uwsgi.livenessProbe.periodSeconds }}
           successThreshold: {{ .Values.django.uwsgi.livenessProbe.successThreshold }}
           timeoutSeconds: {{ .Values.django.uwsgi.livenessProbe.timeoutSeconds }}
@@ -301,7 +305,9 @@ spec:
             - name: Host
               value: {{ .Values.host }}
           failureThreshold: {{ .Values.django.uwsgi.readinessProbe.failureThreshold }}
+          {{- if .Values.django.uwsgi.readinessProbe.initialDelaySeconds }}
           initialDelaySeconds: {{ .Values.django.uwsgi.readinessProbe.initialDelaySeconds }}
+          {{- end }}
           periodSeconds: {{ .Values.django.uwsgi.readinessProbe.periodSeconds }}
           successThreshold: {{ .Values.django.uwsgi.readinessProbe.successThreshold }}
           timeoutSeconds: {{ .Values.django.uwsgi.readinessProbe.timeoutSeconds }}
@@ -318,7 +324,9 @@ spec:
             - name: Host
               value: {{ .Values.host }}
           failureThreshold: {{ .Values.django.uwsgi.startupProbe.failureThreshold }}
+          {{- if .Values.django.uwsgi.startupProbe.initialDelaySeconds }}
           initialDelaySeconds: {{ .Values.django.uwsgi.startupProbe.initialDelaySeconds }}
+          {{- end }}
           periodSeconds: {{ .Values.django.uwsgi.startupProbe.periodSeconds }}
           successThreshold: {{ .Values.django.uwsgi.startupProbe.successThreshold }}
           timeoutSeconds: {{ .Values.django.uwsgi.startupProbe.timeoutSeconds }}