chore: upgrade api7 to v3.2.14.0 (#125)

Signed-off-by: Nic <[email protected]>

Author: nic-6443

charts/api7/Chart.yaml

@@ -15,13 +15,13 @@ 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: 0.15.0
+version: 0.16.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.
 # It is recommended to use it with quotes.
-appVersion: "3.0.0"
+appVersion: "3.2.14"
 
 dependencies:
   - name: prometheus

charts/api7/README.md

@@ -1,6 +1,6 @@
 # api7ee3
 
-![Version: 0.15.0](https://img.shields.io/badge/Version-0.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
+![Version: 0.16.0](https://img.shields.io/badge/Version-0.16.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.14](https://img.shields.io/badge/AppVersion-3.2.14-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -21,14 +21,103 @@ A Helm chart for Kubernetes
 | dashboard.extraEnvVars | list | `[]` |  |
 | dashboard.image.pullPolicy | string | `"Always"` |  |
 | dashboard.image.repository | string | `"api7/api7-ee-3-integrated"` |  |
-| dashboard.image.tag | string | `"v3.2.13.0"` |  |
+| dashboard.image.tag | string | `"v3.2.14.0"` |  |
 | dashboard.keyCertSecret | string | `""` |  |
 | dashboard.replicaCount | int | `1` |  |
 | dashboard_configuration.console.addr | string | `"http://127.0.0.1:3000"` |  |
 | dashboard_configuration.database.dsn | string | `"postgres://api7ee:changeme@api7-postgresql:5432/api7ee"` |  |
+| dashboard_configuration.database.max_idle_conns | int | `2` |  |
+| dashboard_configuration.database.max_open_conns | int | `30` |  |
 | dashboard_configuration.log.level | string | `"warn"` |  |
 | dashboard_configuration.log.output | string | `"stderr"` |  |
-| dashboard_configuration.login.source | string | `"DB"` |  |
+| dashboard_configuration.plugins[0] | string | `"real-ip"` |  |
+| dashboard_configuration.plugins[10] | string | `"referer-restriction"` |  |
+| dashboard_configuration.plugins[11] | string | `"uri-blocker"` |  |
+| dashboard_configuration.plugins[12] | string | `"request-validation"` |  |
+| dashboard_configuration.plugins[13] | string | `"authz-casbin"` |  |
+| dashboard_configuration.plugins[14] | string | `"authz-casdoor"` |  |
+| dashboard_configuration.plugins[15] | string | `"wolf-rbac"` |  |
+| dashboard_configuration.plugins[16] | string | `"multi-auth"` |  |
+| dashboard_configuration.plugins[17] | string | `"ldap-auth"` |  |
+| dashboard_configuration.plugins[18] | string | `"forward-auth"` |  |
+| dashboard_configuration.plugins[19] | string | `"saml-auth"` |  |
+| dashboard_configuration.plugins[1] | string | `"error-page"` |  |
+| dashboard_configuration.plugins[20] | string | `"opa"` |  |
+| dashboard_configuration.plugins[21] | string | `"authz-keycloak"` |  |
+| dashboard_configuration.plugins[22] | string | `"proxy-mirror"` |  |
+| dashboard_configuration.plugins[23] | string | `"proxy-cache"` |  |
+| dashboard_configuration.plugins[24] | string | `"api-breaker"` |  |
+| dashboard_configuration.plugins[25] | string | `"limit-req"` |  |
+| dashboard_configuration.plugins[26] | string | `"gzip"` |  |
+| dashboard_configuration.plugins[27] | string | `"kafka-proxy"` |  |
+| dashboard_configuration.plugins[28] | string | `"grpc-transcode"` |  |
+| dashboard_configuration.plugins[29] | string | `"grpc-web"` |  |
+| dashboard_configuration.plugins[2] | string | `"client-control"` |  |
+| dashboard_configuration.plugins[30] | string | `"public-api"` |  |
+| dashboard_configuration.plugins[31] | string | `"data-mask"` |  |
+| dashboard_configuration.plugins[32] | string | `"opentelemetry"` |  |
+| dashboard_configuration.plugins[33] | string | `"datadog"` |  |
+| dashboard_configuration.plugins[34] | string | `"echo"` |  |
+| dashboard_configuration.plugins[35] | string | `"loggly"` |  |
+| dashboard_configuration.plugins[36] | string | `"splunk-hec-logging"` |  |
+| dashboard_configuration.plugins[37] | string | `"skywalking-logger"` |  |
+| dashboard_configuration.plugins[38] | string | `"google-cloud-logging"` |  |
+| dashboard_configuration.plugins[39] | string | `"sls-logger"` |  |
+| dashboard_configuration.plugins[3] | string | `"proxy-control"` |  |
+| dashboard_configuration.plugins[40] | string | `"tcp-logger"` |  |
+| dashboard_configuration.plugins[41] | string | `"rocketmq-logger"` |  |
+| dashboard_configuration.plugins[42] | string | `"udp-logger"` |  |
+| dashboard_configuration.plugins[43] | string | `"file-logger"` |  |
+| dashboard_configuration.plugins[44] | string | `"clickhouse-logger"` |  |
+| dashboard_configuration.plugins[45] | string | `"ext-plugin-post-resp"` |  |
+| dashboard_configuration.plugins[46] | string | `"serverless-post-function"` |  |
+| dashboard_configuration.plugins[47] | string | `"azure-functions"` |  |
+| dashboard_configuration.plugins[48] | string | `"aws-lambda"` |  |
+| dashboard_configuration.plugins[49] | string | `"openwhisk"` |  |
+| dashboard_configuration.plugins[4] | string | `"zipkin"` |  |
+| dashboard_configuration.plugins[50] | string | `"consumer-restriction"` |  |
+| dashboard_configuration.plugins[51] | string | `"acl"` |  |
+| dashboard_configuration.plugins[52] | string | `"basic-auth"` |  |
+| dashboard_configuration.plugins[53] | string | `"cors"` |  |
+| dashboard_configuration.plugins[54] | string | `"csrf"` |  |
+| dashboard_configuration.plugins[55] | string | `"fault-injection"` |  |
+| dashboard_configuration.plugins[56] | string | `"hmac-auth"` |  |
+| dashboard_configuration.plugins[57] | string | `"jwt-auth"` |  |
+| dashboard_configuration.plugins[58] | string | `"key-auth"` |  |
+| dashboard_configuration.plugins[59] | string | `"openid-connect"` |  |
+| dashboard_configuration.plugins[5] | string | `"ext-plugin-pre-req"` |  |
+| dashboard_configuration.plugins[60] | string | `"limit-count"` |  |
+| dashboard_configuration.plugins[61] | string | `"redirect"` |  |
+| dashboard_configuration.plugins[62] | string | `"request-id"` |  |
+| dashboard_configuration.plugins[63] | string | `"proxy-rewrite"` |  |
+| dashboard_configuration.plugins[64] | string | `"response-rewrite"` |  |
+| dashboard_configuration.plugins[65] | string | `"workflow"` |  |
+| dashboard_configuration.plugins[66] | string | `"proxy-buffering"` |  |
+| dashboard_configuration.plugins[67] | string | `"tencent-cloud-cls"` |  |
+| dashboard_configuration.plugins[68] | string | `"soap"` |  |
+| dashboard_configuration.plugins[69] | string | `"openfunction"` |  |
+| dashboard_configuration.plugins[6] | string | `"mocking"` |  |
+| dashboard_configuration.plugins[70] | string | `"graphql-proxy-cache"` |  |
+| dashboard_configuration.plugins[71] | string | `"ext-plugin-post-req"` |  |
+| dashboard_configuration.plugins[72] | string | `"inspect"` |  |
+| dashboard_configuration.plugins[73] | string | `"graphql-limit-count"` |  |
+| dashboard_configuration.plugins[74] | string | `"elasticsearch-logger"` |  |
+| dashboard_configuration.plugins[75] | string | `"kafka-logger"` |  |
+| dashboard_configuration.plugins[76] | string | `"body-transformer"` |  |
+| dashboard_configuration.plugins[77] | string | `"traffic-split"` |  |
+| dashboard_configuration.plugins[78] | string | `"degraphql"` |  |
+| dashboard_configuration.plugins[79] | string | `"http-logger"` |  |
+| dashboard_configuration.plugins[7] | string | `"serverless-pre-function"` |  |
+| dashboard_configuration.plugins[80] | string | `"cas-auth"` |  |
+| dashboard_configuration.plugins[81] | string | `"traffic-label"` |  |
+| dashboard_configuration.plugins[82] | string | `"oas-validator"` |  |
+| dashboard_configuration.plugins[83] | string | `"api7-traffic-split"` |  |
+| dashboard_configuration.plugins[84] | string | `"limit-conn"` |  |
+| dashboard_configuration.plugins[85] | string | `"prometheus"` |  |
+| dashboard_configuration.plugins[86] | string | `"syslog"` |  |
+| dashboard_configuration.plugins[87] | string | `"ip-restriction"` |  |
+| dashboard_configuration.plugins[8] | string | `"batch-requests"` |  |
+| dashboard_configuration.plugins[9] | string | `"ua-restriction"` |  |
 | dashboard_configuration.prometheus.addr | string | `"http://api7-prometheus-server:9090"` |  |
 | dashboard_configuration.prometheus.basic_auth.password | string | `""` |  |
 | dashboard_configuration.prometheus.basic_auth.username | string | `""` |  |
@@ -46,11 +135,15 @@ A Helm chart for Kubernetes
 | dashboard_configuration.server.listen.disable | bool | `true` |  |
 | dashboard_configuration.server.listen.host | string | `"0.0.0.0"` |  |
 | dashboard_configuration.server.listen.port | int | `7080` |  |
+| dashboard_configuration.server.status.disable | bool | `false` |  |
+| dashboard_configuration.server.status.host | string | `"127.0.0.1"` |  |
+| dashboard_configuration.server.status.port | int | `7081` |  |
 | dashboard_configuration.server.tls.cert_file | string | `""` |  |
 | dashboard_configuration.server.tls.disable | bool | `false` |  |
 | dashboard_configuration.server.tls.host | string | `"0.0.0.0"` |  |
 | dashboard_configuration.server.tls.key_file | string | `""` |  |
 | dashboard_configuration.server.tls.port | int | `7443` |  |
+| dashboard_configuration.session_options_config.max_age | int | `86400` |  |
 | dashboard_configuration.session_options_config.same_site | string | `"lax"` |  |
 | dashboard_configuration.session_options_config.secure | bool | `false` |  |
 | dashboard_service.ingress.annotations | object | `{}` |  |
@@ -84,9 +177,11 @@ A Helm chart for Kubernetes
 | dp_manager.extraEnvVars | list | `[]` |  |
 | dp_manager.image.pullPolicy | string | `"Always"` |  |
 | dp_manager.image.repository | string | `"api7/api7-ee-dp-manager"` |  |
-| dp_manager.image.tag | string | `"v3.2.13.0"` |  |
+| dp_manager.image.tag | string | `"v3.2.14.0"` |  |
 | dp_manager.replicaCount | int | `1` |  |
 | dp_manager_configuration.database.dsn | string | `"postgres://api7ee:changeme@api7-postgresql:5432/api7ee"` |  |
+| dp_manager_configuration.database.max_idle_conns | int | `2` |  |
+| dp_manager_configuration.database.max_open_conns | int | `30` |  |
 | dp_manager_configuration.log.level | string | `"warn"` |  |
 | dp_manager_configuration.log.output | string | `"stderr"` |  |
 | dp_manager_configuration.prometheus.addr | string | `"http://api7-prometheus-server:9090"` |  |
@@ -100,6 +195,9 @@ A Helm chart for Kubernetes
 | dp_manager_configuration.prometheus.tls.server_name | string | `""` |  |
 | dp_manager_configuration.server.listen.host | string | `"0.0.0.0"` |  |
 | dp_manager_configuration.server.listen.port | int | `7900` |  |
+| dp_manager_configuration.server.status.disable | bool | `false` |  |
+| dp_manager_configuration.server.status.host | string | `"127.0.0.1"` |  |
+| dp_manager_configuration.server.status.port | int | `7901` |  |
 | dp_manager_configuration.server.tls.host | string | `"0.0.0.0"` |  |
 | dp_manager_configuration.server.tls.port | int | `7943` |  |
 | dp_manager_service.ingress.annotations | object | `{}` |  |

charts/api7/values.yaml

@@ -10,7 +10,7 @@ dashboard:
     repository: api7/api7-ee-3-integrated
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "v3.2.13.0"
+    tag: "v3.2.14.0"
   extraEnvVars: []
 
 dp_manager:
@@ -19,7 +19,7 @@ dp_manager:
     repository: api7/api7-ee-dp-manager
     pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-    tag: "v3.2.13.0"
+    tag: "v3.2.14.0"
   extraEnvVars: []
 
 developer_portal:
@@ -30,7 +30,6 @@ developer_portal:
     # Overrides the image tag whose default is the chart appVersion.
     tag: "v0.0.5"
   extraEnvVars: []
-    
 
 imagePullSecret: ""
 nameOverride: ""
@@ -209,18 +208,21 @@ dashboard_configuration:
       port: 7443
       key_file: ""    # the file path of private key, (e.g. /app/certs/tls.key)
       cert_file: ""   # the file path of certificate, (e.g. /app/certs/tls.crt)
+    status:
+      disable: false
+      host: "127.0.0.1"
+      port: 7081
   session_options_config:
     same_site: "lax"  # means the value SameSiteNoneMode
     secure: false
-  login:
-    source: DB
+    max_age: 86400
   log:
     level: warn
     output: stderr
   database:
     dsn: "postgres://api7ee:changeme@api7-postgresql:5432/api7ee"
-    # max_idle_conns: 10
-    # max_open_conns: 30
+    max_idle_conns: 2
+    max_open_conns: 30
   prometheus:
     addr: "http://api7-prometheus-server:9090"
     basic_auth: # access the prometheus with basic-auth
@@ -249,6 +251,101 @@ dashboard_configuration:
 #      bucket: "to-push-ha-data"
 #    cron_spec: "@every 1m"
 
+  plugins:
+    - real-ip
+    - error-page
+    - client-control
+    - proxy-control
+    - zipkin
+    #- skywalking
+    - ext-plugin-pre-req
+    - mocking
+    - serverless-pre-function
+    - batch-requests
+    - ua-restriction
+    - referer-restriction
+    - uri-blocker
+    - request-validation
+    - authz-casbin
+    - authz-casdoor
+    - wolf-rbac
+    - multi-auth
+    - ldap-auth
+    - forward-auth
+    - saml-auth
+    - opa
+    - authz-keycloak
+    #- error-log-logger
+    - proxy-mirror
+    - proxy-cache
+    - api-breaker
+    - limit-req
+    #- node-status
+    - gzip
+    - kafka-proxy
+    #- dubbo-proxy
+    - grpc-transcode
+    - grpc-web
+    - public-api
+    - data-mask
+    - opentelemetry
+    - datadog
+    - echo
+    - loggly
+    - splunk-hec-logging
+    - skywalking-logger
+    - google-cloud-logging
+    - sls-logger
+    - tcp-logger
+    - rocketmq-logger
+    - udp-logger
+    - file-logger
+    - clickhouse-logger
+    - ext-plugin-post-resp
+    - serverless-post-function
+    - azure-functions
+    - aws-lambda
+    - openwhisk
+    - consumer-restriction
+    - acl
+    - basic-auth
+    - cors
+    - csrf
+    - fault-injection
+    - hmac-auth
+    - jwt-auth
+    - key-auth
+    - openid-connect
+    - limit-count
+    - redirect
+    - request-id
+    - proxy-rewrite
+    - response-rewrite
+    - workflow
+    - proxy-buffering
+    - tencent-cloud-cls
+    - soap
+    - openfunction
+    - graphql-proxy-cache
+    - ext-plugin-post-req
+    - inspect
+    #- log-rotate
+    - graphql-limit-count
+    - elasticsearch-logger
+    - kafka-logger
+    - body-transformer
+    - traffic-split
+    - degraphql
+    - http-logger
+    - cas-auth
+    - traffic-label
+    - oas-validator
+    - api7-traffic-split
+    - limit-conn
+    - prometheus
+    - syslog
+    - ip-restriction
+
 dp_manager_configuration:
   server:
     listen:
@@ -257,13 +354,17 @@ dp_manager_configuration:
     tls:
       host: "0.0.0.0"
       port: 7943
+    status:
+      disable: false
+      host: "127.0.0.1"
+      port: 7901
   log:
     level: warn
     output: stderr
   database:
     dsn: "postgres://api7ee:changeme@api7-postgresql:5432/api7ee"
-    # max_idle_conns: 10
-    # max_open_conns: 30
+    max_idle_conns: 2
+    max_open_conns: 30
   prometheus:
     addr: "http://api7-prometheus-server:9090"
     basic_auth: # access the prometheus with basic-auth