From ef08e72aee7b5b1e92d7a661380d5e4a64838ba4 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Sat, 29 Jul 2023 00:35:52 +0200 Subject: [PATCH] fix --- .../tests/__snapshots__/ingress-annotations.prod.yaml | 1 + .../__snapshots__/ingress-custom-annotations.prod.yaml | 1 + plugins/contrib/charts/metabase/templates/ingress.yaml | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/kontinuous/tests/__snapshots__/ingress-annotations.prod.yaml b/packages/kontinuous/tests/__snapshots__/ingress-annotations.prod.yaml index dd963ab2d9..ea2b046e7a 100644 --- 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 index 75426d440a..8fdcb71f7b 100644 --- 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 index faf75f36f1..be5afb93c3 100644 --- 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 }}