You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by zh...@apache.org on 2023/04/04 06:49:46 UTC
[apisix-helm-chart] branch master updated: chore: clear APISIX plugins and stream_plugins (#525)
This is an automated email from the ASF dual-hosted git repository.
zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git
The following commit(s) were added to refs/heads/master by this push:
new 747be19 chore: clear APISIX plugins and stream_plugins (#525)
747be19 is described below
commit 747be19f6d8ed4ac39a3d754ebebfda69975e92d
Author: Gallardot <ga...@apache.org>
AuthorDate: Tue Apr 4 14:49:39 2023 +0800
chore: clear APISIX plugins and stream_plugins (#525)
---
charts/apisix/README.md | 6 ++--
charts/apisix/templates/configmap.yaml | 2 ++
charts/apisix/values.schema.json | 2 +-
charts/apisix/values.yaml | 58 +++-------------------------------
4 files changed, 9 insertions(+), 59 deletions(-)
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index e947123..1c8c2ac 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -187,7 +187,7 @@ The command removes all the Kubernetes components associated with the chart and
| nginx.workerProcesses | string | `"auto"` | |
| nginx.workerRlimitNofile | string | `"20480"` | |
| pluginAttrs | object | `{}` | Set APISIX plugin attributes, see [config-default.yaml](https://github.com/apache/apisix/blob/master/conf/config-default.yaml#L376) for more details |
-| plugins | list | `["api-breaker","authz-keycloak","basic-auth","batch-requests","body-transformer","consumer-restriction","cors","echo","fault-injection","file-logger","grpc-transcode","grpc-web","hmac-auth","http-logger","ip-restriction","ua-restriction","jwt-auth","kafka-logger","key-auth","limit-conn","limit-count","limit-req","node-status","openid-connect","authz-casbin","prometheus","proxy-cache","proxy-mirror","proxy-rewrite","redirect","referer-restriction","request-id","request [...]
+| plugins | list | `[]` | Customize the list of APISIX plugins to enable. By default, APISIX's default plugins are automatically used. See [config-default.yaml](https://github.com/apache/apisix/blob/master/conf/config-default.yaml) |
| rbac.create | bool | `false` | |
| serviceAccount.annotations | object | `{}` | |
| serviceAccount.create | bool | `false` | |
@@ -202,9 +202,7 @@ The command removes all the Kubernetes components associated with the chart and
| serviceMonitor.name | string | `""` | name of the serviceMonitor, by default, it is the same as the apisix fullname |
| serviceMonitor.namespace | string | `""` | namespace where the serviceMonitor is deployed, by default, it is the same as the namespace of the apisix |
| serviceMonitor.path | string | `"/apisix/prometheus/metrics"` | path of the metrics endpoint |
-| stream_plugins[0] | string | `"mqtt-proxy"` | |
-| stream_plugins[1] | string | `"ip-restriction"` | |
-| stream_plugins[2] | string | `"limit-conn"` | |
+| stream_plugins | list | `[]` | Customize the list of APISIX stream_plugins to enable. By default, APISIX's default stream_plugins are automatically used. See [config-default.yaml](https://github.com/apache/apisix/blob/master/conf/config-default.yaml) |
| updateStrategy | object | `{}` | |
| vault.enabled | bool | `false` | Enable or disable the vault integration |
| vault.host | string | `""` | The host address where the vault server is running. |
diff --git a/charts/apisix/templates/configmap.yaml b/charts/apisix/templates/configmap.yaml
index c1bc849..5549089 100644
--- a/charts/apisix/templates/configmap.yaml
+++ b/charts/apisix/templates/configmap.yaml
@@ -234,12 +234,14 @@ data:
{{- end }}
{{- end }}
{{- end }}
+ {{- if .Values.stream_plugins }}
stream_plugins:
{{- range $plugin := .Values.stream_plugins }}
{{- if ne $plugin "" }}
- {{ $plugin }}
{{- end }}
{{- end }}
+ {{- end }}
{{- if .Values.extPlugin.enabled }}
ext-plugin:
diff --git a/charts/apisix/values.schema.json b/charts/apisix/values.schema.json
index 42ccad7..03c15b0 100644
--- a/charts/apisix/values.schema.json
+++ b/charts/apisix/values.schema.json
@@ -7,7 +7,7 @@
"items": {
"type": "string"
},
- "minItems": 1,
+ "minItems": 0,
"uniqueItems": true
},
"stream_plugins": {
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index 9c6dc77..09c7dd5 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -336,60 +336,10 @@ nginx:
enableCPUAffinity: true
envs: []
-# -- APISIX plugins to be enabled
-plugins:
- - api-breaker
- - authz-keycloak
- - basic-auth
- - batch-requests
- - body-transformer
- - consumer-restriction
- - cors
- - echo
- - fault-injection
- - file-logger
- - grpc-transcode
- - grpc-web
- - hmac-auth
- - http-logger
- - ip-restriction
- - ua-restriction
- - jwt-auth
- - kafka-logger
- - key-auth
- - limit-conn
- - limit-count
- - limit-req
- - node-status
- - openid-connect
- - authz-casbin
- - prometheus
- - proxy-cache
- - proxy-mirror
- - proxy-rewrite
- - redirect
- - referer-restriction
- - request-id
- - request-validation
- - response-rewrite
- - serverless-post-function
- - serverless-pre-function
- - sls-logger
- - syslog
- - tcp-logger
- - udp-logger
- - uri-blocker
- - wolf-rbac
- - zipkin
- - traffic-split
- - gzip
- - real-ip
- - ext-plugin-pre-req
- - ext-plugin-post-req
-stream_plugins:
- - mqtt-proxy
- - ip-restriction
- - limit-conn
+# -- Customize the list of APISIX plugins to enable. By default, APISIX's default plugins are automatically used. See [config-default.yaml](https://github.com/apache/apisix/blob/master/conf/config-default.yaml)
+plugins: []
+# -- Customize the list of APISIX stream_plugins to enable. By default, APISIX's default stream_plugins are automatically used. See [config-default.yaml](https://github.com/apache/apisix/blob/master/conf/config-default.yaml)
+stream_plugins: []
# -- Set APISIX plugin attributes, see [config-default.yaml](https://github.com/apache/apisix/blob/master/conf/config-default.yaml#L376) for more details
pluginAttrs: {}