chore: upgrade api7 to v3.8.13 (#206)

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.17.22
+version: 0.17.23
 
 # 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.8.11"
+appVersion: "3.8.13"
 
 maintainers:
   - name: API7

charts/api7/README.md

@@ -1,6 +1,6 @@
 # api7ee3
 
-![Version: 0.17.22](https://img.shields.io/badge/Version-0.17.22-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.8.11](https://img.shields.io/badge/AppVersion-3.8.11-informational?style=flat-square)
+![Version: 0.17.23](https://img.shields.io/badge/Version-0.17.23-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.8.13](https://img.shields.io/badge/AppVersion-3.8.13-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -29,7 +29,7 @@ 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.8.11"` |  |
+| dashboard.image.tag | string | `"v3.8.13"` |  |
 | dashboard.keyCertSecret | string | `""` |  |
 | dashboard.livenessProbe.failureThreshold | int | `30` |  |
 | dashboard.livenessProbe.initialDelaySeconds | int | `180` |  |
@@ -103,7 +103,7 @@ A Helm chart for Kubernetes
 | developer_portal.extraVolumes | list | `[]` |  |
 | developer_portal.image.pullPolicy | string | `"Always"` |  |
 | developer_portal.image.repository | string | `"api7/api7-ee-developer-portal"` |  |
-| developer_portal.image.tag | string | `"v3.8.11"` |  |
+| developer_portal.image.tag | string | `"v3.8.13"` |  |
 | developer_portal.keyCertSecret | string | `""` |  |
 | developer_portal.livenessProbe.failureThreshold | int | `10` |  |
 | developer_portal.livenessProbe.initialDelaySeconds | int | `60` |  |
@@ -142,7 +142,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.8.11"` |  |
+| dp_manager.image.tag | string | `"v3.8.13"` |  |
 | dp_manager.livenessProbe.failureThreshold | int | `10` |  |
 | dp_manager.livenessProbe.initialDelaySeconds | int | `60` |  |
 | dp_manager.livenessProbe.periodSeconds | int | `3` |  |
@@ -162,6 +162,7 @@ A Helm chart for Kubernetes
 | dp_manager_configuration.prometheus.addr | string | `"http://api7-prometheus-server:9090"` |  |
 | dp_manager_configuration.prometheus.basic_auth.password | string | `""` |  |
 | dp_manager_configuration.prometheus.basic_auth.username | string | `""` |  |
+| dp_manager_configuration.prometheus.remote_write_path | string | `"/api/v1/write"` |  |
 | dp_manager_configuration.prometheus.timeout | string | `"30s"` |  |
 | dp_manager_configuration.prometheus.tls.ca_file | string | `""` |  |
 | dp_manager_configuration.prometheus.tls.cert_file | string | `""` |  |

charts/api7/values.yaml

@@ -18,7 +18,7 @@ dashboard:
     repository: api7/api7-ee-3-integrated
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "v3.8.11"
+    tag: "v3.8.13"
   # 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,
@@ -50,7 +50,7 @@ dp_manager:
     repository: api7/api7-ee-dp-manager
     pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-    tag: "v3.8.11"
+    tag: "v3.8.13"
   # 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,
@@ -84,7 +84,7 @@ developer_portal:
     repository: api7/api7-ee-developer-portal
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "v3.8.11"
+    tag: "v3.8.13"
 
   extraEnvVars: []
   extraVolumes: []
@@ -340,6 +340,9 @@ dashboard_configuration:
     cache_success_ttl: 15
     cache_failure_count: 256
     cache_failure_ttl: 15
+  # admin_api_address: "https://dash.api7.ai"
+  # dp_manager_address:
+  #   - "https://dpm.api7.ai"
   # fallback_cp:
   #   aws_s3:
   #     access_key: "access"
@@ -377,6 +380,7 @@ dp_manager_configuration:
     max_idle_time: 30s
   prometheus:
     addr: "http://api7-prometheus-server:9090"
+    remote_write_path: "/api/v1/write"
     timeout: "30s"
     basic_auth:  #  access the prometheus with basic-auth
       username: ""  # Basic-auth username. If the username is empty, basic-auth authentication is not performed when requesting prometheus.

charts/gateway/Chart.yaml

@@ -14,12 +14,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: 0.2.25
+version: 0.2.26
 
 # 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.8.11"
+appVersion: "3.8.13"
 
 maintainers:
   - name: API7

charts/gateway/README.md

@@ -102,8 +102,10 @@ The command removes all the Kubernetes components associated with the chart and
 | apisix.httpRouter | string | `"radixtree_host_uri"` | Defines how apisix handles routing: - radixtree_uri: match route by uri(base on radixtree) - radixtree_host_uri: match route by host + uri(base on radixtree) - radixtree_uri_with_parameter: match route by uri with parameters |
 | apisix.image.pullPolicy | string | `"Always"` | API7 Gateway image pull policy |
 | apisix.image.repository | string | `"api7/api7-ee-3-gateway"` | API7 Gateway image repository |
-| apisix.image.tag | string | `"3.8.11"` | API7 Gateway image tag Overrides the image tag whose default is the chart appVersion. |
+| apisix.image.tag | string | `"3.8.13"` | API7 Gateway image tag Overrides the image tag whose default is the chart appVersion. |
 | apisix.kind | string | `"Deployment"` | Use a `DaemonSet` or `Deployment` |
+| apisix.lru | object | `{"secret":{"count":512,"ttl":300}}` | fine tune the parameters of LRU cache for some features like secret |
+| apisix.lru.secret.ttl | int | `300` | in seconds |
 | apisix.meta.luaSharedDict.prometheus-metrics | string | `"15m"` |  |
 | apisix.nodeSelector | object | `{}` | Node labels for API7 Gateway pod assignment |
 | apisix.normalizeURILikeServlet | bool | `false` | The URI normalization in servlet is a little different from the RFC's. See https://github.com/jakartaee/servlet/blob/master/spec/src/main/asciidoc/servlet-spec-body.adoc#352-uri-path-canonicalization, which is used under Tomcat. Turn this option on if you want to be compatible with servlet when matching URI path. |

charts/gateway/templates/configmap.yaml

@@ -135,6 +135,12 @@ data:
 
       disable_upstream_healthcheck: {{ .Values.api7ee.disable_upstream_healthcheck }}
 
+      # fine tune the parameters of LRU cache for some features like secret
+      lru:
+        secret:
+          ttl: {{ .Values.apisix.lru.secret.ttl }} # seconds
+          count: {{ .Values.apisix.lru.secret.count }}
+
     nginx_config:    # config for render the template to genarate nginx.conf
       error_log: "{{ .Values.logs.errorLog }}"
       error_log_level: "{{ .Values.logs.errorLogLevel }}"    # warn,error

charts/gateway/values.yaml

@@ -84,6 +84,13 @@ apisix:
       saml_sessions: 10m
       status_report: 1m
 
+  # -- fine tune the parameters of LRU cache for some features like secret
+  lru:
+    secret:
+      # -- in seconds
+      ttl: 300
+      count: 512
+
   # -- Add custom [lua_shared_dict](https://github.com/openresty/lua-nginx-module#toc88) settings,
   # click [here](https://github.com/apache/apisix-helm-chart/blob/master/charts/apisix/values.yaml#L27-L30) to learn the format of a shared dict
   customLuaSharedDicts: []
@@ -125,7 +132,7 @@ apisix:
     pullPolicy: Always
     # -- API7 Gateway image tag
     # Overrides the image tag whose default is the chart appVersion.
-    tag: 3.8.11
+    tag: 3.8.13
 
   # -- Use a `DaemonSet` or `Deployment`
   kind: Deployment