From e3b16cb398e6c8f46820388176d3abc4ae5bca51 Mon Sep 17 00:00:00 2001 From: Xin Rong Date: Fri, 23 Dec 2022 11:22:10 +0800 Subject: [PATCH] fix: Bad configuration items cause incompatible Ingress and apisix (#424) fix: #423 Co-authored-by: rongxin --- 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 926005ca..91b0e9eb 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 1beab28f..84d9f1e5 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 }}