[apisix-helm-chart] branch master updated: fix: fix farmat of configmap for apisix-ingress-controller (#430)

[zh...@apache.org]

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 0926be8  fix: fix farmat of configmap for apisix-ingress-controller (#430)
0926be8 is described below

commit 0926be8ae7e48f06e3acdd4d9eb72f098a9d05aa
Author: 胡伟煌 <hu...@foxmail.com>
AuthorDate: Fri Dec 30 17:57:19 2022 +0800

    fix: fix farmat of configmap for apisix-ingress-controller (#430)
---
 charts/apisix-ingress-controller/templates/configmap.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/apisix-ingress-controller/templates/configmap.yaml b/charts/apisix-ingress-controller/templates/configmap.yaml
index 7e035c0..9cf83f0 100644
--- a/charts/apisix-ingress-controller/templates/configmap.yaml
+++ b/charts/apisix-ingress-controller/templates/configmap.yaml
@@ -16,7 +16,7 @@
 #
 apiVersion: v1
 data:
-  config.yaml: |
+  config.yaml: |-
     # log options
     log_level: {{ .Values.config.logLevel | quote }}
     log_output: {{ .Values.config.logOutput | quote }}
@@ -24,7 +24,7 @@ data:
     key_file: {{ .Values.config.keyFile | quote }}
     http_listen: {{ .Values.config.httpListen | quote }}
     https_listen: {{ .Values.config.httpsListen | quote }}
-    ingress_publish_service: {{ .Values.config.ingressPublishService }}
+    ingress_publish_service: {{ .Values.config.ingressPublishService | quote }}
     {{- if gt (len .Values.config.ingressStatusAddress) 0 }}
     ingress_status_address:
     {{- range .Values.config.ingressStatusAddress }}
@@ -53,11 +53,11 @@ data:
       plugin_metadata_cm: {{ .Values.config.kubernetes.pluginMetadataCM | quote }}
     apisix:
       admin_api_version: {{ .Values.config.apisix.adminAPIVersion | quote }}
-      {{ if .Values.config.apisix.serviceFullname }}
+      {{- if .Values.config.apisix.serviceFullname }}
       default_cluster_base_url: http://{{ .Values.config.apisix.serviceFullname }}:{{ .Values.config.apisix.servicePort }}/apisix/admin
       {{ else }}
       default_cluster_base_url: http://{{ .Values.config.apisix.serviceName }}.{{ .Values.config.apisix.serviceNamespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.config.apisix.servicePort }}/apisix/admin
-      {{ end}}
+      {{- end}}
       default_cluster_admin_key: {{ .Values.config.apisix.adminKey | quote }}
       default_cluster_name: {{ .Values.config.apisix.clusterName | quote }}
 kind: ConfigMap