You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by al...@apache.org on 2023/10/13 09:10:44 UTC
[apisix-helm-chart] branch dev updated: chore(dev): upgrade APISIX to 3.6.0 (#640)
This is an automated email from the ASF dual-hosted git repository.
alinsran 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 86bf34a chore(dev): upgrade APISIX to 3.6.0 (#640)
86bf34a is described below
commit 86bf34a48825afd77da251afd4d198bef0bb0996
Author: Xin Rong <al...@apache.org>
AuthorDate: Fri Oct 13 17:10:38 2023 +0800
chore(dev): upgrade APISIX to 3.6.0 (#640)
---
charts/apisix/Chart.yaml | 4 +--
charts/apisix/README.md | 17 +---------
charts/apisix/templates/configmap.yaml | 27 +--------------
charts/apisix/templates/deployment.yaml | 31 ------------------
charts/apisix/templates/service-control-plane.yaml | 38 ----------------------
charts/apisix/values.yaml | 37 +--------------------
6 files changed, 5 insertions(+), 149 deletions(-)
diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index 8d132f3..ea33d66 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.2.0
+version: 2.3.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.5.0
+appVersion: 3.6.0
sources:
- https://github.com/apache/apisix-helm-chart
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 61eb3cd..003e6d7 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -63,21 +63,6 @@ The command removes all the Kubernetes components associated with the chart and
| apisix.customPlugins.plugins[0].configMap | object | `{"mounts":[{"key":"the-file-name","path":"mount-path"}],"name":"configmap-name"}` | plugin codes can be saved inside configmap object. |
| apisix.customPlugins.plugins[0].configMap.mounts | list | `[{"key":"the-file-name","path":"mount-path"}]` | since keys in configmap is flat, mountPath allows to define the mount path, so that plugin codes can be mounted hierarchically. |
| apisix.customPlugins.plugins[0].configMap.name | string | `"configmap-name"` | name of configmap. |
-| apisix.deployment.certs | object | `{"cert":"","cert_key":"","certsSecret":"","mTLSCACert":"","mTLSCACertSecret":""}` | certs used for certificates in decoupled mode |
-| apisix.deployment.certs.cert | string | `""` | cert name in certsSecret |
-| apisix.deployment.certs.cert_key | string | `""` | cert key in certsSecret |
-| apisix.deployment.certs.certsSecret | string | `""` | secret name used for decoupled mode |
-| apisix.deployment.certs.mTLSCACert | string | `""` | mTLS CA cert filename in mTLSCACertSecret |
-| apisix.deployment.certs.mTLSCACertSecret | string | `""` | trusted_ca_cert name in certsSecret |
-| apisix.deployment.controlPlane | object | `{"cert":"","certKey":"","certsSecret":"","confServerPort":"9280"}` | used for control_plane deployment mode |
-| apisix.deployment.controlPlane.cert | string | `""` | conf Server CA cert name in certsSecret |
-| apisix.deployment.controlPlane.certKey | string | `""` | conf Server cert key name in certsSecret |
-| apisix.deployment.controlPlane.certsSecret | string | `""` | secret name used by conf Server |
-| apisix.deployment.controlPlane.confServerPort | string | `"9280"` | conf Server address |
-| apisix.deployment.dataPlane | object | `{"controlPlane":{"host":[],"prefix":"/apisix","timeout":30}}` | used for data_plane deployment mode |
-| apisix.deployment.dataPlane.controlPlane.host | list | `[]` | The hosts of the control_plane used by the data_plane |
-| apisix.deployment.dataPlane.controlPlane.prefix | string | `"/apisix"` | The prefix of the control_plane used by the data_plane |
-| apisix.deployment.dataPlane.controlPlane.timeout | int | `30` | Timeout when the data plane connects to the control plane |
| apisix.deployment.mode | string | `"traditional"` | Apache APISIX deployment mode Optional: traditional, decoupled ref: https://apisix.apache.org/docs/apisix/deployment-modes/ |
| apisix.deployment.role | string | `"traditional"` | Deployment role Optional: traditional, data_plane, control_plane ref: https://apisix.apache.org/docs/apisix/deployment-modes/ |
| apisix.discovery.enabled | bool | `false` | Enable or disable Apache APISIX integration service discovery |
@@ -181,7 +166,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.5.0-debian"` | Apache APISIX image tag Overrides the image tag whose default is the chart appVersion. |
+| image.tag | string | `"3.6.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":[]}],"servicePort":null,"tls":[]}` | Using ingress access Apache APISIX service |
| ingress-controller | object | `{"config":{"apisix":{"adminAPIVersion":"v3"}},"enabled":false}` | Ingress controller configuration |
| ingress.annotations | object | `{}` | Ingress annotations |
diff --git a/charts/apisix/templates/configmap.yaml b/charts/apisix/templates/configmap.yaml
index 61177b1..e4e4a07 100644
--- a/charts/apisix/templates/configmap.yaml
+++ b/charts/apisix/templates/configmap.yaml
@@ -289,13 +289,6 @@ data:
{{- if eq .Values.apisix.deployment.role "control_plane" }}
role_control_plane:
config_provider: etcd
- conf_server:
- listen: 0.0.0.0:{{ .Values.apisix.deployment.controlPlane.confServerPort }}
- cert: "/conf-server-ssl/{{ .Values.apisix.deployment.controlPlane.cert }}"
- cert_key: "/conf-server-ssl/{{ .Values.apisix.deployment.controlPlane.certKey }}"
- {{- if .Values.apisix.deployment.certs.mTLSCACertSecret }}
- client_ca_cert: "/conf-ca-ssl/{{ .Values.apisix.deployment.certs.mTLSCACert }}"
- {{- end }}
{{- end }}
admin:
@@ -375,23 +368,5 @@ data:
{{- if eq .Values.apisix.deployment.role "data_plane" }}
role_data_plane:
- config_provider: control_plane
- control_plane:
- host:
- {{- range $.Values.apisix.deployment.dataPlane.controlPlane.host }}
- - {{ . | quote }}
- {{- end }}
- prefix: {{ .Values.apisix.deployment.dataPlane.controlPlane.prefix }}
- timeout: {{ .Values.apisix.deployment.dataPlane.controlPlane.timeout }}
- {{- end }}
-
- {{- if eq .Values.apisix.deployment.mode "decoupled"}}
- {{- if .Values.apisix.deployment.certs.certsSecret }}
- certs:
- cert: "/conf-client-ssl/{{ .Values.apisix.deployment.certs.cert }}"
- cert_key: "/conf-client-ssl/{{ .Values.apisix.deployment.certs.cert_key }}"
- {{- if .Values.apisix.deployment.certs.mTLSCACertSecret }}
- trusted_ca_cert: "/conf-ca-ssl/{{ .Values.apisix.deployment.certs.mTLSCACert }}"
- {{- end }}
- {{- end }}
+ config_provider: etcd
{{- end }}
diff --git a/charts/apisix/templates/deployment.yaml b/charts/apisix/templates/deployment.yaml
index b86811c..5a9aa5d 100644
--- a/charts/apisix/templates/deployment.yaml
+++ b/charts/apisix/templates/deployment.yaml
@@ -180,21 +180,6 @@ spec:
subPath: {{ .Values.apisix.ssl.certCAFilename }}
{{- end }}
- {{- if and (eq .Values.apisix.deployment.role "control_plane") .Values.apisix.deployment.controlPlane.certsSecret }}
- - mountPath: /conf-server-ssl
- name: conf-server-ssl
- {{- end }}
-
- {{- if and (eq .Values.apisix.deployment.mode "decoupled") .Values.apisix.deployment.certs.mTLSCACertSecret }}
- - mountPath: /conf-ca-ssl
- name: conf-ca-ssl
- {{- end }}
-
- {{- if and (eq .Values.apisix.deployment.mode "decoupled") .Values.apisix.deployment.certs.certsSecret }}
- - mountPath: /conf-client-ssl
- name: conf-client-ssl
- {{- end }}
-
{{- if .Values.etcd.auth.tls.enabled }}
- mountPath: /etcd-ssl
name: etcd-ssl
@@ -257,23 +242,7 @@ spec:
secretName: {{ .Values.etcd.auth.tls.existingSecret | quote }}
name: etcd-ssl
{{- end }}
- {{- if and (eq .Values.apisix.deployment.role "control_plane") .Values.apisix.deployment.controlPlane.certsSecret }}
- - secret:
- secretName: {{ .Values.apisix.deployment.controlPlane.certsSecret | quote }}
- name: conf-server-ssl
- {{- end }}
-
- {{- if and (eq .Values.apisix.deployment.mode "decoupled") .Values.apisix.deployment.certs.mTLSCACertSecret }}
- - secret:
- secretName: {{ .Values.apisix.deployment.certs.mTLSCACertSecret | quote }}
- name: conf-ca-ssl
- {{- end }}
- {{- if and (eq .Values.apisix.deployment.mode "decoupled") .Values.apisix.deployment.certs.certsSecret }}
- - secret:
- secretName: {{ .Values.apisix.deployment.certs.certsSecret | quote }}
- name: conf-client-ssl
- {{- end }}
{{- if .Values.apisix.setIDFromPodUID }}
- downwardAPI:
items:
diff --git a/charts/apisix/templates/service-control-plane.yaml b/charts/apisix/templates/service-control-plane.yaml
deleted file mode 100644
index b61ffd4..0000000
--- a/charts/apisix/templates/service-control-plane.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-{{- if and (eq .Values.apisix.deployment.mode "decoupled") (eq .Values.apisix.deployment.role "control_plane") }}
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "apisix.fullname" . }}-control-plane
- namespace: {{ .Release.Namespace }}
- annotations:
- {{- range $key, $value := .Values.apisix.admin.annotations }}
- {{ $key }}: {{ $value | quote }}
- {{- end }}
- labels:
- {{- include "apisix.labels" . | nindent 4 }}
- app.kubernetes.io/service: apisix-control-plane
-spec:
- type: "ClusterIP"
- ports:
- - name: apisix-control-plane
- port: {{ .Values.apisix.deployment.controlPlane.confServerPort }}
- targetPort: {{ .Values.apisix.deployment.controlPlane.confServerPort }}
- protocol: TCP
- selector:
- {{- include "apisix.selectorLabels" . | nindent 4 }}
-{{ end }}
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index ce90be4..a5f0629 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.5.0-debian
+ tag: 3.6.0-debian
# -- set false to use `Deployment`, set true to use `DaemonSet`
useDaemonSet: false
@@ -303,41 +303,6 @@ apisix:
# ref: https://apisix.apache.org/docs/apisix/deployment-modes/
role: "traditional"
- # -- used for control_plane deployment mode
- controlPlane:
- # -- conf Server address
- confServerPort: "9280"
- # -- secret name used by conf Server
- certsSecret: ""
- # -- conf Server CA cert name in certsSecret
- cert: ""
- # -- conf Server cert key name in certsSecret
- certKey: ""
-
- # -- used for data_plane deployment mode
- dataPlane:
- controlPlane:
- # -- The hosts of the control_plane used by the data_plane
- host: []
- # -- The prefix of the control_plane used by the data_plane
- prefix: "/apisix"
- # -- Timeout when the data plane connects to the control plane
- timeout: 30
-
- # -- certs used for certificates in decoupled mode
- certs:
- # -- secret name used for decoupled mode
- certsSecret: ""
- # -- cert name in certsSecret
- cert: ""
- # -- cert key in certsSecret
- cert_key: ""
-
- # -- trusted_ca_cert name in certsSecret
- mTLSCACertSecret: ""
- # -- mTLS CA cert filename in mTLSCACertSecret
- mTLSCACert: ""
-
admin:
# -- Enable Admin API
enabled: true