Skip to content

Commit d7557cf

Browse files
jarvis9443jarvis9443
authored
chore: bump api7 and gateway chart versions for v3.9.8 (#274)
1 parent 8620ffa commit d7557cf

9 files changed

Lines changed: 178 additions & 13 deletions

File tree

‎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.48
18+
version: 0.17.49
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.7"
24+
appVersion: "3.9.8"
2525

2626
maintainers:
2727
- name: API7

‎charts/api7/README.md‎

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

3-
![Version: 0.17.48](https://img.shields.io/badge/Version-0.17.48-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.7](https://img.shields.io/badge/AppVersion-3.9.7-informational?style=flat-square)
3+
![Version: 0.17.49](https://img.shields.io/badge/Version-0.17.49-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.8](https://img.shields.io/badge/AppVersion-3.9.8-informational?style=flat-square)
44

55
A Helm chart for Kubernetes
66

@@ -28,7 +28,7 @@ A Helm chart for Kubernetes
2828
| dashboard.extraVolumes | list | `[]` | |
2929
| dashboard.image.pullPolicy | string | `"Always"` | |
3030
| dashboard.image.repository | string | `"api7/api7-ee-3-integrated"` | |
31-
| dashboard.image.tag | string | `"v3.9.7"` | |
31+
| dashboard.image.tag | string | `"v3.9.8"` | |
3232
| dashboard.keyCertSecret | string | `""` | |
3333
| dashboard.livenessProbe.failureThreshold | int | `30` | |
3434
| dashboard.livenessProbe.initialDelaySeconds | int | `180` | |
@@ -113,7 +113,7 @@ A Helm chart for Kubernetes
113113
| developer_portal.extraVolumes | list | `[]` | |
114114
| developer_portal.image.pullPolicy | string | `"Always"` | |
115115
| developer_portal.image.repository | string | `"api7/api7-ee-developer-portal"` | |
116-
| developer_portal.image.tag | string | `"v3.9.7"` | |
116+
| developer_portal.image.tag | string | `"v3.9.8"` | |
117117
| developer_portal.keyCertSecret | string | `""` | |
118118
| developer_portal.livenessProbe.failureThreshold | int | `10` | |
119119
| developer_portal.livenessProbe.initialDelaySeconds | int | `60` | |
@@ -158,7 +158,7 @@ A Helm chart for Kubernetes
158158
| dp_manager.extraVolumes | list | `[]` | |
159159
| dp_manager.image.pullPolicy | string | `"Always"` | |
160160
| dp_manager.image.repository | string | `"api7/api7-ee-dp-manager"` | |
161-
| dp_manager.image.tag | string | `"v3.9.7"` | |
161+
| dp_manager.image.tag | string | `"v3.9.8"` | |
162162
| dp_manager.livenessProbe.failureThreshold | int | `10` | |
163163
| dp_manager.livenessProbe.initialDelaySeconds | int | `60` | |
164164
| dp_manager.livenessProbe.periodSeconds | int | `3` | |
@@ -221,6 +221,23 @@ A Helm chart for Kubernetes
221221
| dp_manager_service.tlsNodePort | int | `nil` | The nodePort for HTTPS service, only used if dp_manager_service.type is NodePort. If not set, a random port will be assigned by Kubernetes. |
222222
| dp_manager_service.tlsPort | int | `7943` | |
223223
| dp_manager_service.type | string | `"ClusterIP"` | |
224+
| file_server.enabled | bool | `false` | |
225+
| file_server.image.pullPolicy | string | `"IfNotPresent"` | |
226+
| file_server.image.repository | string | `"api7/api7-ee-file-server"` | |
227+
| file_server.image.tag | string | `"dev"` | |
228+
| file_server.livenessProbe.failureThreshold | int | `10` | |
229+
| file_server.livenessProbe.initialDelaySeconds | int | `60` | |
230+
| file_server.livenessProbe.periodSeconds | int | `3` | |
231+
| file_server.readinessProbe.failureThreshold | int | `3` | |
232+
| file_server.readinessProbe.initialDelaySeconds | int | `10` | |
233+
| file_server.readinessProbe.periodSeconds | int | `3` | |
234+
| file_server.replicaCount | int | `1` | |
235+
| file_server_configuration.database.dsn | string | `"postgres://api7ee:changeme@api7-postgresql:5432/api7ee"` | |
236+
| file_server_configuration.file_server.listen | string | `"0.0.0.0:8080"` | |
237+
| file_server_configuration.log.level | string | `"warn"` | |
238+
| file_server_configuration.log.output | string | `"stderr"` | |
239+
| file_server_service.port | int | `8080` | |
240+
| file_server_service.type | string | `"ClusterIP"` | |
224241
| fullnameOverride | string | `""` | |
225242
| global.storageClass | string | `""` | |
226243
| imagePullSecret | string | `""` | |

‎charts/api7/templates/file-server-configmap.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{{- if .Values.file_server.enabled }}
2+
kind: ConfigMap
3+
apiVersion: v1
4+
metadata:
5+
name: {{ include "api7ee3.fullname" . }}-file-server-config
6+
namespace: {{ .Release.Namespace | quote }}
7+
data:
8+
config.yaml: |
9+
{{- toYaml .Values.file_server_configuration | nindent 4 }}
10+
{{- end }}

‎charts/api7/templates/file-server-deploy.yaml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
{{- if .Values.file_server.enabled }}
2+
apiVersion: apps/v1
3+
kind: Deployment
4+
metadata:
5+
name: {{ include "api7ee3.fullname" . }}-file-server
6+
namespace: {{ .Release.Namespace | quote }}
7+
labels:
8+
{{- include "api7ee3.labels" . | nindent 4 }}
9+
spec:
10+
replicas: {{ .Values.file_server.replicaCount }}
11+
selector:
12+
matchLabels:
13+
{{- include "api7ee3.selectorLabels" . | nindent 6 }}
14+
app.kubernetes.io/component: file-server
15+
template:
16+
metadata:
17+
annotations:
18+
checksum/config: {{ include (print $.Template.BasePath "/file-server-configmap.yaml") . | sha256sum }}
19+
{{- with .Values.podAnnotations }}
20+
{{- toYaml . | nindent 8 }}
21+
{{- end }}
22+
labels:
23+
{{- include "api7ee3.selectorLabels" . | nindent 8 }}
24+
app.kubernetes.io/component: file-server
25+
spec:
26+
{{- if .Values.imagePullSecret }}
27+
imagePullSecrets:
28+
- name: {{ .Values.imagePullSecret }}
29+
{{- end }}
30+
serviceAccountName: {{ include "api7ee3.serviceAccountName" . }}
31+
securityContext:
32+
{{- toYaml .Values.podSecurityContext | nindent 8 }}
33+
volumes:
34+
- name: config
35+
configMap:
36+
name: {{ include "api7ee3.fullname" . }}-file-server-config
37+
containers:
38+
- name: file-server
39+
securityContext:
40+
{{- toYaml .Values.securityContext | nindent 12 }}
41+
image: "{{ .Values.file_server.image.repository }}:{{ .Values.file_server.image.tag | default .Chart.AppVersion }}"
42+
imagePullPolicy: {{ .Values.file_server.image.pullPolicy }}
43+
command:
44+
- /usr/local/api7/api7-ee-file-server
45+
args:
46+
- -c
47+
- /usr/local/api7/conf/config.yaml
48+
ports:
49+
- name: http
50+
containerPort: 8080
51+
protocol: TCP
52+
livenessProbe:
53+
httpGet:
54+
path: /healthz
55+
port: http
56+
initialDelaySeconds: {{ .Values.file_server.livenessProbe.initialDelaySeconds }}
57+
periodSeconds: {{ .Values.file_server.livenessProbe.periodSeconds }}
58+
failureThreshold: {{ .Values.file_server.livenessProbe.failureThreshold }}
59+
readinessProbe:
60+
httpGet:
61+
path: /healthz
62+
port: http
63+
initialDelaySeconds: {{ .Values.file_server.readinessProbe.initialDelaySeconds }}
64+
periodSeconds: {{ .Values.file_server.readinessProbe.periodSeconds }}
65+
failureThreshold: {{ .Values.file_server.readinessProbe.failureThreshold }}
66+
volumeMounts:
67+
- name: config
68+
mountPath: /usr/local/api7/conf
69+
resources:
70+
{{- if .Values.file_server.resources }}
71+
{{- toYaml .Values.file_server.resources | nindent 12 }}
72+
{{- else }}
73+
{{- toYaml .Values.resources | nindent 12 }}
74+
{{- end }}
75+
{{- with .Values.nodeSelector }}
76+
nodeSelector:
77+
{{- toYaml . | nindent 8 }}
78+
{{- end }}
79+
{{- with .Values.affinity }}
80+
affinity:
81+
{{- toYaml . | nindent 8 }}
82+
{{- end }}
83+
{{- with .Values.tolerations }}
84+
tolerations:
85+
{{- toYaml . | nindent 8 }}
86+
{{- end }}
87+
{{- end }}

‎charts/api7/templates/file-server-service.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{{- if .Values.file_server.enabled }}
2+
apiVersion: v1
3+
kind: Service
4+
metadata:
5+
name: {{ include "api7ee3.fullname" . }}-file-server
6+
namespace: {{ .Release.Namespace | quote }}
7+
labels:
8+
{{- include "api7ee3.labels" . | nindent 4 }}
9+
spec:
10+
type: {{ .Values.file_server_service.type }}
11+
ports:
12+
- port: {{ .Values.file_server_service.port }}
13+
targetPort: http
14+
protocol: TCP
15+
name: http
16+
selector:
17+
{{- include "api7ee3.selectorLabels" . | nindent 4 }}
18+
app.kubernetes.io/component: file-server
19+
{{- end }}

‎charts/api7/values.yaml‎

Lines changed: 35 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.7"
21+
tag: "v3.9.8"
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.7"
57+
tag: "v3.9.8"
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,
@@ -84,6 +84,22 @@ dp_manager:
8484
periodSeconds: 3
8585
failureThreshold: 3
8686

87+
file_server:
88+
enabled: false
89+
replicaCount: 1
90+
image:
91+
repository: api7/api7-ee-file-server
92+
pullPolicy: IfNotPresent
93+
tag: "dev"
94+
livenessProbe:
95+
initialDelaySeconds: 60
96+
periodSeconds: 3
97+
failureThreshold: 10
98+
readinessProbe:
99+
initialDelaySeconds: 10
100+
periodSeconds: 3
101+
failureThreshold: 3
102+
87103
developer_portal:
88104
replicaCount: 1
89105
# Specifies the name of Secret for developer portal TLS configuration, and files store under /app/certs directory
@@ -92,7 +108,7 @@ developer_portal:
92108
repository: api7/api7-ee-developer-portal
93109
pullPolicy: Always
94110
# Overrides the image tag whose default is the chart appVersion.
95-
tag: "v3.9.7"
111+
tag: "v3.9.8"
96112

97113
extraEnvVars: []
98114
extraVolumes: []
@@ -198,6 +214,10 @@ dp_manager_service:
198214
# hosts:
199215
# - dp-manager.local
200216

217+
file_server_service:
218+
type: ClusterIP
219+
port: 8080
220+
201221
developer_portal_service:
202222
type: ClusterIP
203223
annotations: {}
@@ -356,6 +376,7 @@ dashboard_configuration:
356376
# database:
357377
# mount_path: "database"
358378
# role: "api7ee"
379+
# role_type: "dynamic" # "dynamic" (default) or "static"
359380
# tls:
360381
# ca_cert: ""
361382
# insecure: false
@@ -474,6 +495,7 @@ dp_manager_configuration:
474495
# database:
475496
# mount_path: "database"
476497
# role: "api7ee"
498+
# role_type: "dynamic" # "dynamic" (default) or "static"
477499
# tls:
478500
# ca_cert: ""
479501
# insecure: false
@@ -552,6 +574,16 @@ developer_portal_configuration:
552574
# database:
553575
# mount_path: "database"
554576
# role: "api7ee"
577+
# role_type: "dynamic" # "dynamic" (default) or "static"
555578
# tls:
556579
# ca_cert: ""
557580
# insecure: false
581+
582+
file_server_configuration:
583+
file_server:
584+
listen: "0.0.0.0:8080"
585+
log:
586+
level: warn
587+
output: stderr
588+
database:
589+
dsn: "postgres://api7ee:changeme@api7-postgresql:5432/api7ee"

‎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.58
17+
version: 0.2.59
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.7"
22+
appVersion: "3.9.8"
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.7"` | API7 Gateway image tag Overrides the image tag whose default is the chart appVersion. |
107+
| apisix.image.tag | string | `"3.9.8"` | 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
@@ -142,7 +142,7 @@ apisix:
142142
pullPolicy: Always
143143
# -- API7 Gateway image tag
144144
# Overrides the image tag whose default is the chart appVersion.
145-
tag: 3.9.7
145+
tag: 3.9.8
146146

147147
# -- Use a `DaemonSet` or `Deployment`
148148
kind: Deployment

0 commit comments

Comments
 (0)