Skip to content

Commit b43634a

Browse files
nic-6443nic-6443
authored
chore: upgrade api7 to v3.5.2 (#165)
Signed-off-by: Nic <[email protected]>
1 parent f29a7c6 commit b43634a

File tree

6 files changed

+69
-27
lines changed

6 files changed

+69
-27
lines changed

‎charts/api7/Chart.yaml‎

Lines changed: 2 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.7
18+
version: 0.17.8
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.5.1"
24+
appVersion: "3.5.2"
2525

2626
dependencies:
2727
- name: prometheus

‎charts/api7/README.md‎

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

3-
![Version: 0.17.7](https://img.shields.io/badge/Version-0.17.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.5.1](https://img.shields.io/badge/AppVersion-3.5.1-informational?style=flat-square)
3+
![Version: 0.17.8](https://img.shields.io/badge/Version-0.17.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.5.2](https://img.shields.io/badge/AppVersion-3.5.2-informational?style=flat-square)
44

55
A Helm chart for Kubernetes
66

@@ -23,9 +23,15 @@ A Helm chart for Kubernetes
2323
| dashboard.extraVolumes | list | `[]` | |
2424
| dashboard.image.pullPolicy | string | `"Always"` | |
2525
| dashboard.image.repository | string | `"api7/api7-ee-3-integrated"` | |
26-
| dashboard.image.tag | string | `"v3.5.1"` | |
26+
| dashboard.image.tag | string | `"v3.5.2"` | |
2727
| dashboard.keyCertSecret | string | `""` | |
28+
| dashboard.livenessProbe.failureThreshold | int | `30` | |
29+
| dashboard.livenessProbe.initialDelaySeconds | int | `180` | |
30+
| dashboard.livenessProbe.periodSeconds | int | `10` | |
2831
| dashboard.podLabels | object | `{}` | |
32+
| dashboard.readinessProbe.failureThreshold | int | `3` | |
33+
| dashboard.readinessProbe.initialDelaySeconds | int | `10` | |
34+
| dashboard.readinessProbe.periodSeconds | int | `3` | |
2935
| dashboard.replicaCount | int | `1` | |
3036
| dashboard_configuration.console.addr | string | `"http://127.0.0.1:3000"` | |
3137
| dashboard_configuration.consumer_proxy.cache_failure_count | int | `512` | |
@@ -87,9 +93,15 @@ A Helm chart for Kubernetes
8793
| developer_portal.extraVolumes | list | `[]` | |
8894
| developer_portal.image.pullPolicy | string | `"Always"` | |
8995
| developer_portal.image.repository | string | `"api7/api7-ee-developer-portal"` | |
90-
| developer_portal.image.tag | string | `"v3.5.1"` | |
96+
| developer_portal.image.tag | string | `"v3.5.2"` | |
9197
| developer_portal.keyCertSecret | string | `""` | |
98+
| developer_portal.livenessProbe.failureThreshold | int | `10` | |
99+
| developer_portal.livenessProbe.initialDelaySeconds | int | `60` | |
100+
| developer_portal.livenessProbe.periodSeconds | int | `3` | |
92101
| developer_portal.podLabels | object | `{}` | |
102+
| developer_portal.readinessProbe.failureThreshold | int | `3` | |
103+
| developer_portal.readinessProbe.initialDelaySeconds | int | `10` | |
104+
| developer_portal.readinessProbe.periodSeconds | int | `3` | |
93105
| developer_portal.replicaCount | int | `1` | |
94106
| developer_portal_configuration.database.dsn | string | `"postgres://api7ee:changeme@api7-postgresql:5432/api7ee"` | |
95107
| developer_portal_configuration.database.max_idle_conns | int | `2` | |
@@ -120,8 +132,14 @@ A Helm chart for Kubernetes
120132
| dp_manager.extraVolumes | list | `[]` | |
121133
| dp_manager.image.pullPolicy | string | `"Always"` | |
122134
| dp_manager.image.repository | string | `"api7/api7-ee-dp-manager"` | |
123-
| dp_manager.image.tag | string | `"v3.5.1"` | |
135+
| dp_manager.image.tag | string | `"v3.5.2"` | |
136+
| dp_manager.livenessProbe.failureThreshold | int | `10` | |
137+
| dp_manager.livenessProbe.initialDelaySeconds | int | `60` | |
138+
| dp_manager.livenessProbe.periodSeconds | int | `3` | |
124139
| dp_manager.podLabels | object | `{}` | |
140+
| dp_manager.readinessProbe.failureThreshold | int | `3` | |
141+
| dp_manager.readinessProbe.initialDelaySeconds | int | `10` | |
142+
| dp_manager.readinessProbe.periodSeconds | int | `3` | |
125143
| dp_manager.replicaCount | int | `1` | |
126144
| dp_manager_configuration.database.dsn | string | `"postgres://api7ee:changeme@api7-postgresql:5432/api7ee"` | |
127145
| dp_manager_configuration.database.max_idle_conns | int | `2` | |

‎charts/api7/templates/dashboard-deploy.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,17 @@ spec:
8686
path: /healthz
8787
port: {{ if not .Values.dashboard_configuration.server.listen.disable }}http{{ else }}https{{ end }}
8888
scheme: {{ if not .Values.dashboard_configuration.server.listen.disable }}HTTP{{ else }}HTTPS{{ end }}
89-
initialDelaySeconds: 1
90-
periodSeconds: 2
91-
failureThreshold: 30
89+
initialDelaySeconds: {{ .Values.dashboard.livenessProbe.initialDelaySeconds }}
90+
periodSeconds: {{ .Values.dashboard.livenessProbe.periodSeconds }}
91+
failureThreshold: {{ .Values.dashboard.livenessProbe.failureThreshold }}
9292
readinessProbe:
9393
httpGet:
9494
path: /healthz
9595
port: {{ if not .Values.dashboard_configuration.server.listen.disable }}http{{ else }}https{{ end }}
9696
scheme: {{ if not .Values.dashboard_configuration.server.listen.disable }}HTTP{{ else }}HTTPS{{ end }}
97-
initialDelaySeconds: 1
98-
periodSeconds: 2
99-
failureThreshold: 30
97+
initialDelaySeconds: {{ .Values.dashboard.readinessProbe.initialDelaySeconds }}
98+
periodSeconds: {{ .Values.dashboard.readinessProbe.periodSeconds }}
99+
failureThreshold: {{ .Values.dashboard.readinessProbe.failureThreshold }}
100100
volumeMounts:
101101
- name: config
102102
mountPath: /app/conf

‎charts/api7/templates/developer-portal-deploy.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,17 @@ spec:
7272
path: /healthz
7373
port: http
7474
scheme: {{ if not .Values.developer_portal_configuration.server.listen.tls.enabled }}HTTP{{ else }}HTTPS{{ end }}
75-
initialDelaySeconds: 1
76-
periodSeconds: 2
77-
failureThreshold: 30
75+
initialDelaySeconds: {{ .Values.developer_portal.livenessProbe.initialDelaySeconds }}
76+
periodSeconds: {{ .Values.developer_portal.livenessProbe.periodSeconds }}
77+
failureThreshold: {{ .Values.developer_portal.livenessProbe.failureThreshold }}
7878
readinessProbe:
7979
httpGet:
8080
path: /healthz
8181
port: http
8282
scheme: {{ if not .Values.developer_portal_configuration.server.listen.tls.enabled }}HTTP{{ else }}HTTPS{{ end }}
83-
initialDelaySeconds: 1
84-
periodSeconds: 2
85-
failureThreshold: 30
83+
initialDelaySeconds: {{ .Values.developer_portal.readinessProbe.initialDelaySeconds }}
84+
periodSeconds: {{ .Values.developer_portal.readinessProbe.periodSeconds }}
85+
failureThreshold: {{ .Values.developer_portal.readinessProbe.failureThreshold }}
8686
resources:
8787
{{- toYaml .Values.resources | nindent 12 }}
8888
env:

‎charts/api7/templates/dp-manager-deploy.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,16 @@ spec:
7777
httpGet:
7878
path: /healthz
7979
port: http
80-
initialDelaySeconds: 1
81-
periodSeconds: 2
82-
failureThreshold: 30
80+
initialDelaySeconds: {{ .Values.dp_manager.livenessProbe.initialDelaySeconds }}
81+
periodSeconds: {{ .Values.dp_manager.livenessProbe.periodSeconds }}
82+
failureThreshold: {{ .Values.dp_manager.livenessProbe.failureThreshold }}
8383
readinessProbe:
8484
httpGet:
8585
path: /healthz
8686
port: http
87-
initialDelaySeconds: 1
88-
periodSeconds: 2
89-
failureThreshold: 30
87+
initialDelaySeconds: {{ .Values.dp_manager.readinessProbe.initialDelaySeconds }}
88+
periodSeconds: {{ .Values.dp_manager.readinessProbe.periodSeconds }}
89+
failureThreshold: {{ .Values.dp_manager.readinessProbe.failureThreshold }}
9090
volumeMounts:
9191
- name: config
9292
mountPath: /api7-ee

‎charts/api7/values.yaml‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dashboard:
1010
repository: api7/api7-ee-3-integrated
1111
pullPolicy: Always
1212
# Overrides the image tag whose default is the chart appVersion.
13-
tag: "v3.5.1"
13+
tag: "v3.5.2"
1414
# Resources of the deployment.
1515
# It has a higher priority than the common resources configuration:
1616
# when this field is configured, it is used first in the deployment,
@@ -27,14 +27,22 @@ dashboard:
2727
extraVolumes: []
2828
extraVolumeMounts: []
2929
podLabels: {}
30+
livenessProbe:
31+
initialDelaySeconds: 180
32+
periodSeconds: 10
33+
failureThreshold: 30
34+
readinessProbe:
35+
initialDelaySeconds: 10
36+
periodSeconds: 3
37+
failureThreshold: 3
3038

3139
dp_manager:
3240
replicaCount: 1
3341
image:
3442
repository: api7/api7-ee-dp-manager
3543
pullPolicy: Always
3644
# Overrides the image tag whose default is the chart appVersion.
37-
tag: "v3.5.1"
45+
tag: "v3.5.2"
3846
# Resources of the deployment.
3947
# It has a higher priority than the common resources configuration:
4048
# when this field is configured, it is used first in the deployment,
@@ -51,6 +59,14 @@ dp_manager:
5159
extraVolumes: []
5260
extraVolumeMounts: []
5361
podLabels: {}
62+
livenessProbe:
63+
initialDelaySeconds: 60
64+
periodSeconds: 3
65+
failureThreshold: 10
66+
readinessProbe:
67+
initialDelaySeconds: 10
68+
periodSeconds: 3
69+
failureThreshold: 3
5470

5571
developer_portal:
5672
replicaCount: 1
@@ -60,12 +76,20 @@ developer_portal:
6076
repository: api7/api7-ee-developer-portal
6177
pullPolicy: Always
6278
# Overrides the image tag whose default is the chart appVersion.
63-
tag: "v3.5.1"
79+
tag: "v3.5.2"
6480

6581
extraEnvVars: []
6682
extraVolumes: []
6783
extraVolumeMounts: []
6884
podLabels: {}
85+
livenessProbe:
86+
initialDelaySeconds: 60
87+
periodSeconds: 3
88+
failureThreshold: 10
89+
readinessProbe:
90+
initialDelaySeconds: 10
91+
periodSeconds: 3
92+
failureThreshold: 3
6993

7094
imagePullSecret: ""
7195
nameOverride: ""

0 commit comments

Comments
 (0)