diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index f38e5988843..7c676c65a50 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -34,4 +34,8 @@ dependencies: # description: Critical bug annotations: artifacthub.io/prerelease: "true" - artifacthub.io/changes: "" + artifacthub.io/changes: | + - kind: fixed + description: Broken rendering of media PVC + - kind: fixed + description: Typo in description of digests diff --git a/helm/defectdojo/README.md b/helm/defectdojo/README.md index 7fd44828e41..27b913cdafa 100644 --- a/helm/defectdojo/README.md +++ b/helm/defectdojo/README.md @@ -674,11 +674,11 @@ A Helm chart for Kubernetes to install DefectDojo | host | string | `"defectdojo.default.minikube.local"` | Primary hostname of instance | | imagePullPolicy | string | `"Always"` | | | imagePullSecrets | string | `nil` | When using a private registry, name of the secret that holds the registry secret (eg deploy token from gitlab-ci project) Create secrets as: kubectl create secret docker-registry defectdojoregistrykey --docker-username=registry_username --docker-password=registry_password --docker-server='https://index.docker.io/v1/' | -| images.django.image.digest | string | `""` | Prefix "sha@" is expected in this place | +| images.django.image.digest | string | `""` | Prefix "sha256:" is expected in this place | | images.django.image.registry | string | `""` | | | images.django.image.repository | string | `"defectdojo/defectdojo-django"` | | | images.django.image.tag | string | `""` | If empty, use appVersion. Another possible values are: latest, X.X.X, X.X.X-debian, X.X.X-alpine (where X.X.X is version of DD). For dev builds (only for testing purposes): nightly-dev, nightly-dev-debian, nightly-dev-alpine. To see all, check https://hub.docker.com/r/defectdojo/defectdojo-django/tags. | -| images.nginx.image.digest | string | `""` | Prefix "sha@" is expected in this place | +| images.nginx.image.digest | string | `""` | Prefix "sha256:" is expected in this place | | images.nginx.image.registry | string | `""` | | | images.nginx.image.repository | string | `"defectdojo/defectdojo-nginx"` | | | images.nginx.image.tag | string | `""` | If empty, use appVersion. Another possible values are: latest, X.X.X, X.X.X-alpine (where X.X.X is version of DD). For dev builds (only for testing purposes): nightly-dev, nightly-dev-alpine. To see all, check https://hub.docker.com/r/defectdojo/defectdojo-nginx/tags. | diff --git a/helm/defectdojo/templates/media-pvc.yaml b/helm/defectdojo/templates/media-pvc.yaml index 57fcae8e0c7..a6aa54005d8 100644 --- a/helm/defectdojo/templates/media-pvc.yaml +++ b/helm/defectdojo/templates/media-pvc.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - {{- with .Values.extraAnnotations }} + {{- with $.Values.extraAnnotations }} annotations: {{- range $key, $value := . }} {{ $key }}: {{ quote $value }} @@ -16,19 +16,19 @@ metadata: app.kubernetes.io/instance: {{ $.Release.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" $ }} - {{- range $key, $value := .Values.extraLabels }} + {{- range $key, $value := $.Values.extraLabels }} {{ $key }}: {{ quote $value }} {{- end }} name: {{ $fullName }} - namespace: {{ .Release.Namespace }} + namespace: {{ $.Release.Namespace }} spec: accessModes: {{- toYaml .persistentVolumeClaim.accessModes | nindent 4 }} resources: requests: storage: {{ .persistentVolumeClaim.size }} - {{- if .persistentVolumeClaim.storageClassName }} - storageClassName: {{ .persistentVolumeClaim.storageClassName }} + {{- with .persistentVolumeClaim.storageClassName }} + storageClassName: {{ . }} {{- end }} {{- end }} {{- end }} diff --git a/helm/defectdojo/values.schema.json b/helm/defectdojo/values.schema.json index 76b1411877d..29331072e96 100644 --- a/helm/defectdojo/values.schema.json +++ b/helm/defectdojo/values.schema.json @@ -865,7 +865,7 @@ "type": "object", "properties": { "digest": { - "description": "Prefix \"sha@\" is expected in this place", + "description": "Prefix \"sha256:\" is expected in this place", "type": "string" }, "registry": { @@ -889,7 +889,7 @@ "type": "object", "properties": { "digest": { - "description": "Prefix \"sha@\" is expected in this place", + "description": "Prefix \"sha256:\" is expected in this place", "type": "string" }, "registry": { diff --git a/helm/defectdojo/values.yaml b/helm/defectdojo/values.yaml index cd850ace3c1..cf04f33bf11 100644 --- a/helm/defectdojo/values.yaml +++ b/helm/defectdojo/values.yaml @@ -37,7 +37,7 @@ images: # For dev builds (only for testing purposes): nightly-dev, nightly-dev-debian, nightly-dev-alpine. # To see all, check https://hub.docker.com/r/defectdojo/defectdojo-django/tags. tag: "" - # -- Prefix "sha@" is expected in this place + # -- Prefix "sha256:" is expected in this place digest: "" nginx: image: @@ -48,7 +48,7 @@ images: # For dev builds (only for testing purposes): nightly-dev, nightly-dev-alpine. # To see all, check https://hub.docker.com/r/defectdojo/defectdojo-nginx/tags. tag: "" - # -- Prefix "sha@" is expected in this place + # -- Prefix "sha256:" is expected in this place digest: "" # -- Enables application network policy