From 3d2bb08ac730cac5df648508af1459ea074393ce Mon Sep 17 00:00:00 2001 From: Travis Raines Date: Fri, 3 Jan 2020 12:55:40 -0800 Subject: [PATCH] [stable/kong] fix whitespace handling for license (#19852) Do not chomp leading whitespace prior to including kong.license within the final_env helper. Doing so appends the license block immediately after the preceding value, generating invalid YAML. Prior to the creation of final_env, kong.license was injected directly into Deployment and Job templates, using the nindent function to apply indentation and add a newline. final_env instead places kong.license at the correct indentation within the templated block, and does not use nindent. As such, the include should not chomp leading whitespace before it. Signed-off-by: Travis Raines --- stable/kong/Chart.yaml | 2 +- stable/kong/README.md | 5 +++++ stable/kong/templates/_helpers.tpl | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/stable/kong/Chart.yaml b/stable/kong/Chart.yaml index fa3d6570b1..60096a51e5 100644 --- a/stable/kong/Chart.yaml +++ b/stable/kong/Chart.yaml @@ -12,5 +12,5 @@ maintainers: name: kong sources: - https://github.com/Kong/kong -version: 0.33.0 +version: 0.33.1 appVersion: 1.4 diff --git a/stable/kong/README.md b/stable/kong/README.md index 30fa3549cf..993d5ec8ae 100644 --- a/stable/kong/README.md +++ b/stable/kong/README.md @@ -450,6 +450,11 @@ value is your SMTP password. ## Changelog +### 0.33.1 + +#### Fixed + +- Correct an issue with whitespace handling within `final_env` helper. ### 0.33.0 diff --git a/stable/kong/templates/_helpers.tpl b/stable/kong/templates/_helpers.tpl index 470a8ce399..d3672aa0b8 100644 --- a/stable/kong/templates/_helpers.tpl +++ b/stable/kong/templates/_helpers.tpl @@ -457,7 +457,7 @@ the template that it itself is using form the above sections. - name: KONG_SMTP_MOCK value: "on" {{- end }} -{{- include "kong.license" . }} +{{ include "kong.license" . }} {{- end }} - name: KONG_NGINX_HTTP_INCLUDE value: /kong/servers.conf