From 0a1ff708377af3c5f8ca2cfa0e410fbdaa1fc308 Mon Sep 17 00:00:00 2001 From: Travis Raines Date: Wed, 24 Jul 2019 11:33:21 -0700 Subject: [PATCH] [stable/kong] add release to template ConfigMap (#15817) Adds the release name as a prefix to the custom NGINX template ConfigMap. The static name created a regression preventing multiple installations of Kong in the same namespace, as Helm would attempt to create the same ConfigMap twice. Signed-off-by: Travis Raines --- stable/kong/Chart.yaml | 2 +- stable/kong/templates/config-custom-server-blocks.yaml | 4 ++-- stable/kong/templates/deployment.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stable/kong/Chart.yaml b/stable/kong/Chart.yaml index 33d11b5954..03febffe8b 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.14.1 +version: 0.14.2 appVersion: 1.2 diff --git a/stable/kong/templates/config-custom-server-blocks.yaml b/stable/kong/templates/config-custom-server-blocks.yaml index f737209c58..ddb21201d2 100644 --- a/stable/kong/templates/config-custom-server-blocks.yaml +++ b/stable/kong/templates/config-custom-server-blocks.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: kong-default-custom-server-blocks + name: {{ .Release.Name }}-kong-default-custom-server-blocks labels: app: {{ template "kong.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" @@ -26,4 +26,4 @@ data: access_log off; stub_status; } - } \ No newline at end of file + } diff --git a/stable/kong/templates/deployment.yaml b/stable/kong/templates/deployment.yaml index 945af73bbe..49a52fd496 100644 --- a/stable/kong/templates/deployment.yaml +++ b/stable/kong/templates/deployment.yaml @@ -251,5 +251,5 @@ spec: volumes: - name: custom-nginx-template-volume configMap: - name: kong-default-custom-server-blocks + name: {{ .Release.Name }}-kong-default-custom-server-blocks