fix(helm): Fix PVC templating after #13210 (#13619)

* fix(helm): Typo in description of digests

Signed-off-by: kiblik <5609770+kiblik@users.noreply.github.com>

* fix(helm): Fix PVC templating after #13210

Signed-off-by: kiblik <5609770+kiblik@users.noreply.github.com>

---------

Signed-off-by: kiblik <5609770+kiblik@users.noreply.github.com>

Author: kiblik

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

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. |

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 }}

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": {

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