[apisix-helm-chart] branch master updated: fix: Bad configuration items cause incompatible Ingress and apisix (#424)

[alinsran]

This is an automated email from the ASF dual-hosted git repository.

alinsran 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 e3b16cb  fix: Bad configuration items cause incompatible Ingress and 
apisix (#424)
e3b16cb is described below

commit e3b16cb398e6c8f46820388176d3abc4ae5bca51
Author: Xin Rong <alinsran...@gmail.com>
AuthorDate: Fri Dec 23 11:22:10 2022 +0800

    fix: Bad configuration items cause incompatible Ingress and apisix (#424)
    
    fix: #423
    
    Co-authored-by: rongxin <alins...@apache.org>
---
 charts/apisix-ingress-controller/Chart.yaml               | 2 +-
 charts/apisix-ingress-controller/templates/configmap.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/apisix-ingress-controller/Chart.yaml 
b/charts/apisix-ingress-controller/Chart.yaml
index 926005c..91b0e9e 100644
--- a/charts/apisix-ingress-controller/Chart.yaml
+++ b/charts/apisix-ingress-controller/Chart.yaml
@@ -24,7 +24,7 @@ keywords:
   - nginx
   - crd
 type: application
-version: 0.11.0
+version: 0.11.1
 appVersion: 1.6.0-rc1
 sources:
   - https://github.com/apache/apisix-helm-chart
diff --git a/charts/apisix-ingress-controller/templates/configmap.yaml 
b/charts/apisix-ingress-controller/templates/configmap.yaml
index 1beab28..84d9f1e 100644
--- a/charts/apisix-ingress-controller/templates/configmap.yaml
+++ b/charts/apisix-ingress-controller/templates/configmap.yaml
@@ -32,7 +32,6 @@ data:
     {{- end }}
     {{- end }}
     enable_profiling: {{ .Values.config.enableProfiling }}
-    apisix-admin-api-version: {{ .Values.config.apisixAdminAPIVersion }}
     apisix-resource-sync-interval: {{ 
.Values.config.apisixResourceSyncInterval }}
     kubernetes:
       kubeconfig: {{ .Values.config.kubernetes.kubeconfig | quote }}
@@ -53,6 +52,7 @@ data:
       apisix_version: {{ .Values.config.kubernetes.apiVersion | quote }}
       plugin_metadata_cm: {{ .Values.config.kubernetes.pluginMetadataCM | 
quote }}
     apisix:
+      admin_api_version: {{ .Values.config.apisixAdminAPIVersion | quote }}
       {{ if .Values.config.apisix.serviceFullname }}
       default_cluster_base_url: http://{{ 
.Values.config.apisix.serviceFullname }}:{{ .Values.config.apisix.servicePort 
}}/apisix/admin
       {{ else }}