Skip to content

Commit 7904625

Browse files
nic-6443nic-6443
authored
chore: upgrade api7 v3.2.16.6 (#152)
Signed-off-by: Nic <[email protected]>
1 parent b61898f commit 7904625

File tree

6 files changed

+96
-44
lines changed

6 files changed

+96
-44
lines changed

‎charts/api7/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ 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.16.19
18+
version: 0.16.20
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

‎charts/api7/README.md‎

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

3-
![Version: 0.16.19](https://img.shields.io/badge/Version-0.16.19-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.16](https://img.shields.io/badge/AppVersion-3.2.16-informational?style=flat-square)
3+
![Version: 0.16.20](https://img.shields.io/badge/Version-0.16.20-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.16](https://img.shields.io/badge/AppVersion-3.2.16-informational?style=flat-square)
44

55
A Helm chart for Kubernetes
66

@@ -23,7 +23,7 @@ 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.2.16.5"` | |
26+
| dashboard.image.tag | string | `"v3.2.16.6"` | |
2727
| dashboard.keyCertSecret | string | `""` | |
2828
| dashboard.replicaCount | int | `1` | |
2929
| dashboard_configuration.console.addr | string | `"http://127.0.0.1:3000"` | |
@@ -35,6 +35,10 @@ A Helm chart for Kubernetes
3535
| dashboard_configuration.database.dsn | string | `"postgres://api7ee:changeme@api7-postgresql:5432/api7ee"` | |
3636
| dashboard_configuration.database.max_idle_conns | int | `2` | |
3737
| dashboard_configuration.database.max_open_conns | int | `30` | |
38+
| dashboard_configuration.developer_proxy.cache_failure_count | int | `256` | |
39+
| dashboard_configuration.developer_proxy.cache_failure_ttl | int | `15` | |
40+
| dashboard_configuration.developer_proxy.cache_success_count | int | `256` | |
41+
| dashboard_configuration.developer_proxy.cache_success_ttl | int | `15` | |
3842
| dashboard_configuration.log.level | string | `"warn"` | |
3943
| dashboard_configuration.log.output | string | `"stderr"` | |
4044
| dashboard_configuration.prometheus.addr | string | `"http://api7-prometheus-server:9090"` | |
@@ -78,15 +82,27 @@ A Helm chart for Kubernetes
7882
| dashboard_service.tlsPort | int | `7443` | |
7983
| dashboard_service.type | string | `"ClusterIP"` | |
8084
| developer_portal.extraEnvVars | list | `[]` | |
81-
| developer_portal.image.pullPolicy | string | `"IfNotPresent"` | |
82-
| developer_portal.image.repository | string | `"api7/api7-developer-portal"` | |
83-
| developer_portal.image.tag | string | `"v0.1.3"` | |
85+
| developer_portal.extraVolumeMounts | list | `[]` | |
86+
| developer_portal.extraVolumes | list | `[]` | |
87+
| developer_portal.image.pullPolicy | string | `"Always"` | |
88+
| developer_portal.image.repository | string | `"api7/api7-ee-developer-portal"` | |
89+
| developer_portal.image.tag | string | `"v3.2.16.6"` | |
8490
| developer_portal.keyCertSecret | string | `""` | |
8591
| developer_portal.replicaCount | int | `1` | |
92+
| developer_portal_configuration.database.dsn | string | `"postgres://api7ee:changeme@api7-postgresql:5432/api7ee"` | |
93+
| developer_portal_configuration.database.max_idle_conns | int | `2` | |
94+
| developer_portal_configuration.database.max_open_conns | int | `30` | |
8695
| developer_portal_configuration.enable | bool | `true` | |
96+
| developer_portal_configuration.log.level | string | `"warn"` | |
97+
| developer_portal_configuration.log.output | string | `"stderr"` | |
8798
| developer_portal_configuration.server.listen.host | string | `"0.0.0.0"` | |
8899
| developer_portal_configuration.server.listen.port | int | `4321` | |
100+
| developer_portal_configuration.server.listen.tls.cert_file | string | `""` | |
89101
| developer_portal_configuration.server.listen.tls.enabled | bool | `true` | |
102+
| developer_portal_configuration.server.listen.tls.key_file | string | `""` | |
103+
| developer_portal_configuration.server.status.disable | bool | `false` | |
104+
| developer_portal_configuration.server.status.host | string | `"127.0.0.1"` | |
105+
| developer_portal_configuration.server.status.port | int | `4322` | |
90106
| developer_portal_service.annotations | object | `{}` | |
91107
| developer_portal_service.ingress.annotations | object | `{}` | |
92108
| developer_portal_service.ingress.className | string | `""` | |
@@ -102,7 +118,7 @@ A Helm chart for Kubernetes
102118
| dp_manager.extraVolumes | list | `[]` | |
103119
| dp_manager.image.pullPolicy | string | `"Always"` | |
104120
| dp_manager.image.repository | string | `"api7/api7-ee-dp-manager"` | |
105-
| dp_manager.image.tag | string | `"v3.2.16.5"` | |
121+
| dp_manager.image.tag | string | `"v3.2.16.6"` | |
106122
| dp_manager.replicaCount | int | `1` | |
107123
| dp_manager_configuration.database.dsn | string | `"postgres://api7ee:changeme@api7-postgresql:5432/api7ee"` | |
108124
| dp_manager_configuration.database.max_idle_conns | int | `2` | |

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

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

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

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ spec:
1515
template:
1616
metadata:
1717
annotations:
18+
checksum/config: {{ include (print $.Template.BasePath "/developer-portal-configmap.yaml") . | sha256sum }}
1819
{{- with .Values.podAnnotations }}
1920
{{- toYaml . | nindent 8 }}
2021
{{- end }}
@@ -30,11 +31,27 @@ spec:
3031
securityContext:
3132
{{- toYaml .Values.podSecurityContext | nindent 8 }}
3233
volumes:
34+
- name: config
35+
configMap:
36+
name: {{ include "api7ee3.fullname" . }}-developer-portal-config
37+
{{- if .Values.developer_portal.extraVolumes }}
38+
{{- include "api7ee3.tplvalues.render" (dict "value" .Values.developer_portal.extraVolumes "context" $) | nindent 8 }}
39+
{{- end }}
3340
{{- if .Values.developer_portal.keyCertSecret }}
3441
- name: ssl
3542
secret:
3643
secretName: {{ .Values.developer_portal.keyCertSecret | quote }}
3744
{{- end }}
45+
initContainers:
46+
- name: wait-for-dashboard
47+
image: "{{ .Values.busybox.image.repository }}:{{ .Values.busybox.image.tag }}"
48+
{{- if not .Values.dashboard_configuration.server.listen.disable }}
49+
command: [ 'sh', '-c', "until nc -z -v -w3 {{ include "api7ee3.fullname" . }}-dashboard {{ .Values.dashboard_service.port }};do echo waiting for dashboard `date`; sleep 2; done;" ]
50+
{{- else }}
51+
command: [ 'sh', '-c', "until nc -z -v -w3 {{ include "api7ee3.fullname" . }}-dashboard {{ .Values.dashboard_service.tlsPort }};do echo waiting for dashboard `date`; sleep 2; done;" ]
52+
{{- end }}
53+
securityContext:
54+
{{- toYaml .Values.securityContext | nindent 12 }}
3855
containers:
3956
- name: developer-portal
4057
securityContext:
@@ -46,43 +63,30 @@ spec:
4663
containerPort: {{ .Values.developer_portal_configuration.server.listen.port }}
4764
protocol: TCP
4865
livenessProbe:
49-
exec:
50-
command: ["nc", "-z", "127.0.0.1", "4321"]
51-
initialDelaySeconds: 10
52-
periodSeconds: 5
53-
failureThreshold: 10
66+
httpGet:
67+
path: /healthz
68+
port: http
69+
scheme: {{ if not .Values.developer_portal_configuration.server.listen.tls.enabled }}HTTP{{ else }}HTTPS{{ end }}
70+
initialDelaySeconds: 1
71+
periodSeconds: 2
72+
failureThreshold: 30
5473
readinessProbe:
55-
exec:
56-
command: [ "nc", "-z", "127.0.0.1", "4321" ]
57-
initialDelaySeconds: 10
58-
periodSeconds: 5
59-
failureThreshold: 10
74+
httpGet:
75+
path: /healthz
76+
port: http
77+
scheme: {{ if not .Values.developer_portal_configuration.server.listen.tls.enabled }}HTTP{{ else }}HTTPS{{ end }}
78+
initialDelaySeconds: 1
79+
periodSeconds: 2
80+
failureThreshold: 30
6081
resources:
6182
{{- toYaml .Values.resources | nindent 12 }}
6283
env:
63-
{{- if not .Values.dashboard_configuration.server.listen.disable }}
64-
- name: API_URL
65-
value: 'http://{{ include "api7ee3.fullname" . }}-dashboard.{{ .Release.Namespace }}:{{ .Values.dashboard_service.port }}'
66-
{{- else }}
67-
- name: NODE_TLS_REJECT_UNAUTHORIZED
68-
value: "0"
69-
- name: API_URL
70-
value: 'https://{{ include "api7ee3.fullname" . }}-dashboard:{{ .Values.dashboard_service.tlsPort }}'
71-
{{- end }}
72-
{{- if not .Values.developer_portal_configuration.server.listen.tls.enabled }}
73-
- name: DISABLE_HTTPS
74-
value: "1"
75-
{{- end}}
76-
{{- if .Values.developer_portal.keyCertSecret }}
77-
- name: SERVER_CERT_PATH
78-
value: "/app/certs/tls.crt"
79-
- name: SERVER_KEY_PATH
80-
value: "/app/certs/tls.key"
81-
{{- end}}
8284
{{- if .Values.developer_portal.extraEnvVars }}
8385
{{- include "api7ee3.tplvalues.render" (dict "value" .Values.developer_portal.extraEnvVars "context" $) | nindent 12 }}
8486
{{- end }}
8587
volumeMounts:
88+
- name: config
89+
mountPath: /app/conf
8690
{{- if .Values.developer_portal.keyCertSecret }}
8791
- mountPath: /app/certs
8892
name: ssl

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ metadata:
1818
name: {{ $fullName }}
1919
labels:
2020
{{- include "api7ee3.labels" . | nindent 4 }}
21-
{{- with .Values.developer_portal_service.ingress.annotations }}
2221
annotations:
22+
{{- if .Values.developer_portal_configuration.server.listen.tls.enabled }}
23+
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
24+
{{- end }}
25+
{{- with .Values.developer_portal_service.ingress.annotations }}
2326
{{- toYaml . | nindent 4 }}
2427
{{- end }}
2528
spec:

‎charts/api7/values.yaml‎

Lines changed: 28 additions & 7 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.2.16.5"
13+
tag: "v3.2.16.6"
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,
@@ -33,7 +33,7 @@ dp_manager:
3333
repository: api7/api7-ee-dp-manager
3434
pullPolicy: Always
3535
# Overrides the image tag whose default is the chart appVersion.
36-
tag: "v3.2.16.5"
36+
tag: "v3.2.16.6"
3737
# Resources of the deployment.
3838
# It has a higher priority than the common resources configuration:
3939
# when this field is configured, it is used first in the deployment,
@@ -52,14 +52,17 @@ dp_manager:
5252

5353
developer_portal:
5454
replicaCount: 1
55-
image:
56-
repository: api7/api7-developer-portal
57-
pullPolicy: IfNotPresent
58-
# Overrides the image tag whose default is the chart appVersion.
59-
tag: "v0.1.3"
6055
# Specifies the name of Secret for developer portal TLS configuration, and files store under /app/certs directory
6156
keyCertSecret: ""
57+
image:
58+
repository: api7/api7-ee-developer-portal
59+
pullPolicy: Always
60+
# Overrides the image tag whose default is the chart appVersion.
61+
tag: "v3.2.16.6"
62+
6263
extraEnvVars: []
64+
extraVolumes: []
65+
extraVolumeMounts: []
6366

6467
imagePullSecret: ""
6568
nameOverride: ""
@@ -283,6 +286,11 @@ dashboard_configuration:
283286
cache_success_ttl: 60
284287
cache_failure_count: 512
285288
cache_failure_ttl: 60
289+
developer_proxy:
290+
cache_success_count: 256
291+
cache_success_ttl: 15
292+
cache_failure_count: 256
293+
cache_failure_ttl: 15
286294
# fallback_cp:
287295
# aws_s3:
288296
# access_key: "access"
@@ -336,3 +344,16 @@ developer_portal_configuration:
336344
port: 4321
337345
tls:
338346
enabled: true
347+
key_file: "" # the file path of private key, (e.g. /app/certs/tls.key)
348+
cert_file: "" # the file path of certificate, (e.g. /app/certs/tls.crt)
349+
status:
350+
disable: false
351+
host: "127.0.0.1"
352+
port: 4322
353+
log:
354+
level: warn
355+
output: stderr
356+
database:
357+
dsn: "postgres://api7ee:changeme@api7-postgresql:5432/api7ee"
358+
max_idle_conns: 2
359+
max_open_conns: 30

0 commit comments

Comments
 (0)