Fix multi line annotations at services (#57)

Fix #56 for service annotations across multiple lines. Signed-off-by: Theodor van Nahl <theodor.vannahl@docmorris.de>
DependencyTrack · May 21, 2024 · f20c141 · f20c141
1 parent 86f4598
commit f20c141
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/charts/dependency-track/Chart.yaml b/charts/dependency-track/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: dependency-track
-version: 0.6.0
+version: 0.6.1
 type: application
 appVersion: 4.11.1
 description: |-

diff --git a/charts/dependency-track/ci/multi-line-annotations.yaml b/charts/dependency-track/ci/multi-line-annotations.yaml
@@ -0,0 +1,12 @@
+api-server:
+  service:
+    annotations:
+      foo: |
+        bar
+        naz
+frontend:
+  service:
+    annotations:
+      foo: |
+        bar
+        naz
diff --git a/charts/dependency-track/templates/api-server/service.yaml b/charts/dependency-track/templates/api-server/service.yaml
@@ -7,7 +7,7 @@ metadata:
   labels: {{- include "dependencytrack.apiServerLabels" . | nindent 4 }}
   {{- if .Values.apiServer.service.annotations }}
   annotations:
-  {{ toYaml .Values.apiServer.service.annotations | indent 4 }}
+  {{- toYaml .Values.apiServer.service.annotations | nindent 4 }}
   {{- end }}
 spec:
   type: {{ .Values.apiServer.service.type | quote }}

diff --git a/charts/dependency-track/templates/frontend/service.yaml b/charts/dependency-track/templates/frontend/service.yaml
@@ -7,7 +7,7 @@ metadata:
   labels: {{- include "dependencytrack.frontendLabels" . | nindent 4 }}
   {{- if .Values.frontend.service.annotations }}
   annotations:
-  {{ toYaml .Values.frontend.service.annotations | indent 4 }}
+  {{- .Values.frontend.service.annotations | toYaml | nindent 4 }}
   {{- end }}
 spec:
   type: {{ .Values.frontend.service.type | quote }}