This is an automated email from the ASF dual-hosted git repository.
zhangjintao pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git
The following commit(s) were added to refs/heads/dev by this push:
new 1c938e7 chore(dev): upgrade APISIX to 3.5.0 (#606)
1c938e7 is described below
commit 1c938e7f4a86f2e15bd4c0aba2f9f34405660391
Author: Xin Rong <[email protected]>
AuthorDate: Wed Sep 6 17:30:47 2023 +0800
chore(dev): upgrade APISIX to 3.5.0 (#606)
---
charts/apisix/Chart.yaml | 4 ++--
charts/apisix/README.md | 4 ++--
charts/apisix/templates/configmap.yaml | 12 +++++++++++-
charts/apisix/values.yaml | 3 +--
4 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index 3109821..8d132f3 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: 2.1.0
+version: 2.2.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.0
+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 aa3ce75..73e628f 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -178,7 +178,7 @@ The command removes all the Kubernetes components
associated with the chart and
| hostNetwork | bool | `false` | |
| image.pullPolicy | string | `"IfNotPresent"` | Apache APISIX image pull
policy |
| image.repository | string | `"apache/apisix"` | Apache APISIX image
repository |
-| image.tag | string | `"3.4.0-debian"` | Apache APISIX image tag Overrides
the image tag whose default is the chart appVersion. |
+| image.tag | string | `"3.5.0-debian"` | Apache APISIX image tag Overrides
the image tag whose default is the chart appVersion. |
| ingress | object |
`{"annotations":{},"enabled":false,"hosts":[{"host":"apisix.local","paths":[]}],"tls":[]}`
| Using ingress access Apache APISIX service |
| ingress-controller | object |
`{"config":{"apisix":{"adminAPIVersion":"v3"}},"enabled":false}` | Ingress
controller configuration |
| ingress.annotations | object | `{}` | Ingress annotations |
@@ -209,7 +209,7 @@ The command removes all the Kubernetes components
associated with the chart and
| service.http | object |
`{"additionalContainerPorts":[],"containerPort":9080,"enabled":true,"servicePort":80}`
| Apache APISIX service settings for http |
| service.http.additionalContainerPorts | list | `[]` | Support multiple http
ports, See
[Configuration](https://github.com/apache/apisix/blob/0bc65ea9acd726f79f80ae0abd8f50b7eb172e3d/conf/config-default.yaml#L24)
|
| service.labelsOverride | object | `{}` | Override default labels assigned to
Apache APISIX gateway resources |
-| service.stream | object | `{"enabled":false,"only":false,"tcp":[],"udp":[]}`
| Apache APISIX service settings for stream. L4 proxy (TCP/UDP) |
+| service.stream | object | `{"enabled":false,"tcp":[],"udp":[]}` | Apache
APISIX service settings for stream. L4 proxy (TCP/UDP) |
| service.tls | object | `{"servicePort":443}` | Apache APISIX service
settings for tls |
| service.type | string | `"NodePort"` | Apache APISIX service type for user
access itself |
| serviceAccount.annotations | object | `{}` | |
diff --git a/charts/apisix/templates/configmap.yaml
b/charts/apisix/templates/configmap.yaml
index 7d803cd..03711dd 100644
--- a/charts/apisix/templates/configmap.yaml
+++ b/charts/apisix/templates/configmap.yaml
@@ -97,10 +97,20 @@ data:
# radixtree_host_uri: match route by host
+ uri(base on radixtree)
# 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.service.stream.enabled .Values.service.http.enabled }}
+ {{- $proxy_mode = "http&stream" }}
+ {{- else if .Values.service.http.enabled }}
+ {{- $proxy_mode = "http" }}
+ {{- else if .Values.service.stream.enabled }}
+ {{- $proxy_mode = "stream" }}
+ {{- end }}
+
+ proxy_mode: {{ $proxy_mode }}
{{- if or (index .Values "ingress-controller" "enabled") (and
.Values.service.stream.enabled (or (gt (len .Values.service.stream.tcp) 0) (gt
(len .Values.service.stream.udp) 0))) }}
stream_proxy: # TCP/UDP proxy
- only: {{ .Values.service.stream.only }}
{{- if or (index .Values "ingress-controller" "enabled") (gt (len
.Values.service.stream.tcp) 0) }}
tcp: # TCP proxy port list
{{- if gt (len .Values.service.stream.tcp) 0}}
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index 7dfd71a..6ce16fc 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -29,7 +29,7 @@ image:
pullPolicy: IfNotPresent
# -- Apache APISIX image tag
# Overrides the image tag whose default is the chart appVersion.
- tag: 3.4.0-debian
+ tag: 3.5.0-debian
# -- set false to use `Deployment`, set true to use `DaemonSet`
useDaemonSet: false
@@ -183,7 +183,6 @@ service:
# -- Apache APISIX service settings for stream. L4 proxy (TCP/UDP)
stream:
enabled: false
- only: false
tcp: []
udp: []
# - secretName: apisix-tls
