chore: upgrade APISIX to 3.5.0 (#603)
diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index a7774fd..2ab9ff3 100644
--- a/charts/apisix/Chart.yaml
+++ b/charts/apisix/Chart.yaml
@@ -31,12 +31,12 @@
# 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 1d00ddc..5889269 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -68,7 +68,7 @@
| 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 |
@@ -182,7 +182,7 @@
| gateway.proxyProtocol | object | `{"http":{"containerPort":9181,"enabled":false,"servicePort":9181},"https":{"containerPort":9182,"enabled":false,"servicePort":9182}}` | Proxy Protocol Configuration |
| gateway.proxyProtocol.http | object | `{"containerPort":9181,"enabled":false,"servicePort":9181}` | If you enable proxy protocol, you must use this port to receive http request with proxy protocol |
| gateway.proxyProtocol.https | object | `{"containerPort":9182,"enabled":false,"servicePort":9182}` | The port with proxy protocol for https |
-| gateway.stream | object | `{"enabled":false,"only":false,"tcp":[],"udp":[]}` | Apache APISIX service settings for stream. L4 proxy (TCP/UDP) |
+| gateway.stream | object | `{"enabled":false,"tcp":[],"udp":[]}` | Apache APISIX service settings for stream. L4 proxy (TCP/UDP) |
| gateway.tls | object | `{"additionalContainerPorts":[],"certCAFilename":"","containerPort":9443,"enabled":false,"existingCASecret":"","fallbackSNI":"","http2":{"enabled":true},"servicePort":443,"sslProtocols":"TLSv1.2 TLSv1.3"}` | Apache APISIX service settings for tls |
| gateway.tls.additionalContainerPorts | list | `[]` | Support multiple https ports, See [Configuration](https://github.com/apache/apisix/blob/0bc65ea9acd726f79f80ae0abd8f50b7eb172e3d/conf/config-default.yaml#L99) |
| gateway.tls.certCAFilename | string | `""` | Filename be used in the gateway.tls.existingCASecret |
diff --git a/charts/apisix/templates/configmap.yaml b/charts/apisix/templates/configmap.yaml
index d884774..ebe0b5c 100644
--- a/charts/apisix/templates/configmap.yaml
+++ b/charts/apisix/templates/configmap.yaml
@@ -101,9 +101,19 @@
# radixtree_uri_with_parameter: match route by uri with parameters
ssl: 'radixtree_sni' # radixtree_sni: match route by SNI(base on radixtree)
+ {{- $proxy_mode := "" }}
+ {{- 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" }}
+ {{- end }}
+
+ proxy_mode: {{ $proxy_mode }}
+
{{- 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))) }}
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 48f2ac6..4b1ed94 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -99,7 +99,7 @@
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 @@
# -- Apache APISIX service settings for stream. L4 proxy (TCP/UDP)
stream:
enabled: false
- only: false
tcp: []
udp: []
# -- Using ingress access Apache APISIX service
