[apisix-helm-chart] branch master updated: fix: move item to keep it consistent (#426)

[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 1d7e03b  fix: move item to keep it consistent (#426)
1d7e03b is described below

commit 1d7e03b29e7f18d882d0af049cc41053680dcd25
Author: Jintao Zhang <zh...@gmail.com>
AuthorDate: Tue Dec 27 18:21:27 2022 +0800

    fix: move item to keep it consistent (#426)
---
 charts/apisix-ingress-controller/Chart.yaml               | 2 +-
 charts/apisix-ingress-controller/README.md                | 4 ++--
 charts/apisix-ingress-controller/templates/configmap.yaml | 2 +-
 charts/apisix-ingress-controller/values.yaml              | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/charts/apisix-ingress-controller/Chart.yaml b/charts/apisix-ingress-controller/Chart.yaml
index 91b0e9e..a965ad4 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.1
+version: 0.11.2
 appVersion: 1.6.0-rc1
 sources:
   - https://github.com/apache/apisix-helm-chart
diff --git a/charts/apisix-ingress-controller/README.md b/charts/apisix-ingress-controller/README.md
index 756ff2a..82f1d20 100644
--- a/charts/apisix-ingress-controller/README.md
+++ b/charts/apisix-ingress-controller/README.md
@@ -110,9 +110,9 @@ The same for container level, you need to set:
 | autoscaling.minReplicas | int | `1` |  |
 | autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
 | clusterDomain | string | `"cluster.local"` |  |
-| config.apisix | object | `{"adminKey":"edd1c9f034335f136f87ad84b625c8f1","clusterName":"default","serviceName":"apisix-admin","serviceNamespace":"ingress-apisix","servicePort":9180}` | APISIX related configurations. |
+| config.apisix | object | `{"adminAPIVersion":"v2","adminKey":"edd1c9f034335f136f87ad84b625c8f1","clusterName":"default","serviceName":"apisix-admin","serviceNamespace":"ingress-apisix","servicePort":9180}` | APISIX related configurations. |
+| config.apisix.adminAPIVersion | string | `"v2"` | the APISIX admin API version. can be "v2" or "v3", default is "v2". |
 | config.apisix.serviceName | string | `"apisix-admin"` | Enabling this value, overrides serviceName and serviceNamespace. serviceFullname: "apisix-admin.apisix.svc.local" |
-| config.apisixAdminAPIVersion | string | `"v3"` | the APISIX admin API version. can be "v2" or "v3", default is "v3". |
 | config.apisixResourceSyncInterval | string | `"300s"` | Default interval for synchronizing Kubernetes resources to APISIX |
 | config.certFile | string | `"/etc/webhook/certs/cert.pem"` | the TLS certificate file path. |
 | config.enableProfiling | bool | `true` | enable profiling via web interfaces host:port/debug/pprof, default is true. |
diff --git a/charts/apisix-ingress-controller/templates/configmap.yaml b/charts/apisix-ingress-controller/templates/configmap.yaml
index 84d9f1e..7e035c0 100644
--- a/charts/apisix-ingress-controller/templates/configmap.yaml
+++ b/charts/apisix-ingress-controller/templates/configmap.yaml
@@ -52,7 +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 }}
+      admin_api_version: {{ .Values.config.apisix.adminAPIVersion | quote }}
       {{ if .Values.config.apisix.serviceFullname }}
       default_cluster_base_url: http://{{ .Values.config.apisix.serviceFullname }}:{{ .Values.config.apisix.servicePort }}/apisix/admin
       {{ else }}
diff --git a/charts/apisix-ingress-controller/values.yaml b/charts/apisix-ingress-controller/values.yaml
index f13dc73..b6df281 100644
--- a/charts/apisix-ingress-controller/values.yaml
+++ b/charts/apisix-ingress-controller/values.yaml
@@ -79,8 +79,6 @@ config:
   ingressStatusAddress: []
   # -- enable profiling via web interfaces host:port/debug/pprof, default is true.
   enableProfiling: true
-  # -- the APISIX admin API version. can be "v2" or "v3", default is "v3".
-  apisixAdminAPIVersion: "v3"
   # -- Default interval for synchronizing Kubernetes resources to APISIX
   apisixResourceSyncInterval: "300s"
   # -- Kubernetes related configurations.
@@ -132,6 +130,8 @@ config:
     servicePort: 9180
     adminKey: "edd1c9f034335f136f87ad84b625c8f1"
     clusterName: "default"
+    # -- the APISIX admin API version. can be "v2" or "v3", default is "v2".
+    adminAPIVersion: "v2"
 
 resources: {}