You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by zh...@apache.org on 2022/11/08 01:13:46 UTC
[apisix-helm-chart] branch master updated: fix: podAnnotations render error (#371)
This is an automated email from the ASF dual-hosted git repository.
zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git
The following commit(s) were added to refs/heads/master by this push:
new 361447e fix: podAnnotations render error (#371)
361447e is described below
commit 361447e31c6f95f4c9b7cb1ae1bed4fa8fa1d338
Author: Gallardot <tt...@163.com>
AuthorDate: Tue Nov 8 09:13:41 2022 +0800
fix: podAnnotations render error (#371)
---
charts/apisix-dashboard/templates/deployment.yaml | 6 ++++--
charts/apisix-ingress-controller/templates/deployment.yaml | 6 ++++--
charts/apisix/templates/_pod.tpl | 6 ++++--
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/charts/apisix-dashboard/templates/deployment.yaml b/charts/apisix-dashboard/templates/deployment.yaml
index f04db67..6514594 100644
--- a/charts/apisix-dashboard/templates/deployment.yaml
+++ b/charts/apisix-dashboard/templates/deployment.yaml
@@ -32,8 +32,10 @@ spec:
metadata:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
- {{- with .Values.podAnnotations }}
- {{- toYaml . | nindent 8 }}
+ {{- if .Values.podAnnotations }}
+ {{- range $key, $value := $.Values.podAnnotations }}
+ {{ $key }}: {{ $value | quote }}
+ {{- end }}
{{- end }}
labels:
{{- include "apisix-dashboard.selectorLabels" . | nindent 8 }}
diff --git a/charts/apisix-ingress-controller/templates/deployment.yaml b/charts/apisix-ingress-controller/templates/deployment.yaml
index 2546a10..6ee1226 100644
--- a/charts/apisix-ingress-controller/templates/deployment.yaml
+++ b/charts/apisix-ingress-controller/templates/deployment.yaml
@@ -32,8 +32,10 @@ spec:
metadata:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
- {{- with .Values.podAnnotations }}
- {{- toYaml . | nindent 8 }}
+ {{- if .Values.podAnnotations }}
+ {{- range $key, $value := $.Values.podAnnotations }}
+ {{ $key }}: {{ $value | quote }}
+ {{- end }}
{{- end }}
labels:
{{- include "apisix-ingress-controller.selectorLabels" . | nindent 8 }}
diff --git a/charts/apisix/templates/_pod.tpl b/charts/apisix/templates/_pod.tpl
index 5b77893..db2bc46 100644
--- a/charts/apisix/templates/_pod.tpl
+++ b/charts/apisix/templates/_pod.tpl
@@ -2,8 +2,10 @@
metadata:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
- {{- with .Values.apisix.podAnnotations }}
- {{- toYaml . | nindent 4 }}
+ {{- if .Values.apisix.podAnnotations }}
+ {{- range $key, $value := $.Values.apisix.podAnnotations }}
+ {{ $key }}: {{ $value | quote }}
+ {{- end }}
{{- end }}
labels:
{{- include "apisix.selectorLabels" . | nindent 4 }}