chore: upgrade api7 and gateway to v3.8.17 (#228)

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.30
+version: 0.17.31
 
 # 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.16"
+appVersion: "3.8.17"
 
 maintainers:
   - name: API7

charts/api7/README.md

@@ -1,6 +1,6 @@
 # api7ee3
 
-![Version: 0.17.30](https://img.shields.io/badge/Version-0.17.30-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.8.16](https://img.shields.io/badge/AppVersion-3.8.16-informational?style=flat-square)
+![Version: 0.17.31](https://img.shields.io/badge/Version-0.17.31-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.8.17](https://img.shields.io/badge/AppVersion-3.8.17-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.16"` |  |
+| dashboard.image.tag | string | `"v3.8.17"` |  |
 | dashboard.keyCertSecret | string | `""` |  |
 | dashboard.livenessProbe.failureThreshold | int | `30` |  |
 | dashboard.livenessProbe.initialDelaySeconds | int | `180` |  |
@@ -54,7 +54,7 @@ A Helm chart for Kubernetes
 | dashboard_configuration.developer_proxy.cache_failure_ttl | int | `15` |  |
 | dashboard_configuration.developer_proxy.cache_success_count | int | `256` |  |
 | dashboard_configuration.developer_proxy.cache_success_ttl | int | `15` |  |
-| dashboard_configuration.log.level | string | `"warn"` |  |
+| dashboard_configuration.log.level | string | `"warn"` | Allowed values: `debug`, `info`, `warn`, `error` |
 | dashboard_configuration.log.output | string | `"stderr"` |  |
 | dashboard_configuration.prometheus.addr | string | `"http://api7-prometheus-server:9090"` |  |
 | dashboard_configuration.prometheus.basic_auth.password | string | `""` |  |
@@ -72,6 +72,11 @@ A Helm chart for Kubernetes
 | dashboard_configuration.prometheus.whitelist[2] | string | `"/api/v1/format_query"` |  |
 | dashboard_configuration.prometheus.whitelist[3] | string | `"/api/v1/series"` |  |
 | dashboard_configuration.prometheus.whitelist[4] | string | `"/api/v1/labels"` |  |
+| dashboard_configuration.security.ip_restriction.allow_list | list | `[]` | empty means allow all |
+| dashboard_configuration.security.ip_restriction.deny_list | list | `[]` |  |
+| dashboard_configuration.security.ip_restriction.message | string | `"Access denied"` |  |
+| dashboard_configuration.security.ip_restriction.response_code | int | `403` |  |
+| dashboard_configuration.security.trusted_proxies | list | `["0.0.0.0/0","::/0"]` | A list of network origins (IPv4 addresses, IPv4 CIDRs, IPv6 addresses or IPv6 CIDRs) from which to trust request's headers("X-Forwarded-For", "X-Real-IP") that contain alternative client IP. |
 | dashboard_configuration.server.listen.disable | bool | `true` |  |
 | dashboard_configuration.server.listen.host | string | `"0.0.0.0"` |  |
 | dashboard_configuration.server.listen.port | int | `7080` |  |
@@ -105,7 +110,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.16"` |  |
+| developer_portal.image.tag | string | `"v3.8.17"` |  |
 | developer_portal.keyCertSecret | string | `""` |  |
 | developer_portal.livenessProbe.failureThreshold | int | `10` |  |
 | developer_portal.livenessProbe.initialDelaySeconds | int | `60` |  |
@@ -120,7 +125,7 @@ A Helm chart for Kubernetes
 | developer_portal_configuration.database.max_idle_time | string | `"30s"` |  |
 | developer_portal_configuration.database.max_open_conns | int | `30` |  |
 | developer_portal_configuration.enable | bool | `true` |  |
-| developer_portal_configuration.log.level | string | `"warn"` |  |
+| developer_portal_configuration.log.level | string | `"warn"` | Allowed values: `debug`, `info`, `warn`, `error` |
 | developer_portal_configuration.log.output | string | `"stderr"` |  |
 | developer_portal_configuration.server.listen.host | string | `"0.0.0.0"` |  |
 | developer_portal_configuration.server.listen.port | int | `4321` |  |
@@ -145,7 +150,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.16"` |  |
+| dp_manager.image.tag | string | `"v3.8.17"` |  |
 | dp_manager.livenessProbe.failureThreshold | int | `10` |  |
 | dp_manager.livenessProbe.initialDelaySeconds | int | `60` |  |
 | dp_manager.livenessProbe.periodSeconds | int | `3` |  |
@@ -161,7 +166,7 @@ A Helm chart for Kubernetes
 | dp_manager_configuration.database.dsn | string | `"postgres://api7ee:changeme@api7-postgresql:5432/api7ee"` |  |
 | dp_manager_configuration.database.max_idle_time | string | `"30s"` |  |
 | dp_manager_configuration.database.max_open_conns | int | `30` |  |
-| dp_manager_configuration.log.level | string | `"warn"` |  |
+| dp_manager_configuration.log.level | string | `"warn"` | Allowed values: `debug`, `info`, `warn`, `error` |
 | dp_manager_configuration.log.output | string | `"stderr"` |  |
 | dp_manager_configuration.prometheus.addr | string | `"http://api7-prometheus-server:9090"` |  |
 | dp_manager_configuration.prometheus.basic_auth.password | 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.16"
+    tag: "v3.8.17"
   # 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,
@@ -54,7 +54,7 @@ dp_manager:
     repository: api7/api7-ee-dp-manager
     pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-    tag: "v3.8.16"
+    tag: "v3.8.17"
   # 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,
@@ -92,7 +92,7 @@ developer_portal:
     repository: api7/api7-ee-developer-portal
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "v3.8.16"
+    tag: "v3.8.17"
 
   extraEnvVars: []
   extraVolumes: []
@@ -318,6 +318,7 @@ dashboard_configuration:
     secure: false
     max_age: 86400
   log:
+    # -- Allowed values: `debug`, `info`, `warn`, `error`
     level: warn
     output: stderr
   database:
@@ -371,8 +372,19 @@ dashboard_configuration:
   #     config_bucket: "to-push-config-data"
   #   cron_spec: "@every 1m"
 
-  # security:
-  #   content_security_policy: "default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
+  security:
+    # content_security_policy: "default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
+
+    # -- A list of network origins (IPv4 addresses, IPv4 CIDRs, IPv6 addresses or IPv6 CIDRs) from which to trust
+    # request's headers("X-Forwarded-For", "X-Real-IP") that contain alternative client IP.
+    trusted_proxies: ["0.0.0.0/0", "::/0"]
+    ip_restriction:
+      # -- empty means allow all
+      allow_list: []
+      # -0 empty means deny none
+      deny_list: []
+      message: "Access denied"
+      response_code: 403
 
 dp_manager_configuration:
   server:
@@ -391,6 +403,7 @@ dp_manager_configuration:
       host: "127.0.0.1"
       port: 7902
   log:
+    # -- Allowed values: `debug`, `info`, `warn`, `error`
     level: warn
     output: stderr
   database:
@@ -435,6 +448,7 @@ developer_portal_configuration:
       host: "127.0.0.1"
       port: 4322
   log:
+    # -- Allowed values: `debug`, `info`, `warn`, `error`
     level: warn
     output: stderr
   database:

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.34
+version: 0.2.35
 
 # 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.16"
+appVersion: "3.8.17"
 
 maintainers:
   - name: API7

charts/gateway/README.md

@@ -205,7 +205,7 @@ The command removes all the Kubernetes components associated with the chart and
 | logs.accessLogFormatEscape | string | `"default"` | Allows setting json or default characters escaping in variables |
 | logs.enableAccessLog | bool | `true` | Enable access log or not, default true |
 | logs.errorLog | string | `"/dev/stderr"` | Error log path |
-| logs.errorLogLevel | string | `"warn"` | Error log level |
+| logs.errorLogLevel | string | `"warn"` | Error log level, Allowed values: `debug`, `info`, `notice`, `warn`, `error`, `crit`, `alert`, `or` `emerg` |
 | nameOverride | string | `""` |  |
 | nginx.enableCPUAffinity | bool | `true` |  |
 | nginx.envs | list | `[]` |  |

charts/gateway/values.yaml

@@ -462,7 +462,7 @@ logs:
   accessLogFormatEscape: default
   # -- Error log path
   errorLog: "/dev/stderr"
-  # -- Error log level
+  # -- Error log level, Allowed values: `debug`, `info`, `notice`, `warn`, `error`, `crit`, `alert`, `or` `emerg`
   errorLogLevel: "warn"
 
 dns: