chore: release for APISIX v2 chart (#446)

* chore: release for APISIX v2 chart
* chore: set ingress-controller adminAPIVersion to v2 by default
* ci: don't check version

.github/workflows/ci.yaml

@@ -33,7 +33,7 @@ jobs:
                && cd ../.. \
                && helm repo add bitnami https://charts.bitnami.com/bitnami \
                && helm repo add apisix https://charts.apiseven.com \
-               && ct lint \
+               && ct lint --check-version-increment=false \
                   --charts charts/apisix \
                   --charts charts/apisix-dashboard \
                   --charts charts/apisix-ingress-controller'
@@ -83,4 +83,4 @@ jobs:
             echo "Please use helm-docs in your clone, of your fork, of the project, and commit a updated README.md for the chart."
           fi
           git diff --exit-code
-          rm -f ./helm-docs
+          rm -f ./helm-docs

charts/apisix/Chart.lock

@@ -4,9 +4,9 @@ dependencies:
   version: 8.3.4
 - name: apisix-dashboard
   repository: https://charts.apiseven.com
-  version: 0.6.1
+  version: 0.7.0
 - name: apisix-ingress-controller
   repository: https://charts.apiseven.com
   version: 0.11.3
-digest: sha256:c7873b7d21e0f5eaeca649dccdc344de5fceed50c11925c9f71263659671057a
-generated: "2022-12-30T18:30:37.854445324+08:00"
+digest: sha256:16443ab0568e0a70214309f4da138ebf645a4f1e06f31edb3d404b189f790a43
+generated: "2023-01-10T15:54:08.708874467+08:00"

charts/apisix/Chart.yaml

@@ -16,7 +16,7 @@
 #
 apiVersion: v2
 name: apisix
-description: A Helm chart for Apache APISIX
+description: A Helm chart for Apache APISIX v2.x
 icon: https://apache.org/logos/res/apisix/apisix.png
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -31,12 +31,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.12.3
+version: 0.11.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 3.1.0
+appVersion: 2.15.1
 sources:
   - https://github.com/apache/apisix-helm-chart
 
@@ -46,7 +46,7 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
     condition: etcd.enabled
   - name: apisix-dashboard
-    version: 0.6.1
+    version: 0.7.0
     repository: https://charts.apiseven.com
     condition: dashboard.enabled
     alias: dashboard

charts/apisix/README.md

@@ -62,7 +62,7 @@ The command removes all the Kubernetes components associated with the chart and
 | apisix.httpRouter | string | `"radixtree_uri"` | Defines how apisix handles routing: - radixtree_uri: match route by uri(base on radixtree) - radixtree_host_uri: match route by host + uri(base on radixtree) - radixtree_uri_with_parameter: match route by uri with parameters |
 | apisix.image.pullPolicy | string | `"IfNotPresent"` | Apache APISIX image pull policy |
 | apisix.image.repository | string | `"apache/apisix"` | Apache APISIX image repository |
-| apisix.image.tag | string | `"3.1.0-debian"` | Apache APISIX image tag Overrides the image tag whose default is the chart appVersion. |
+| apisix.image.tag | string | `"2.15.1-debian"` | Apache APISIX image tag Overrides the image tag whose default is the chart appVersion. |
 | apisix.kind | string | `"Deployment"` | Use a `DaemonSet` or `Deployment` |
 | apisix.luaModuleHook | object | `{"configMapRef":{"mounts":[{"key":"","path":""}],"name":""},"enabled":false,"hookPoint":"","luaPath":""}` | Whether to add a custom lua module |
 | apisix.luaModuleHook.configMapRef | object | `{"mounts":[{"key":"","path":""}],"name":""}` | configmap that stores the codes |
@@ -143,6 +143,7 @@ The command removes all the Kubernetes components associated with the chart and
 | gateway.tls.sslProtocols | string | `"TLSv1.2 TLSv1.3"` | TLS protocols allowed to use. |
 | gateway.type | string | `"NodePort"` | Apache APISIX service type for user access itself |
 | global.imagePullSecrets | list | `[]` | Global Docker registry secret names as an array |
+| ingress-controller.config.apisix.adminAPIVersion | string | `"v2"` |  |
 | ingress-controller.enabled | bool | `false` |  |
 | initContainer.image | string | `"busybox"` | Init container image |
 | initContainer.tag | float | `1.28` | Init container tag |

charts/apisix/templates/configmap.yaml

@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- $isBeta := (semverCompare ">=2.99.0-0" .Values.apisix.image.tag) }}
-
 {{- if .Values.apisix.enabled }}
 apiVersion: v1
 kind: ConfigMap
@@ -89,7 +87,6 @@ data:
       #    disk_path: "/tmp/disk_cache_two"
       #    cache_levels: "1:2"
 
-      {{- if not $isBeta }}
       config_center: etcd           # etcd: use etcd to store the config value
                                     # yaml: fetch the config value from local yaml file `/your_path/conf/apisix.yaml`
       allow_admin:                  # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
@@ -121,7 +118,6 @@ data:
         - name: "viewer"
           key: {{ .Values.admin.credentials.viewer }}
           role: viewer
-      {{- end }}
 
       router:
         http: {{ .Values.apisix.httpRouter }}  # radixtree_uri: match route by uri(base on radixtree)
@@ -225,7 +221,6 @@ data:
       stream_configuration_snippet: {{- toYaml .Values.configurationSnippet.stream | indent 6 }}
       {{- end }}
 
-    {{- if not $isBeta }}
     etcd:
     {{- if .Values.etcd.enabled }}
       host:                          # it's possible to define multiple etcd hosts addresses of the same etcd cluster.
@@ -255,7 +250,6 @@ data:
         sni: "{{ .Values.etcd.auth.tls.sni }}"
         {{- end }}
       {{- end }}
-    {{- end }}
 
     {{- if .Values.discovery.enabled }}
     discovery:
@@ -310,69 +304,5 @@ data:
         {{- toYaml .Values.wasmPlugins.plugins | nindent 8 }}
     {{- end }}
 
-    {{- if $isBeta }}
-    deployment:
-      role: traditional
-      role_traditional:
-        config_provider: etcd
-      admin:
-        allow_admin:    # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
-        {{- if .Values.admin.allow.ipList }}
-        {{- range $ips := .Values.admin.allow.ipList }}
-          - {{ $ips }}
-        {{- end }}
-        {{- else }}
-          - 0.0.0.0/0
-        {{- end}}
-        {{- if or (index .Values "ingress-controller" "enabled") .Values.dashboard.enabled  }}
-          - 0.0.0.0/0
-        {{- end}}
-        #   - "::/64"
-        {{- if .Values.admin.enabled }}
-        admin_listen:
-          ip: 0.0.0.0
-          port: {{ .Values.admin.port }}
-        {{- end }}
-        # Default token when use API to call for Admin API.
-        # *NOTE*: Highly recommended to modify this value to protect APISIX's Admin API.
-        # Disabling this configuration item means that the Admin API does not
-        # require any authentication.
-        admin_key:
-          # admin: can everything for configuration data
-          - name: "admin"
-            key: {{ .Values.admin.credentials.admin }}
-            role: admin
-          # viewer: only can view configuration data
-          - name: "viewer"
-            key: {{ .Values.admin.credentials.viewer }}
-            role: viewer
-      etcd:
-      {{- if .Values.etcd.enabled }}
-        host:                          # it's possible to define multiple etcd hosts addresses of the same etcd cluster.
-          {{- if .Values.etcd.fullnameOverride }}
-          - "{{ include "apisix.etcd.auth.scheme" . }}://{{ .Values.etcd.fullnameOverride }}:{{ .Values.etcd.service.port }}"
-          {{- else }}
-          - "{{ include "apisix.etcd.auth.scheme" . }}://{{ .Release.Name }}-etcd.{{ .Release.Namespace }}.svc.{{ .Values.etcd.clusterDomain }}:{{ .Values.etcd.service.port }}"
-          {{- end}}
-      {{- else }}
-        host:                          # it's possible to define multiple etcd hosts addresses of the same etcd cluster.
-          {{- range $value := .Values.etcd.host }}
-          - "{{ $value }}"             # multiple etcd address
-          {{- end}}
-      {{- end }}
-        prefix: {{ .Values.etcd.prefix | quote }}    # configuration prefix in etcd
-        timeout: {{ .Values.etcd.timeout }}    # 30 seconds
-        {{- if .Values.etcd.auth.rbac.create }}
-        user: {{ .Values.etcd.auth.rbac.user | quote }}
-        password: {{ .Values.etcd.auth.rbac.password | quote }}
-        {{- end }}
-        {{- if .Values.etcd.auth.tls.enabled }}
-        tls:
-          cert: "/etcd-ssl/{{ .Values.etcd.auth.tls.certFilename }}"
-          key: "/etcd-ssl/{{ .Values.etcd.auth.tls.certKeyFilename }}"
-          verify: {{ .Values.etcd.auth.tls.verify }}
-          sni: "{{ .Values.etcd.auth.tls.sni }}"
-        {{- end }}
-    {{- end }}
     {{- end }}
 {{- end }}

charts/apisix/values.yaml

@@ -81,7 +81,7 @@ apisix:
     pullPolicy: IfNotPresent
     # -- Apache APISIX image tag
     # Overrides the image tag whose default is the chart appVersion.
-    tag: 3.1.0-debian
+    tag: 2.15.1-debian
 
   # -- Use a `DaemonSet` or `Deployment`
   kind: Deployment
@@ -532,6 +532,9 @@ dashboard:
 
 ingress-controller:
   enabled: false
+  config:
+    apisix:
+      adminAPIVersion: "v2"
 
 vault:
   # -- Enable or disable the vault integration