fix: simplify and test template everywhere

Signed-off-by: WrenIX <dev.github@wrenix.eu>

Author: wrenix

.github/workflows/lint-test.yaml

@@ -102,7 +102,7 @@ jobs:
           - name: Extra Manifests using a map Enabled
             helm_args: --namespace nextcloud --skip-clean-up --helm-extra-set-args "--create-namespace --values charts/nextcloud/test-values/extra-manifests-map.yaml"
             test: true
-            
+  
     steps:
       - name: Checkout
         uses: actions/checkout@v6

charts/nextcloud/templates/extra-manifests.yaml

@@ -4,20 +4,11 @@
   If a map, each key is the name of the manifest.
   If an array, each item is a manifest, which can be a string (YAML block) or a YAML object.
 */ -}}
-{{- if .Values.extraManifests }}
-  {{- if kindIs "map" .Values.extraManifests }}
-    {{- range $manifest := values .Values.extraManifests }}
----
-{{ toYaml $manifest }}
-    {{- end }}
-  {{- else if kindIs "slice" .Values.extraManifests }}
-    {{- range $manifest := .Values.extraManifests }}
+{{- range $manifest := values .Values.extraManifests }}
 ---
 {{- if kindIs "string" $manifest }}
 {{ tpl $manifest $ }}
 {{- else }}
-{{ toYaml $manifest }}
+{{ tpl (toYaml $manifest) $ }}
+{{- end }}
 {{- end }}
-    {{- end }}
-  {{- end }}
-{{- end }}

charts/nextcloud/test-values/extra-manifests-map.yaml

@@ -1,15 +1,17 @@
 extraManifests:
-  my-config-map:
+  my-config-map: |
     apiVersion: v1
     kind: ConfigMap
     metadata:
       name: custom-config
+      labels:
+        {{- include "nextcloud.labels"  ( dict "component" "app"  "rootContext" $ ) | nindent 4 }}
     data:
       customKey: customValue
   my-secret:
     apiVersion: v1
     kind: Secret
     metadata:
-      name: custom-secret
+      name: '{{ template "nextcloud.fullname" . }}-custom-secret'
     data:
-      secretKey: c2VjcmV0VmFsdWU=
+      secretKey: c2VjcmV0VmFsdWU=

charts/nextcloud/test-values/extra-manifests.yaml

@@ -4,11 +4,13 @@ extraManifests:
     kind: ConfigMap
     metadata:
       name: custom-config
+      labels:
+        {{- include "nextcloud.labels"  ( dict "component" "app"  "rootContext" $ ) | nindent 4 }}
     data:
       customKey: customValue
   - apiVersion: v1
     kind: Secret
     metadata:
-      name: custom-secret
+      name: '{{ template "nextcloud.fullname" . }}-custom-secret'
     data:
       secretKey: c2VjcmV0VmFsdWU=