fix: PR review suggestions

Author: fernandezcuesta

helm/defectdojo/templates/celery-beat-deployment.yaml

@@ -13,14 +13,14 @@ metadata:
     {{- with .Values.extraLabels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-  {{- with .Values.celery.worker.annotations }}
+  {{- with mergeOverwrite .Values.celery.annotations .Values.celery.beat.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   replicas: {{ .Values.celery.beat.replicas }}
-  {{- if .Values.revisionHistoryLimit }}
-  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
+  {{- with .Values.revisionHistoryLimit }}
+  revisionHistoryLimit: {{ . }}
   {{- end }}
   selector:
     matchLabels:
@@ -42,7 +42,7 @@ spec:
           {{- toYaml . | nindent 8 }}
         {{- end }}
       annotations:
-      {{- with .Values.celery.beat.annotations }}
+      {{- with mergeOverwrite .Values.celery.annotations .Values.celery.beat.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- if eq (.Values.trackConfig | default "disabled") "enabled" }}
@@ -52,9 +52,9 @@ spec:
       {{- end }}
     spec:
       serviceAccountName: {{ include "defectdojo.serviceAccountName" . }}
-      {{- if .Values.imagePullSecrets }}
+      {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
-      - name: {{ .Values.imagePullSecrets }}
+      - name: {{ . }}
       {{- end }}
       volumes:
       - name: run

helm/defectdojo/templates/celery-worker-deployment.yaml

@@ -13,14 +13,14 @@ metadata:
     {{- with .Values.extraLabels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-  {{- with .Values.celery.worker.annotations }}
+  {{- with mergeOverwrite .Values.celery.annotations .Values.celery.worker.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   replicas: {{ .Values.celery.worker.replicas }}
-  {{- if .Values.revisionHistoryLimit }}
-  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
+  {{- with .Values.revisionHistoryLimit }}
+  revisionHistoryLimit: {{ . }}
   {{- end }}
   selector:
     matchLabels:
@@ -42,7 +42,7 @@ spec:
           {{- toYaml . | nindent 8 }}
         {{- end }}
       annotations:
-      {{- with .Values.celery.worker.annotations }}
+      {{- with mergeOverwrite .Values.celery.annotations .Values.celery.worker.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- if eq (.Values.trackConfig | default "disabled") "enabled" }}
@@ -52,9 +52,9 @@ spec:
       {{- end }}
     spec:
       serviceAccountName: {{ include "defectdojo.serviceAccountName" . }}
-      {{- if .Values.imagePullSecrets }}
+      {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
-      - name: {{ .Values.imagePullSecrets }}
+      - name: {{ . }}
       {{- end }}
       volumes:
       {{- if  .Values.localsettingspy }}
@@ -67,7 +67,7 @@ spec:
         configMap:
           name: {{ .Values.django.uwsgi.certificates.configName }}
       {{- end }}
-      {{- with .Values.celery.beat.extraVolumes }}
+      {{- with .Values.celery.worker.extraVolumes }}
         {{- . | toYaml | nindent 6 }}
       {{- end }}
       {{- if coalesce .Values.dbMigrationChecker.enabled .Values.cloudsql.enabled .Values.celery.worker.extraInitContainers }}

helm/defectdojo/templates/configmap.yaml

@@ -1,4 +1,5 @@
 {{- $fullName := include "defectdojo.fullname" . -}}
+{{- $defaultBrokerParams := ternary "ssl_cert_reqs=optional" "" .Values.redis.tls.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -28,7 +29,7 @@ data:
   DD_CELERY_BROKER_USER: ''
   DD_CELERY_BROKER_HOST: {{ if eq .Values.celery.broker "redis" }}{{ template "redis.hostname" . }}{{ end }}
   DD_CELERY_BROKER_PORT: '{{ if eq .Values.celery.broker "redis" }}{{- if ( hasKey .Values.redis "master" ) -}}{{ .Values.redis.master.service.ports.redis }}{{ else }}6379{{ end }}{{- end -}}'
-  DD_CELERY_BROKER_PARAMS: '{{ if eq .Values.celery.broker "redis" }}{{- if .Values.redis.tls.enabled -}}{{ .Values.celery.brokerParams | default "ssl_cert_reqs=optional" }}{{ end }}{{ end }}'
+  DD_CELERY_BROKER_PARAMS: '{{ .Values.celery.brokerParams | default $defaultBrokerParams }}'
   DD_CELERY_BROKER_PATH: '{{ .Values.celery.path | default "//" }}'
   DD_CELERY_LOG_LEVEL: {{ .Values.celery.logLevel }}
   DD_CELERY_WORKER_POOL_TYPE: {{ .Values.celery.worker.appSettings.poolType | default "solo" }}

helm/defectdojo/templates/initializer-job.yaml

@@ -39,9 +39,9 @@ spec:
       {{- end }}
     spec:
       serviceAccountName: {{ include "defectdojo.serviceAccountName" . }}
-      {{- if .Values.imagePullSecrets }}
+      {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
-      - name: {{ .Values.imagePullSecrets }}
+      - name: {{ . }}
       {{- end }}
       volumes:
       {{- if  .Values.localsettingspy }}
@@ -129,6 +129,9 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ $fullName }}
+        - secretRef:
+            name: {{ $fullName }}
+            optional: true
         - secretRef:
             name: {{ $fullName }}-extrasecrets
             optional: true

helm/defectdojo/templates/tests/unit-tests.yaml

@@ -12,9 +12,9 @@ metadata:
     helm.sh/hook: test-success
 spec:
   serviceAccountName: {{ include "defectdojo.serviceAccountName" . }}
-  {{- if .Values.imagePullSecrets }}
+  {{- with .Values.imagePullSecrets }}
   imagePullSecrets:
-  - name: {{ .Values.imagePullSecrets }}
+    - name: {{ . }}
   {{- end }}
   containers:
     - name: unit-tests

helm/defectdojo/values.yaml

@@ -153,8 +153,10 @@ celery:
   # Parameters attached to the broker URL, defaults to "ssl_cert_reqs=optional" if redis.tls.enabled
   brokerParams: ""
   logLevel: INFO
+  # Common annotations to worker and beat deployments and pods.
   annotations: {}
   beat:
+    # Annotations for the Celery beat deployment.
     annotations: {}
     affinity: {}
     # Additional environment variables injected to Celery beat containers.
@@ -177,6 +179,10 @@ celery:
       # periodSeconds: 60
       # timeoutSeconds: 10
     nodeSelector: {}
+    # Annotations for the Celery beat pods.
+    podAnnotations: {}
+    # Enable readiness probe for Celery beat container.
+    readinessProbe: {}
     replicas: 1
     resources:
       requests:
@@ -185,8 +191,11 @@ celery:
       limits:
         cpu: 2000m
         memory: 256Mi
+    # Enable startup probe for Celery beat container.
+    startupProbe: {}
     tolerations: []
   worker:
+    # Annotations for the Celery worker deployment.
     annotations: {}
     affinity: {}
     # Additional environment variables injected to Celery worker containers.
@@ -209,6 +218,10 @@ celery:
       # periodSeconds: 60
       # timeoutSeconds: 10
     nodeSelector: {}
+    # Annotations for the Celery beat pods.
+    podAnnotations: {}
+    # Enable readiness probe for Celery worker container.
+    readinessProbe: {}
     replicas: 1
     resources:
       requests:
@@ -217,6 +230,8 @@ celery:
       limits:
         cpu: 2000m
         memory: 512Mi
+    # Enable startup probe for Celery worker container.
+    startupProbe: {}
     tolerations: []
     appSettings:
       poolType: solo