chore: upgrade api7 to v3.2.16.3 (#148)

Signed-off-by: ashing <[email protected]>
api7 · Oct 21, 2024 · 71479c2 · 71479c2
1 parent 700b575
commit 71479c2
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 204 deletions.
diff --git a/charts/api7/Chart.yaml b/charts/api7/Chart.yaml
@@ -15,7 +15,7 @@ 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.16.16
+version: 0.16.17
 
 # 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

diff --git a/charts/api7/README.md b/charts/api7/README.md
@@ -1,6 +1,6 @@
 # api7ee3
 
-![Version: 0.16.16](https://img.shields.io/badge/Version-0.16.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.16](https://img.shields.io/badge/AppVersion-3.2.16-informational?style=flat-square)
+![Version: 0.16.17](https://img.shields.io/badge/Version-0.16.17-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.16](https://img.shields.io/badge/AppVersion-3.2.16-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -23,106 +23,20 @@ A Helm chart for Kubernetes
 | dashboard.extraVolumes | list | `[]` |  |
 | dashboard.image.pullPolicy | string | `"Always"` |  |
 | dashboard.image.repository | string | `"api7/api7-ee-3-integrated"` |  |
-| dashboard.image.tag | string | `"v3.2.16.2"` |  |
+| dashboard.image.tag | string | `"v3.2.16.3"` |  |
 | dashboard.keyCertSecret | string | `""` |  |
 | dashboard.replicaCount | int | `1` |  |
 | dashboard_configuration.console.addr | string | `"http://127.0.0.1:3000"` |  |
+| dashboard_configuration.consumer_proxy.cache_failure_count | int | `512` |  |
+| dashboard_configuration.consumer_proxy.cache_failure_ttl | int | `60` |  |
+| dashboard_configuration.consumer_proxy.cache_success_count | int | `512` |  |
+| dashboard_configuration.consumer_proxy.cache_success_ttl | int | `60` |  |
+| dashboard_configuration.consumer_proxy.enable | bool | `false` |  |
 | 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.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 | `"attach-consumer-label"` |  |
-| dashboard_configuration.plugins[52] | string | `"acl"` |  |
-| dashboard_configuration.plugins[53] | string | `"basic-auth"` |  |
-| dashboard_configuration.plugins[54] | string | `"cors"` |  |
-| dashboard_configuration.plugins[55] | string | `"csrf"` |  |
-| dashboard_configuration.plugins[56] | string | `"fault-injection"` |  |
-| dashboard_configuration.plugins[57] | string | `"hmac-auth"` |  |
-| dashboard_configuration.plugins[58] | string | `"jwt-auth"` |  |
-| dashboard_configuration.plugins[59] | string | `"key-auth"` |  |
-| dashboard_configuration.plugins[5] | string | `"ext-plugin-pre-req"` |  |
-| dashboard_configuration.plugins[60] | string | `"openid-connect"` |  |
-| dashboard_configuration.plugins[61] | string | `"limit-count"` |  |
-| dashboard_configuration.plugins[62] | string | `"redirect"` |  |
-| dashboard_configuration.plugins[63] | string | `"request-id"` |  |
-| dashboard_configuration.plugins[64] | string | `"proxy-rewrite"` |  |
-| dashboard_configuration.plugins[65] | string | `"response-rewrite"` |  |
-| dashboard_configuration.plugins[66] | string | `"workflow"` |  |
-| dashboard_configuration.plugins[67] | string | `"proxy-buffering"` |  |
-| dashboard_configuration.plugins[68] | string | `"tencent-cloud-cls"` |  |
-| 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 | `"graphql-limit-count"` |  |
-| dashboard_configuration.plugins[73] | string | `"elasticsearch-logger"` |  |
-| dashboard_configuration.plugins[74] | string | `"kafka-logger"` |  |
-| dashboard_configuration.plugins[75] | string | `"body-transformer"` |  |
-| dashboard_configuration.plugins[76] | string | `"traffic-split"` |  |
-| dashboard_configuration.plugins[77] | string | `"degraphql"` |  |
-| dashboard_configuration.plugins[78] | string | `"http-logger"` |  |
-| dashboard_configuration.plugins[79] | string | `"cas-auth"` |  |
-| dashboard_configuration.plugins[7] | string | `"serverless-pre-function"` |  |
-| dashboard_configuration.plugins[80] | string | `"traffic-label"` |  |
-| dashboard_configuration.plugins[81] | string | `"oas-validator"` |  |
-| dashboard_configuration.plugins[82] | string | `"api7-traffic-split"` |  |
-| dashboard_configuration.plugins[83] | string | `"limit-conn"` |  |
-| dashboard_configuration.plugins[84] | string | `"prometheus"` |  |
-| dashboard_configuration.plugins[85] | string | `"syslog"` |  |
-| dashboard_configuration.plugins[86] | string | `"ip-restriction"` |  |
-| dashboard_configuration.plugins[87] | string | `"mqtt-proxy"` |  |
-| dashboard_configuration.plugins[88] | string | `"ai-proxy"` |  |
-| dashboard_configuration.plugins[89] | string | `"ai-prompt-template"` |  |
-| dashboard_configuration.plugins[8] | string | `"batch-requests"` |  |
-| dashboard_configuration.plugins[90] | string | `"ai-prompt-decorator"` |  |
-| 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 | `""` |  |
@@ -166,7 +80,7 @@ A Helm chart for Kubernetes
 | developer_portal.extraEnvVars | list | `[]` |  |
 | developer_portal.image.pullPolicy | string | `"IfNotPresent"` |  |
 | developer_portal.image.repository | string | `"api7/api7-developer-portal"` |  |
-| developer_portal.image.tag | string | `"v0.1.2"` |  |
+| developer_portal.image.tag | string | `"v0.1.3"` |  |
 | developer_portal.keyCertSecret | string | `""` |  |
 | developer_portal.replicaCount | int | `1` |  |
 | developer_portal_configuration.enable | bool | `true` |  |
@@ -188,7 +102,7 @@ A Helm chart for Kubernetes
 | dp_manager.extraVolumes | list | `[]` |  |
 | dp_manager.image.pullPolicy | string | `"Always"` |  |
 | dp_manager.image.repository | string | `"api7/api7-ee-dp-manager"` |  |
-| dp_manager.image.tag | string | `"v3.2.16.2"` |  |
+| dp_manager.image.tag | string | `"v3.2.16.3"` |  |
 | 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` |  |
@@ -205,6 +119,9 @@ A Helm chart for Kubernetes
 | dp_manager_configuration.prometheus.tls.insecure_skip_verify | bool | `false` |  |
 | dp_manager_configuration.prometheus.tls.key_file | string | `""` |  |
 | dp_manager_configuration.prometheus.tls.server_name | string | `""` |  |
+| dp_manager_configuration.rate_limit.count | int | `1000` |  |
+| dp_manager_configuration.rate_limit.enable | bool | `false` |  |
+| dp_manager_configuration.rate_limit.time_window | int | `1` |  |
 | 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` |  |

diff --git a/charts/api7/values.yaml b/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.16.2"
+    tag: "v3.2.16.3"
   # Resources of the deployment.
   # It has a higher priority than the common resources configuration:
   # when this field is configured, it is used first in the deployment,
@@ -33,7 +33,7 @@ dp_manager:
     repository: api7/api7-ee-dp-manager
     pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-    tag: "v3.2.16.2"
+    tag: "v3.2.16.3"
   # Resources of the deployment.
   # It has a higher priority than the common resources configuration:
   # when this field is configured, it is used first in the deployment,
@@ -56,7 +56,7 @@ developer_portal:
     repository: api7/api7-developer-portal
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "v0.1.2"
+    tag: "v0.1.3"
   # Specifies the name of Secret for developer portal TLS configuration, and files store under /app/certs directory
   keyCertSecret: ""
   extraEnvVars: []
@@ -277,111 +277,19 @@ dashboard_configuration:
       - "/api/v1/labels"
   console:
     addr: "http://127.0.0.1:3000"
-#  fallback_cp:
-#    aws_s3:
-#      access_key: "access"
-#      secret_key: "secret"
-#      region: "ap-south-1"
-#      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
-    - attach-consumer-label
-    - 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
-    - openfunction
-    - graphql-proxy-cache
-    - ext-plugin-post-req
-    #- 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
-    - mqtt-proxy
-    - ai-proxy
-    - ai-prompt-template
-    - ai-prompt-decorator
+  consumer_proxy:
+    enable: false
+    cache_success_count: 512
+    cache_success_ttl: 60
+    cache_failure_count: 512
+    cache_failure_ttl: 60
+  # fallback_cp:
+  #   aws_s3:
+  #     access_key: "access"
+  #     secret_key: "secret"
+  #     region: "ap-south-1"
+  #     bucket: "to-push-ha-data"
+  #   cron_spec: "@every 1m"
 
 dp_manager_configuration:
   server:
@@ -415,6 +323,10 @@ dp_manager_configuration:
       key_file: ""  # the file path of the private key for requesting prometheus, (e.g. /app/prometheus/certs/tls.key)
       cert_file: "" # the file path of the certificate for requesting prometheus, (e.g. /app/prometheus/certs/tls.crt)
       ca_file: ""   # the file path of the ca to verify the prometheus tls server. (e.g. /app/prometheus/certs/ca.crt)
+  rate_limit:
+    enable: false
+    time_window: 1  # unit: second
+    count: 1000
 
 developer_portal_configuration:
   enable: true