This is an automated email from the ASF dual-hosted git repository.
wenming 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 d75b22c fix: apply correct cluster key from secret for 553 (#568)
d75b22c is described below
commit d75b22c96caed236abff2429a1e18bca4b9590cf
Author: ikatlinsky <[email protected]>
AuthorDate: Wed Jun 28 10:05:38 2023 +0200
fix: apply correct cluster key from secret for 553 (#568)
Co-authored-by: Katlinsky, Ilya <[email protected]>
---
charts/apisix-ingress-controller/templates/configmap.yaml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/charts/apisix-ingress-controller/templates/configmap.yaml
b/charts/apisix-ingress-controller/templates/configmap.yaml
index f5a0a95..3b2f664 100644
--- a/charts/apisix-ingress-controller/templates/configmap.yaml
+++ b/charts/apisix-ingress-controller/templates/configmap.yaml
@@ -58,7 +58,9 @@ data:
{{ else }}
default_cluster_base_url: http://{{ .Values.config.apisix.serviceName
}}.{{ .Values.config.apisix.serviceNamespace }}.svc.{{ .Values.clusterDomain
}}:{{ .Values.config.apisix.servicePort }}/apisix/admin
{{- end}}
- {{- if not .Values.config.apisix.existingSecret }}
+ {{- if .Values.config.apisix.existingSecret }}
+ default_cluster_admin_key: "{{"{{"}}.DEFAULT_CLUSTER_ADMIN_KEY{{"}}"}}"
+ {{- else }}
default_cluster_admin_key: {{ .Values.config.apisix.adminKey | quote }}
{{- end }}
default_cluster_name: {{ .Values.config.apisix.clusterName | quote }}
