Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/api7/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ type: application
# Versions are expected to follow Semantic Versioning (https://semver.org/)
# major.minor mirrors the API7 EE release line (3.9.x), patch is this chart's
# own counter on that line and is decoupled from the app patch (see appVersion).
version: 3.9.2
version: 3.9.3

# 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.9.16"
appVersion: "3.9.17"

maintainers:
- name: API7
Expand Down
15 changes: 10 additions & 5 deletions charts/api7/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# api7ee3

![Version: 3.9.2](https://img.shields.io/badge/Version-3.9.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.16](https://img.shields.io/badge/AppVersion-3.9.16-informational?style=flat-square)
![Version: 3.9.3](https://img.shields.io/badge/Version-3.9.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.17](https://img.shields.io/badge/AppVersion-3.9.17-informational?style=flat-square)

A Helm chart for Kubernetes

Expand Down Expand Up @@ -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.9.16"` | |
| dashboard.image.tag | string | `"v3.9.17"` | |
| dashboard.keyCertSecret | string | `""` | |
| dashboard.livenessProbe.failureThreshold | int | `30` | |
| dashboard.livenessProbe.initialDelaySeconds | int | `180` | |
Expand All @@ -42,13 +42,16 @@ A Helm chart for Kubernetes
| dashboard.topologySpreadConstraints | list | `[]` | Topology Spread Constraints for pod assignment https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ The value is evaluated as a template |
| dashboard_configuration.audit.retention_days | int | `60` | |
| dashboard_configuration.console.addr | string | `"http://127.0.0.1:3000"` | |
| dashboard_configuration.console.hybrid_mode | bool | `false` | hybrid_mode hides the license and core-quota UI, for deployments where the license is operated for the user rather than by them. |
| dashboard_configuration.console.sentry | object | `{"dsn":"","enabled":false,"release":""}` | sentry configures the console's browser error reporting. |
| 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_time | string | `"30s"` | |
| dashboard_configuration.database.max_lifetime | string | `"1h"` | Maximum lifetime of a pooled connection. Bounded by default so that connections pinned to a primary demoted by a failover are eventually retired; do not set it to 0 |
| dashboard_configuration.database.max_open_conns | int | `30` | |
| dashboard_configuration.database.timeout | string | `"5s"` | |
| dashboard_configuration.developer_proxy.cache_failure_count | int | `256` | |
Expand Down Expand Up @@ -120,7 +123,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.9.16"` | |
| developer_portal.image.tag | string | `"v3.9.17"` | |
| developer_portal.keyCertSecret | string | `""` | |
| developer_portal.livenessProbe.failureThreshold | int | `10` | |
| developer_portal.livenessProbe.initialDelaySeconds | int | `60` | |
Expand All @@ -133,6 +136,7 @@ A Helm chart for Kubernetes
| developer_portal.topologySpreadConstraints | list | `[]` | Topology Spread Constraints for pod assignment https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ The value is evaluated as a template |
| developer_portal_configuration.database.dsn | string | `"postgres://api7ee:changeme@api7-postgresql:5432/api7ee"` | |
| developer_portal_configuration.database.max_idle_time | string | `"30s"` | |
| developer_portal_configuration.database.max_lifetime | string | `"1h"` | Maximum lifetime of a pooled connection. Bounded by default so that connections pinned to a primary demoted by a failover are eventually retired; do not set it to 0 |
| developer_portal_configuration.database.max_open_conns | int | `30` | |
| developer_portal_configuration.database.timeout | string | `"5s"` | |
| developer_portal_configuration.enable | bool | `true` | |
Expand Down Expand Up @@ -166,7 +170,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.9.16"` | |
| dp_manager.image.tag | string | `"v3.9.17"` | |
| dp_manager.livenessProbe.failureThreshold | int | `10` | |
| dp_manager.livenessProbe.initialDelaySeconds | int | `60` | |
| dp_manager.livenessProbe.periodSeconds | int | `3` | |
Expand All @@ -181,6 +185,7 @@ A Helm chart for Kubernetes
| dp_manager_configuration.consumer_cache.size | int | `50000` | |
| 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_lifetime | string | `"1h"` | Maximum lifetime of a pooled connection. Bounded by default so that connections pinned to a primary demoted by a failover are eventually retired; do not set it to 0 |
| dp_manager_configuration.database.max_open_conns | int | `30` | |
| dp_manager_configuration.database.timeout | string | `"5s"` | |
| dp_manager_configuration.developer_cache.evict_interval | string | `"5s"` | |
Expand Down Expand Up @@ -232,7 +237,7 @@ A Helm chart for Kubernetes
| file_server.enabled | bool | `false` | |
| file_server.image.pullPolicy | string | `"Always"` | |
| file_server.image.repository | string | `"api7/api7-ee-file-server"` | |
| file_server.image.tag | string | `"v3.9.16"` | |
| file_server.image.tag | string | `"v3.9.17"` | |
| file_server.livenessProbe.failureThreshold | int | `10` | |
| file_server.livenessProbe.initialDelaySeconds | int | `60` | |
| file_server.livenessProbe.periodSeconds | int | `3` | |
Expand Down
36 changes: 29 additions & 7 deletions charts/api7/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.16"
tag: "v3.9.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,
Expand Down Expand Up @@ -55,7 +55,7 @@ dp_manager:
repository: api7/api7-ee-dp-manager
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "v3.9.16"
tag: "v3.9.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,
Expand Down Expand Up @@ -92,7 +92,7 @@ file_server:
image:
repository: api7/api7-ee-file-server
pullPolicy: Always
tag: "v3.9.16"
tag: "v3.9.17"
livenessProbe:
initialDelaySeconds: 60
periodSeconds: 3
Expand All @@ -110,7 +110,7 @@ developer_portal:
repository: api7/api7-ee-developer-portal
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "v3.9.16"
tag: "v3.9.17"

extraEnvVars: []
extraVolumes: []
Expand Down Expand Up @@ -362,7 +362,9 @@ dashboard_configuration:
dsn: "postgres://api7ee:changeme@api7-postgresql:5432/api7ee"
max_open_conns: 30
max_idle_time: 30s
# max_lifetime: 60s
# -- Maximum lifetime of a pooled connection. Bounded by default so that connections
# pinned to a primary demoted by a failover are eventually retired; do not set it to 0
max_lifetime: 1h
timeout: 5s
# vault:
# enabled: false
Expand Down Expand Up @@ -406,6 +408,22 @@ dashboard_configuration:
- "/api/v1/labels"
console:
addr: "http://127.0.0.1:3000"
# -- hybrid_mode hides the license and core-quota UI, for deployments where
# the license is operated for the user rather than by them.
hybrid_mode: false
# -- sentry configures the console's browser error reporting.
sentry:
enabled: false
dsn: ""
release: ""
# -- custom_menu_group adds an extra group of external links to the gateway
# sidebar. Every item needs a non-empty name and an absolute http/https
# url; the whole group is dropped when it does not validate.
# custom_menu_group:
# title: "Resources"
# items:
# - name: "API7 Docs"
# url: "https://docs.api7.ai"
audit:
retention_days: 60
consumer_proxy:
Expand Down Expand Up @@ -490,7 +508,9 @@ dp_manager_configuration:
dsn: "postgres://api7ee:changeme@api7-postgresql:5432/api7ee"
max_open_conns: 30
max_idle_time: 30s
# max_lifetime: 60s
# -- Maximum lifetime of a pooled connection. Bounded by default so that connections
# pinned to a primary demoted by a failover are eventually retired; do not set it to 0
max_lifetime: 1h
timeout: 5s
# vault:
# enabled: false
Expand Down Expand Up @@ -569,7 +589,9 @@ developer_portal_configuration:
dsn: "postgres://api7ee:changeme@api7-postgresql:5432/api7ee"
max_open_conns: 30
max_idle_time: 30s
# max_lifetime: 60s
# -- Maximum lifetime of a pooled connection. Bounded by default so that connections
# pinned to a primary demoted by a failover are eventually retired; do not set it to 0
max_lifetime: 1h
timeout: 5s
# vault:
# enabled: false
Expand Down
4 changes: 2 additions & 2 deletions charts/gateway/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ type: application
# Versions are expected to follow Semantic Versioning (https://semver.org/)
# major.minor mirrors the API7 EE release line (3.9.x), patch is this chart's
# own counter on that line and is decoupled from the app patch (see appVersion).
version: 3.9.7
version: 3.9.8

# 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.9.16"
appVersion: "3.9.17"

maintainers:
- name: API7
Expand Down
4 changes: 3 additions & 1 deletion charts/gateway/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ apisix:
| 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.9.16"` | API7 Gateway image tag Overrides the image tag whose default is the chart appVersion. |
| apisix.image.tag | string | `"3.9.17"` | 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,"neg_count":512,"neg_ttl":60,"ttl":300}}` | fine tune the parameters of LRU cache for some features like secret |
| apisix.lru.secret.neg_ttl | int | `60` | in seconds |
Expand Down Expand Up @@ -305,6 +305,8 @@ apisix:
| nginx.http.clientMaxBodySize | int | `0` | The maximum allowed size of the client request body. If exceeded, the 413 (Request Entity Too Large) error is returned to the client. Note that unlike Nginx, we don't limit the body size by default (0 means no limit). |
| nginx.http.keepaliveTimeout | string | `"60s"` | timeout during which a keep-alive client connection will stay open on the server side |
| nginx.http.sendTimeout | string | `"10s"` | timeout for transmitting a response to the client, then the connection is closed |
| nginx.stream | object | `{"realIpFrom":[]}` | Nginx stream subsystem configurations |
| nginx.stream.realIpFrom | list | `[]` | Trusted addresses known to send a correct PROXY protocol header on stream (TCP/UDP) ports. On a connection from a trusted address that carries an inbound PROXY protocol header, the client address is replaced by the one in the header. Only takes effect on ports that accept the PROXY protocol (`apisix.stream.tcp[].proxyProtocol`). Empty by default, so the client address is always the directly connected peer, see [set_real_ip_from](https://nginx.org/en/docs/stream/ngx_stream_realip_module.html#set_real_ip_from) |
| nginx.workerConnections | string | `"10620"` | |
| nginx.workerProcesses | string | `"auto"` | |
| nginx.workerRlimitNofile | string | `"20480"` | |
Expand Down
6 changes: 6 additions & 0 deletions charts/gateway/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,12 @@ data:
{{- .Values.logs.stream.accessLogFormat | nindent 10 }}
access_log_format_escape: {{ .Values.logs.stream.accessLogFormatEscape }}
{{- end }}
{{- if .Values.nginx.stream.realIpFrom }}
real_ip_from: # https://nginx.org/en/docs/stream/ngx_stream_realip_module.html#set_real_ip_from
{{- range $ip := .Values.nginx.stream.realIpFrom }}
- {{ $ip | quote }}
{{- end }}
{{- end }}
http:
{{- if and (.Values.deployment.fallback_cp) (eq .Values.deployment.fallback_cp.mode "write") }}
enable_access_log: false
Expand Down
12 changes: 11 additions & 1 deletion charts/gateway/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ apisix:
pullPolicy: Always
# -- API7 Gateway image tag
# Overrides the image tag whose default is the chart appVersion.
tag: 3.9.16
tag: 3.9.17

# -- Use a `DaemonSet` or `Deployment`
kind: Deployment
Expand Down Expand Up @@ -460,6 +460,16 @@ nginx:
workerProcesses: auto
enableCPUAffinity: true
envs: []
# -- Nginx stream subsystem configurations
stream:
# -- Trusted addresses known to send a correct PROXY protocol header on stream (TCP/UDP) ports.
# On a connection from a trusted address that carries an inbound PROXY protocol header, the client
# address is replaced by the one in the header. Only takes effect on ports that accept the PROXY
# protocol (`apisix.stream.tcp[].proxyProtocol`). Empty by default, so the client address is always
# the directly connected peer,
# see [set_real_ip_from](https://nginx.org/en/docs/stream/ngx_stream_realip_module.html#set_real_ip_from)
realIpFrom: []
# - 192.168.1.0/24
# -- HTTP timeout configurations
http:
# -- timeout during which a keep-alive client connection will stay open on the server side
Expand Down
Loading