fix

SocialGouv · Jul 28, 2023 · ef08e72 · ef08e72
1 parent 09d33c5
commit ef08e72
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/packages/kontinuous/tests/__snapshots__/ingress-annotations.prod.yaml b/packages/kontinuous/tests/__snapshots__/ingress-annotations.prod.yaml
@@ -248,6 +248,7 @@ kind: Ingress
 metadata:
   annotations:
     kubernetes.io/ingress.class: nginx
+    some: annotation
     kontinuous/chartPath: project.fabrique.contrib.metabase
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/metabase/templates/ingress.yaml
     kontinuous/deployment: test-ingress-annotations-feature-branch-1-ffac537e6cb-2rmdjfgo

diff --git a/packages/kontinuous/tests/__snapshots__/ingress-custom-annotations.prod.yaml b/packages/kontinuous/tests/__snapshots__/ingress-custom-annotations.prod.yaml
@@ -248,6 +248,7 @@ kind: Ingress
 metadata:
   annotations:
     kubernetes.io/ingress.class: nginx
+    some: annotation
     kontinuous/chartPath: project.fabrique.contrib.metabase
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/metabase/templates/ingress.yaml
     kontinuous/deployment: test-ingress-custom-annotations-feature-branch-1-ffac-361bby73

diff --git a/plugins/contrib/charts/metabase/templates/ingress.yaml b/plugins/contrib/charts/metabase/templates/ingress.yaml
@@ -5,7 +5,12 @@ metadata:
   annotations:
     kubernetes.io/ingress.class: nginx
     {{ if .Values.global.ingress.annotations }}
-    {{ range $key, $val := (merge dict .Values.global.ingress.annotations .Values.ingress.annotations) }}
+    {{ range $key, $val := (merge dict .Values.global.ingress.annotations) }}
+    "{{ $key }}": {{ $val | quote }}
+    {{ end }}
+    {{ end }}
+    {{ if .Values.ingress.annotations }}
+    {{ range $key, $val := (merge dict .Values.ingress.annotations) }}
     "{{ $key }}": {{ $val | quote }}
     {{ end }}
     {{ end }}