From 78381667cc7a6802475592469212b2c1e478f067 Mon Sep 17 00:00:00 2001
From: AlinsRan <alinsran@apache.org>
Date: Tue, 5 Sep 2023 17:50:51 +0800
Subject: [PATCH] chore: upgrade APISIX to 3.5.0

---
 charts/apisix/Chart.yaml               |  4 ++--
 charts/apisix/README.md                |  2 +-
 charts/apisix/templates/configmap.yaml | 12 +++++++++++-
 charts/apisix/values.yaml              |  3 +--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index a7774fd8..2ab9ff33 100644
--- a/charts/apisix/Chart.yaml
+++ b/charts/apisix/Chart.yaml
@@ -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: 1.5.1
+version: 1.6.0
 
 # 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.4.1
+appVersion: 3.5.0
 sources:
   - https://github.com/apache/apisix-helm-chart
 
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 1d00ddcd..0d49696b 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -68,7 +68,7 @@ The command removes all the Kubernetes components associated with the chart and
 | apisix.httpRouter | string | `"radixtree_host_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.4.1-debian"` | Apache APISIX image tag Overrides the image tag whose default is the chart appVersion. |
+| apisix.image.tag | string | `"3.5.0-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 |
diff --git a/charts/apisix/templates/configmap.yaml b/charts/apisix/templates/configmap.yaml
index d884774d..5ac97f0d 100644
--- a/charts/apisix/templates/configmap.yaml
+++ b/charts/apisix/templates/configmap.yaml
@@ -101,9 +101,19 @@ data:
                                     # radixtree_uri_with_parameter: match route by uri with parameters
         ssl: 'radixtree_sni'        # radixtree_sni: match route by SNI(base on radixtree)
 
+      {{- if and .Values.gateway.stream.enabled .Values.gateway.http.enabled }}
+      {{- $proxy_mode := "http&stream" }}
+      {{- else if .Values.gateway.http.enabled }}
+      {{- $proxy_mode := "http" }}
+      {{- else if .Values.gateway.stream.enabled }}
+      {{- $proxy_mode := "stream" }}
+      {{- else }}
+      {{- $proxy_mode := "" }}
+      {{- end }}
       {{- if or (index .Values "ingress-controller" "enabled") (and .Values.gateway.stream.enabled (or (gt (len .Values.gateway.stream.tcp) 0) (gt (len .Values.gateway.stream.udp) 0))) }}
+      proxy_mode: {{ $proxy_mode }}
+
       stream_proxy:                 # TCP/UDP proxy
-        only: {{ .Values.gateway.stream.only }}
         {{- if or (index .Values "ingress-controller" "enabled") (gt (len .Values.gateway.stream.tcp) 0) }}
         tcp:                        # TCP proxy port list
           {{- if gt (len .Values.gateway.stream.tcp) 0}}
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index 48f2ac63..4b1ed942 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -99,7 +99,7 @@ apisix:
     pullPolicy: IfNotPresent
     # -- Apache APISIX image tag
     # Overrides the image tag whose default is the chart appVersion.
-    tag: 3.4.1-debian
+    tag: 3.5.0-debian
 
   # -- Use a `DaemonSet` or `Deployment`
   kind: Deployment
@@ -314,7 +314,6 @@ gateway:
   # -- Apache APISIX service settings for stream. L4 proxy (TCP/UDP)
   stream:
     enabled: false
-    only: false
     tcp: []
     udp: []
   # -- Using ingress access Apache APISIX service