Skip to content

Commit 3d5a2ff

Browse files
authored
chore: upgrade to 3.9.5 (#260)
Signed-off-by: Ashing Zheng <axingfly@gmail.com>
1 parent b77960b commit 3d5a2ff

File tree

9 files changed

+43
-15
lines changed

9 files changed

+43
-15
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
quay.io/helmpack/chart-testing:v3.10.1 sh -c 'git config --global --add safe.directory /workdir \
3131
&& helm repo add bitnami https://charts.bitnami.com/bitnami \
3232
&& helm repo add apisix https://charts.apiseven.com \
33+
&& helm repo add jaegertracing https://jaegertracing.github.io/helm-charts \
3334
&& ct lint \
3435
--charts charts/api7 \
3536
--charts charts/gateway \
@@ -52,6 +53,7 @@ jobs:
5253
quay.io/helmpack/chart-testing:v3.10.1 sh -c 'git config --global --add safe.directory /workdir \
5354
&& helm repo add bitnami https://charts.bitnami.com/bitnami \
5455
&& helm repo add apisix https://charts.apiseven.com \
56+
&& helm repo add jaegertracing https://jaegertracing.github.io/helm-charts \
5557
&& ct install \
5658
--charts charts/api7 \
5759
--charts charts/ingress-controller'
@@ -67,6 +69,7 @@ jobs:
6769
quay.io/helmpack/chart-testing:v3.10.1 sh -c 'git config --global --add safe.directory /workdir \
6870
&& helm repo add bitnami https://charts.bitnami.com/bitnami \
6971
&& helm repo add apisix https://charts.apiseven.com \
72+
&& helm repo add jaegertracing https://jaegertracing.github.io/helm-charts \
7073
&& ct install \
7174
--charts charts/gateway --helm-extra-set-args "--set etcd.enabled=true --set apisix.extraEnvVars[0].name=API7_SKIP_FIRST_HEARTBEAT_DEBUG --set-string apisix.extraEnvVars[0].value=true"'
7275

charts/api7/Chart.lock

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,8 @@ dependencies:
55
- name: postgresql
66
repository: https://charts.bitnami.com/bitnami
77
version: 12.12.10
8-
digest: sha256:d549be7a94677d1d3b70748b8ebb0f8fb2a529c57a5ac9cc8d07a08298f29be0
9-
generated: "2023-12-27T11:58:16.494435714+08:00"
8+
- name: jaeger
9+
repository: https://jaegertracing.github.io/helm-charts
10+
version: 4.4.7
11+
digest: sha256:057c643d7f9fdc0551ce4cb2184ac2923a0906f4f1c12493a71bcb2029e55c04
12+
generated: "2026-02-13T18:14:01.057403+08:00"

charts/api7/Chart.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.17.44
18+
version: 0.17.45
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "3.9.4"
24+
appVersion: "3.9.5"
2525

2626
maintainers:
2727
- name: API7
@@ -38,3 +38,8 @@ dependencies:
3838
condition: postgresql.builtin
3939
version: "12.12.10"
4040
repository: "https://charts.bitnami.com/bitnami"
41+
42+
- name: jaeger
43+
condition: jaeger.builtin
44+
version: "4.4.7"
45+
repository: "https://jaegertracing.github.io/helm-charts"

charts/api7/README.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# api7ee3
22

3-
![Version: 0.17.44](https://img.shields.io/badge/Version-0.17.44-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.4](https://img.shields.io/badge/AppVersion-3.9.4-informational?style=flat-square)
3+
![Version: 0.17.45](https://img.shields.io/badge/Version-0.17.45-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.5](https://img.shields.io/badge/AppVersion-3.9.5-informational?style=flat-square)
44

55
A Helm chart for Kubernetes
66

@@ -16,6 +16,7 @@ A Helm chart for Kubernetes
1616
|------------|------|---------|
1717
| https://charts.bitnami.com/bitnami | postgresql | 12.12.10 |
1818
| https://charts.bitnami.com/bitnami | prometheus | 0.5.1 |
19+
| https://jaegertracing.github.io/helm-charts | jaeger | 4.4.7 |
1920

2021
## Values
2122

@@ -27,7 +28,7 @@ A Helm chart for Kubernetes
2728
| dashboard.extraVolumes | list | `[]` | |
2829
| dashboard.image.pullPolicy | string | `"Always"` | |
2930
| dashboard.image.repository | string | `"api7/api7-ee-3-integrated"` | |
30-
| dashboard.image.tag | string | `"v3.9.4"` | |
31+
| dashboard.image.tag | string | `"v3.9.5"` | |
3132
| dashboard.keyCertSecret | string | `""` | |
3233
| dashboard.livenessProbe.failureThreshold | int | `30` | |
3334
| dashboard.livenessProbe.initialDelaySeconds | int | `180` | |
@@ -53,6 +54,8 @@ A Helm chart for Kubernetes
5354
| dashboard_configuration.developer_proxy.cache_failure_ttl | int | `15` | |
5455
| dashboard_configuration.developer_proxy.cache_success_count | int | `256` | |
5556
| dashboard_configuration.developer_proxy.cache_success_ttl | int | `15` | |
57+
| dashboard_configuration.jaeger.addr | string | `"http://api7-jaeger:16686"` | |
58+
| dashboard_configuration.jaeger.timeout | string | `"30s"` | |
5659
| dashboard_configuration.log.access_log | string | `"stdout"` | |
5760
| dashboard_configuration.log.level | string | `"warn"` | Allowed values: `debug`, `info`, `warn`, `error` |
5861
| dashboard_configuration.log.output | string | `"stderr"` | |
@@ -110,7 +113,7 @@ A Helm chart for Kubernetes
110113
| developer_portal.extraVolumes | list | `[]` | |
111114
| developer_portal.image.pullPolicy | string | `"Always"` | |
112115
| developer_portal.image.repository | string | `"api7/api7-ee-developer-portal"` | |
113-
| developer_portal.image.tag | string | `"v3.9.4"` | |
116+
| developer_portal.image.tag | string | `"v3.9.5"` | |
114117
| developer_portal.keyCertSecret | string | `""` | |
115118
| developer_portal.livenessProbe.failureThreshold | int | `10` | |
116119
| developer_portal.livenessProbe.initialDelaySeconds | int | `60` | |
@@ -155,7 +158,7 @@ A Helm chart for Kubernetes
155158
| dp_manager.extraVolumes | list | `[]` | |
156159
| dp_manager.image.pullPolicy | string | `"Always"` | |
157160
| dp_manager.image.repository | string | `"api7/api7-ee-dp-manager"` | |
158-
| dp_manager.image.tag | string | `"v3.9.4"` | |
161+
| dp_manager.image.tag | string | `"v3.9.5"` | |
159162
| dp_manager.livenessProbe.failureThreshold | int | `10` | |
160163
| dp_manager.livenessProbe.initialDelaySeconds | int | `60` | |
161164
| dp_manager.livenessProbe.periodSeconds | int | `3` | |
@@ -175,6 +178,8 @@ A Helm chart for Kubernetes
175178
| dp_manager_configuration.developer_cache.evict_interval | string | `"5s"` | |
176179
| dp_manager_configuration.developer_cache.max_ttl | string | `"2h"` | |
177180
| dp_manager_configuration.developer_cache.size | int | `50000` | |
181+
| dp_manager_configuration.jaeger.collector_addr | string | `"http://api7-jaeger:4318"` | |
182+
| dp_manager_configuration.jaeger.timeout | string | `"30s"` | |
178183
| dp_manager_configuration.log.access_log | string | `"stdout"` | |
179184
| dp_manager_configuration.log.level | string | `"warn"` | Allowed values: `debug`, `info`, `warn`, `error` |
180185
| dp_manager_configuration.log.output | string | `"stderr"` | |
@@ -216,6 +221,8 @@ A Helm chart for Kubernetes
216221
| fullnameOverride | string | `""` | |
217222
| global.storageClass | string | `""` | |
218223
| imagePullSecret | string | `""` | |
224+
| jaeger.builtin | bool | `true` | |
225+
| jaeger.fullnameOverride | string | `"api7-jaeger"` | |
219226
| nameOverride | string | `""` | |
220227
| nodeSelector | object | `{}` | |
221228
| podAnnotations | object | `{}` | |
34.2 KB
Binary file not shown.

charts/api7/values.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dashboard:
1818
repository: api7/api7-ee-3-integrated
1919
pullPolicy: Always
2020
# Overrides the image tag whose default is the chart appVersion.
21-
tag: "v3.9.4"
21+
tag: "v3.9.5"
2222
# Resources of the deployment.
2323
# It has a higher priority than the common resources configuration:
2424
# when this field is configured, it is used first in the deployment,
@@ -54,7 +54,7 @@ dp_manager:
5454
repository: api7/api7-ee-dp-manager
5555
pullPolicy: Always
5656
# Overrides the image tag whose default is the chart appVersion.
57-
tag: "v3.9.4"
57+
tag: "v3.9.5"
5858
# Resources of the deployment.
5959
# It has a higher priority than the common resources configuration:
6060
# when this field is configured, it is used first in the deployment,
@@ -92,7 +92,7 @@ developer_portal:
9292
repository: api7/api7-ee-developer-portal
9393
pullPolicy: Always
9494
# Overrides the image tag whose default is the chart appVersion.
95-
tag: "v3.9.4"
95+
tag: "v3.9.5"
9696

9797
extraEnvVars: []
9898
extraVolumes: []
@@ -266,6 +266,10 @@ prometheus:
266266
http: 9090
267267
configuration: ""
268268

269+
jaeger:
270+
builtin: true
271+
fullnameOverride: "api7-jaeger"
272+
269273
postgresql:
270274
builtin: true
271275
fullnameOverride: "api7-postgresql"
@@ -392,6 +396,9 @@ dashboard_configuration:
392396
response_code: 403
393397
# license:
394398
# file_path: "/app/licenses/license.txt" # the file path of license file, (e.g. /app/licenses/license.txt)
399+
jaeger:
400+
addr: "http://api7-jaeger:16686"
401+
timeout: 30s
395402

396403
dp_manager_configuration:
397404
server:
@@ -419,6 +426,9 @@ dp_manager_configuration:
419426
max_open_conns: 30
420427
max_idle_time: 30s
421428
timeout: 5s
429+
jaeger:
430+
collector_addr: "http://api7-jaeger:4318"
431+
timeout: 30s
422432
prometheus:
423433
addr: "http://api7-prometheus-server:9090"
424434
remote_write_path: "/api/v1/write"

charts/gateway/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ type: application
1414
# This is the chart version. This version number should be incremented each time you make changes
1515
# to the chart and its templates, including the app version.
1616
# Versions are expected to follow Semantic Versioning (https://semver.org/)
17-
version: 0.2.54
17+
version: 0.2.55
1818

1919
# This is the version number of the application being deployed. This version number should be
2020
# incremented each time you make changes to the application. Versions are not expected to
2121
# follow Semantic Versioning. They should reflect the version the application is using.
22-
appVersion: "3.9.4"
22+
appVersion: "3.9.5"
2323

2424
maintainers:
2525
- name: API7

charts/gateway/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ The command removes all the Kubernetes components associated with the chart and
104104
| 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 |
105105
| apisix.image.pullPolicy | string | `"Always"` | API7 Gateway image pull policy |
106106
| apisix.image.repository | string | `"api7/api7-ee-3-gateway"` | API7 Gateway image repository |
107-
| apisix.image.tag | string | `"3.9.4"` | API7 Gateway image tag Overrides the image tag whose default is the chart appVersion. |
107+
| apisix.image.tag | string | `"3.9.5"` | API7 Gateway image tag Overrides the image tag whose default is the chart appVersion. |
108108
| apisix.kind | string | `"Deployment"` | Use a `DaemonSet` or `Deployment` |
109109
| 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 |
110110
| apisix.lru.secret.neg_ttl | int | `60` | in seconds |

charts/gateway/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ apisix:
138138
pullPolicy: Always
139139
# -- API7 Gateway image tag
140140
# Overrides the image tag whose default is the chart appVersion.
141-
tag: 3.9.4
141+
tag: 3.9.5
142142

143143
# -- Use a `DaemonSet` or `Deployment`
144144
kind: Deployment

0 commit comments

Comments
 (0)