From 85f98bfd9b3e3975e3acd3820587ce1e4dada817 Mon Sep 17 00:00:00 2001 From: Mitchell Nielsen Date: Fri, 9 Apr 2021 11:53:57 -0400 Subject: [PATCH 1/2] Specify header values as a list Specifies header values as a list for registry notification entries, matching the expectation from the documentation: https://gitlab.com/gitlab-org/container-registry/-/blob/master/docs/configuration.md#endpoints "A list of static headers to add to each request. Each header's name is a key beneath headers, and each value is a list of payloads for that header name. Values must always be lists." --- charts/registry/templates/_helpers.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/registry/templates/_helpers.tpl b/charts/registry/templates/_helpers.tpl index 8884844b5d..ea5edc29c5 100644 --- a/charts/registry/templates/_helpers.tpl +++ b/charts/registry/templates/_helpers.tpl @@ -91,10 +91,10 @@ notifications: {{- range $header, $value := $headers -}} {{- if kindIs "map" $value -}} {{- if hasKey $value "secret" }} - {{ $header }}: SECRET_{{ $value.secret }}_{{ default "value" $value.key }} + {{ $header }}: [SECRET_{{ $value.secret }}_{{ default "value" $value.key }}] {{- end -}} {{- else }} - {{ $header }}: {{ $value }} + {{ $header }}: [{{ $value }}] {{- end -}} {{- end -}} {{- end -}} -- GitLab From 4b382fc5f1622404bc7961c33cb8e2ce696e392c Mon Sep 17 00:00:00 2001 From: Mitchell Nielsen Date: Fri, 9 Apr 2021 11:57:38 -0400 Subject: [PATCH 2/2] Add changelog entry --- changelogs/unreleased/2671-fix-registry-header-format.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/2671-fix-registry-header-format.yml diff --git a/changelogs/unreleased/2671-fix-registry-header-format.yml b/changelogs/unreleased/2671-fix-registry-header-format.yml new file mode 100644 index 0000000000..e50b633023 --- /dev/null +++ b/changelogs/unreleased/2671-fix-registry-header-format.yml @@ -0,0 +1,5 @@ +--- +title: "[Registry] Specify header values as a list" +merge_request: 1941 +author: +type: fixed -- GitLab