diff --git a/helm/defectdojo/README.md b/helm/defectdojo/README.md index e9b0e85455d..f7e27b830d0 100644 --- a/helm/defectdojo/README.md +++ b/helm/defectdojo/README.md @@ -648,7 +648,9 @@ A Helm chart for Kubernetes to install DefectDojo | django.uwsgi.startupProbe.successThreshold | int | `1` | | | django.uwsgi.startupProbe.timeoutSeconds | int | `1` | | | extraConfigs | object | `{}` | | +| extraEnv | list | `[]` | | | extraLabels | object | `{}` | | +| extraSecrets | object | `{}` | | | gke.useGKEIngress | bool | `false` | | | gke.useManagedCertificate | bool | `false` | | | gke.workloadIdentityEmail | string | `""` | | @@ -672,6 +674,7 @@ A Helm chart for Kubernetes to install DefectDojo | initializer.securityContext.runAsNonRoot | bool | `true` | | | initializer.staticName | bool | `false` | | | initializer.tolerations | list | `[]` | | +| localsettingspy | string | `""` | | | monitoring.enabled | bool | `false` | | | monitoring.prometheus.enabled | bool | `false` | | | monitoring.prometheus.image | string | `"nginx/nginx-prometheus-exporter:1.4.2"` | | @@ -730,6 +733,7 @@ A Helm chart for Kubernetes to install DefectDojo | tests.unitTests.resources.limits.memory | string | `"512Mi"` | | | tests.unitTests.resources.requests.cpu | string | `"100m"` | | | tests.unitTests.resources.requests.memory | string | `"128Mi"` | | +| trackConfig | string | `"disabled"` | | ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/helm/defectdojo/templates/_helpers.tpl b/helm/defectdojo/templates/_helpers.tpl index e7ac6a1a4d6..9758cfec3de 100644 --- a/helm/defectdojo/templates/_helpers.tpl +++ b/helm/defectdojo/templates/_helpers.tpl @@ -163,7 +163,7 @@ Create the name of the service account to use secretKeyRef: name: {{ .Values.postgresql.auth.existingSecret | default "defectdojo-postgresql-specific" }} key: {{ .Values.postgresql.auth.secretKeys.userPasswordKey | default "postgresql-password" }} - {{- with.Values.django.extraEnv }} + {{- with .Values.extraEnv }} {{- toYaml . | nindent 2 }} {{- end }} resources: diff --git a/helm/defectdojo/values.schema.json b/helm/defectdojo/values.schema.json index 8ad2ae71e64..81c72ee46b1 100644 --- a/helm/defectdojo/values.schema.json +++ b/helm/defectdojo/values.schema.json @@ -581,9 +581,15 @@ "extraConfigs": { "type": "object" }, + "extraEnv": { + "type": "array" + }, "extraLabels": { "type": "object" }, + "extraSecrets": { + "type": "object" + }, "gke": { "type": "object", "properties": { @@ -686,6 +692,9 @@ } } }, + "localsettingspy": { + "type": "string" + }, "monitoring": { "type": "object", "properties": { @@ -1015,6 +1024,9 @@ } } } + }, + "trackConfig": { + "type": "string" } } } diff --git a/helm/defectdojo/values.yaml b/helm/defectdojo/values.yaml index 419fe46d110..ad93d7e5af0 100644 --- a/helm/defectdojo/values.yaml +++ b/helm/defectdojo/values.yaml @@ -10,7 +10,7 @@ createPostgresqlSecret: false # can be: # - disabled, default # - enabled, enables tracking configuration changes based on SHA256 -# trackConfig: disabled +trackConfig: disabled # Avoid using pre-install hooks, which might cause issues with ArgoCD disableHooks: false @@ -500,20 +500,19 @@ redis: # To add extra variables not predefined by helm config it is possible to define in extraConfigs block, e.g. below: # NOTE Do not store any kind of sensitive information inside of it -# extraConfigs: +extraConfigs: {} # DD_SOCIAL_AUTH_AUTH0_OAUTH2_ENABLED: 'true' # DD_SOCIAL_AUTH_AUTH0_KEY: 'dev' # DD_SOCIAL_AUTH_AUTH0_DOMAIN: 'xxxxx' # Extra secrets can be created inside of extraSecrets block: # 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 -# extraSecrets: +extraSecrets: {} # DD_SOCIAL_AUTH_AUTH0_SECRET: 'xxx' -extraConfigs: {} # To add (or override) extra variables which need to be pulled from another configMap, you can # use extraEnv. For example: -# extraEnv: +extraEnv: [] # - name: DD_DATABASE_HOST # valueFrom: # configMapKeyRef: @@ -523,6 +522,7 @@ extraConfigs: {} # To add code snippet which would extend setting functionality, you might add it here # It will be stored as ConfigMap and mounted `dojo/settings/local_settings.py`. # For more see: https://documentation.defectdojo.com/getting_started/configuration/ +localsettingspy: "" # For example: # localsettingspy: | # INSTALLED_APPS += (