This is an automated email from the ASF dual-hosted git repository.
lingsamuel 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 7052184 fix: apisix-charts's global.imagePullSecrets (#355)
7052184 is described below
commit 705218487e6ecd986c83d16461082d7f29b7e13a
Author: Jintao Zhang <[email protected]>
AuthorDate: Thu Sep 29 14:02:26 2022 +0800
fix: apisix-charts's global.imagePullSecrets (#355)
Since we use the same parameter name as bitnami/etcd charts, this parameter
will affect the final configuration of both charts.
This modification makes their behavior consistent.
Signed-off-by: Jintao Zhang <[email protected]>
Signed-off-by: Jintao Zhang <[email protected]>
---
charts/apisix/templates/_pod.tpl | 4 +++-
charts/apisix/values.yaml | 5 +++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/charts/apisix/templates/_pod.tpl b/charts/apisix/templates/_pod.tpl
index 766cb72..890f48c 100644
--- a/charts/apisix/templates/_pod.tpl
+++ b/charts/apisix/templates/_pod.tpl
@@ -10,7 +10,9 @@ metadata:
spec:
{{- with .Values.global.imagePullSecrets }}
imagePullSecrets:
- {{- toYaml . | nindent 4 }}
+ {{- range $.Values.global.imagePullSecrets }}
+ - name: {{ . }}
+ {{- end }}
{{- end }}
serviceAccountName: {{ include "apisix.serviceAccountName" . }}
securityContext: {{- toYaml .Values.podSecurityContext | nindent 4 }}
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index ca43061..fd6b6c7 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -15,6 +15,11 @@
# limitations under the License.
global:
+ # e.g.
+ # imagePullSecrets:
+ # - my-registry-secrets
+ # - other-registry-secrets
+ #
imagePullSecrets: []
apisix:
