Skip to content

Commit df9a783

Browse files
nic-6443nic-6443
authored
release: 3.2.13.0 (#116)
Signed-off-by: Nic <[email protected]>
1 parent b0c9372 commit df9a783

File tree

8 files changed

+223
-8
lines changed

8 files changed

+223
-8
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.13.4
18+
version: 0.14.0
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: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# api7ee3
22

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

55
A Helm chart for Kubernetes
66

@@ -18,9 +18,10 @@ A Helm chart for Kubernetes
1818
| affinity | object | `{}` | |
1919
| busybox.image.repository | string | `"docker.io/busybox"` | |
2020
| busybox.image.tag | float | `1.28` | |
21+
| dashboard.extraEnvVars | list | `[]` | |
2122
| dashboard.image.pullPolicy | string | `"Always"` | |
2223
| dashboard.image.repository | string | `"api7/api7-ee-3-integrated"` | |
23-
| dashboard.image.tag | string | `"v3.2.11.5"` | |
24+
| dashboard.image.tag | string | `"v3.2.13.0"` | |
2425
| dashboard.keyCertSecret | string | `""` | |
2526
| dashboard.replicaCount | int | `1` | |
2627
| dashboard_configuration.console.addr | string | `"http://127.0.0.1:3000"` | |
@@ -29,6 +30,14 @@ A Helm chart for Kubernetes
2930
| dashboard_configuration.log.output | string | `"stderr"` | |
3031
| dashboard_configuration.login.source | string | `"DB"` | |
3132
| dashboard_configuration.prometheus.addr | string | `"http://api7-prometheus-server:9090"` | |
33+
| dashboard_configuration.prometheus.basic_auth.password | string | `""` | |
34+
| dashboard_configuration.prometheus.basic_auth.username | string | `""` | |
35+
| dashboard_configuration.prometheus.tls.ca_file | string | `""` | |
36+
| dashboard_configuration.prometheus.tls.cert_file | string | `""` | |
37+
| dashboard_configuration.prometheus.tls.enable_client_cert | bool | `false` | |
38+
| dashboard_configuration.prometheus.tls.insecure_skip_verify | bool | `false` | |
39+
| dashboard_configuration.prometheus.tls.key_file | string | `""` | |
40+
| dashboard_configuration.prometheus.tls.server_name | string | `""` | |
3241
| dashboard_configuration.prometheus.whitelist[0] | string | `"/api/v1/query_range"` | |
3342
| dashboard_configuration.prometheus.whitelist[1] | string | `"/api/v1/query"` | |
3443
| dashboard_configuration.prometheus.whitelist[2] | string | `"/api/v1/format_query"` | |
@@ -54,14 +63,33 @@ A Helm chart for Kubernetes
5463
| dashboard_service.port | int | `7080` | |
5564
| dashboard_service.tlsPort | int | `7443` | |
5665
| dashboard_service.type | string | `"ClusterIP"` | |
66+
| developer_portal.extraEnvVars | list | `[]` | |
67+
| developer_portal.image.pullPolicy | string | `"IfNotPresent"` | |
68+
| developer_portal.image.repository | string | `"api7/api7-developer-portal"` | |
69+
| developer_portal.image.tag | string | `"v0.0.3"` | |
70+
| developer_portal.replicaCount | int | `1` | |
71+
| developer_portal_configuration.enable | bool | `true` | |
72+
| developer_portal_configuration.server.listen.host | string | `"0.0.0.0"` | |
73+
| developer_portal_configuration.server.listen.port | int | `4321` | |
74+
| developer_portal_service.port | int | `4321` | |
75+
| developer_portal_service.type | string | `"ClusterIP"` | |
76+
| dp_manager.extraEnvVars | list | `[]` | |
5777
| dp_manager.image.pullPolicy | string | `"Always"` | |
5878
| dp_manager.image.repository | string | `"api7/api7-ee-dp-manager"` | |
59-
| dp_manager.image.tag | string | `"v3.2.11.5"` | |
79+
| dp_manager.image.tag | string | `"v3.2.13.0"` | |
6080
| dp_manager.replicaCount | int | `1` | |
6181
| dp_manager_configuration.database.dsn | string | `"postgres://api7ee:changeme@api7-postgresql:5432/api7ee"` | |
6282
| dp_manager_configuration.log.level | string | `"warn"` | |
6383
| dp_manager_configuration.log.output | string | `"stderr"` | |
6484
| dp_manager_configuration.prometheus.addr | string | `"http://api7-prometheus-server:9090"` | |
85+
| dp_manager_configuration.prometheus.basic_auth.password | string | `""` | |
86+
| dp_manager_configuration.prometheus.basic_auth.username | string | `""` | |
87+
| dp_manager_configuration.prometheus.tls.ca_file | string | `""` | |
88+
| dp_manager_configuration.prometheus.tls.cert_file | string | `""` | |
89+
| dp_manager_configuration.prometheus.tls.enable_client_cert | bool | `false` | |
90+
| dp_manager_configuration.prometheus.tls.insecure_skip_verify | bool | `false` | |
91+
| dp_manager_configuration.prometheus.tls.key_file | string | `""` | |
92+
| dp_manager_configuration.prometheus.tls.server_name | string | `""` | |
6593
| dp_manager_configuration.server.listen.host | string | `"0.0.0.0"` | |
6694
| dp_manager_configuration.server.listen.port | int | `7900` | |
6795
| dp_manager_configuration.server.tls.host | string | `"0.0.0.0"` | |
@@ -97,6 +125,7 @@ A Helm chart for Kubernetes
97125
| prometheus.server.configuration | string | `""` | |
98126
| prometheus.server.enableAdminAPI | bool | `true` | |
99127
| prometheus.server.enableRemoteWriteReceiver | bool | `true` | |
128+
| prometheus.server.existingSecret | string | `""` | |
100129
| prometheus.server.persistence.enabled | bool | `true` | |
101130
| prometheus.server.persistence.size | string | `"120Gi"` | |
102131
| prometheus.server.rbac.create | bool | `false` | |
@@ -109,3 +138,4 @@ A Helm chart for Kubernetes
109138
| serviceAccount.create | bool | `true` | |
110139
| serviceAccount.name | string | `""` | |
111140
| tolerations | list | `[]` | |
141+

‎charts/api7/templates/_helpers.tpl‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,16 @@ Create the name of the service account to use
6060
{{- default "default" .Values.serviceAccount.name }}
6161
{{- end }}
6262
{{- end }}
63+
64+
{{/*
65+
Renders a value that contains template.
66+
Usage:
67+
{{ include "api7ee3.tplvalues.render" (dict "value" .Values.path.to.the.Value "context" $) }}
68+
*/}}
69+
{{- define "api7ee3.tplvalues.render" -}}
70+
{{- if typeIs "string" .value }}
71+
{{- tpl .value .context }}
72+
{{- else}}
73+
{{- tpl (.value | toYaml) .context }}
74+
{{- end}}
75+
{{- end -}}

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ spec:
1313
app.kubernetes.io/component: dashboard
1414
template:
1515
metadata:
16-
{{- with .Values.podAnnotations }}
1716
annotations:
17+
checksum/config: {{ include (print $.Template.BasePath "/dashboard-configmap.yaml") . | sha256sum }}
18+
{{- with .Values.podAnnotations }}
1819
{{- toYaml . | nindent 8 }}
1920
{{- end }}
2021
labels:
@@ -37,6 +38,11 @@ spec:
3738
secret:
3839
secretName: {{ .Values.dashboard.keyCertSecret | quote }}
3940
{{- end }}
41+
{{- if .Values.prometheus.server.existingSecret }}
42+
- name: prometheus_ssl
43+
secret:
44+
secretName: {{ .Values.prometheus.server.existingSecret | quote }}
45+
{{- end }}
4046
{{- if or .Values.postgresql.builtin .Values.prometheus.builtin }}
4147
initContainers:
4248
{{- if .Values.postgresql.builtin }}
@@ -91,8 +97,17 @@ spec:
9197
name: ssl
9298
readOnly: true
9399
{{- end }}
100+
{{- if .Values.prometheus.server.existingSecret }}
101+
- mountPath: /app/prometheus/certs
102+
name: prometheus_ssl
103+
readOnly: true
104+
{{- end }}
94105
resources:
95106
{{- toYaml .Values.resources | nindent 12 }}
107+
env:
108+
{{- if .Values.dashboard.extraEnvVars }}
109+
{{- include "api7ee3.tplvalues.render" (dict "value" .Values.dashboard.extraEnvVars "context" $) | nindent 12 }}
110+
{{- end }}
96111

97112
{{- with .Values.nodeSelector }}
98113
nodeSelector:

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{{- if .Values.developer_portal_configuration.enable }}
2+
apiVersion: apps/v1
3+
kind: Deployment
4+
metadata:
5+
name: {{ include "api7ee3.fullname" . }}-developer-portal
6+
namespace: {{ .Release.Namespace | quote }}
7+
labels:
8+
{{- include "api7ee3.labels" . | nindent 4 }}
9+
spec:
10+
replicas: {{ .Values.developer_portal.replicaCount }}
11+
selector:
12+
matchLabels:
13+
{{- include "api7ee3.selectorLabels" . | nindent 6 }}
14+
app.kubernetes.io/component: developer-portal
15+
template:
16+
metadata:
17+
annotations:
18+
labels:
19+
{{- include "api7ee3.selectorLabels" . | nindent 8 }}
20+
app.kubernetes.io/component: developer-portal
21+
spec:
22+
{{- if .Values.imagePullSecret }}
23+
imagePullSecrets:
24+
- name: {{ .Values.imagePullSecret }}
25+
{{- end }}
26+
serviceAccountName: {{ include "api7ee3.serviceAccountName" . }}
27+
securityContext:
28+
{{- toYaml .Values.podSecurityContext | nindent 8 }}
29+
containers:
30+
- name: developer-portal
31+
securityContext:
32+
{{- toYaml .Values.securityContext | nindent 12 }}
33+
image: "{{ .Values.developer_portal.image.repository }}:{{ .Values.developer_portal.image.tag | default .Chart.AppVersion }}"
34+
imagePullPolicy: {{ .Values.developer_portal.image.pullPolicy }}
35+
ports:
36+
- name: http
37+
containerPort: {{ .Values.developer_portal_configuration.server.listen.port }}
38+
protocol: TCP
39+
livenessProbe:
40+
exec:
41+
command: ["nc", "-z", "127.0.0.1", "4321"]
42+
initialDelaySeconds: 10
43+
periodSeconds: 5
44+
failureThreshold: 10
45+
readinessProbe:
46+
exec:
47+
command: [ "nc", "-z", "127.0.0.1", "4321" ]
48+
initialDelaySeconds: 10
49+
periodSeconds: 5
50+
failureThreshold: 10
51+
resources:
52+
{{- toYaml .Values.resources | nindent 12 }}
53+
env:
54+
- name: API_URL
55+
value: 'http://{{ include "api7ee3.fullname" . }}-dashboard.{{ .Release.Namespace }}:{{ .Values.dashboard_service.port }}'
56+
{{- if .Values.developer_portal.extraEnvVars }}
57+
{{- include "api7ee3.tplvalues.render" (dict "value" .Values.developer_portal.extraEnvVars "context" $) | nindent 12 }}
58+
{{- end }}
59+
60+
{{- with .Values.nodeSelector }}
61+
nodeSelector:
62+
{{- toYaml . | nindent 8 }}
63+
{{- end }}
64+
{{- with .Values.affinity }}
65+
affinity:
66+
{{- toYaml . | nindent 8 }}
67+
{{- end }}
68+
{{- with .Values.tolerations }}
69+
tolerations:
70+
{{- toYaml . | nindent 8 }}
71+
{{- end }}
72+
{{- end }}

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

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

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ spec:
1313
app.kubernetes.io/component: dp-manager
1414
template:
1515
metadata:
16-
{{- with .Values.podAnnotations }}
1716
annotations:
17+
checksum/config: {{ include (print $.Template.BasePath "/dp-manager-configmap.yaml") . | sha256sum }}
18+
{{- with .Values.podAnnotations }}
1819
{{- toYaml . | nindent 8 }}
1920
{{- end }}
2021
labels:
@@ -32,6 +33,11 @@ spec:
3233
- name: config
3334
configMap:
3435
name: {{ include "api7ee3.fullname" . }}-dp-manager-config
36+
{{- if .Values.prometheus.server.existingSecret }}
37+
- name: prometheus_ssl
38+
secret:
39+
secretName: {{ .Values.prometheus.server.existingSecret | quote }}
40+
{{- end }}
3541
initContainers:
3642
- name: wait-for-dashboard
3743
image: "{{ .Values.busybox.image.repository }}:{{ .Values.busybox.image.tag }}"
@@ -76,8 +82,17 @@ spec:
7682
volumeMounts:
7783
- name: config
7884
mountPath: /api7-ee
85+
{{- if .Values.prometheus.server.existingSecret }}
86+
- mountPath: /app/prometheus/certs
87+
name: prometheus_ssl
88+
readOnly: true
89+
{{- end }}
7990
resources:
8091
{{- toYaml .Values.resources | nindent 12 }}
92+
env:
93+
{{- if .Values.dp_manager.extraEnvVars }}
94+
{{- include "api7ee3.tplvalues.render" (dict "value" .Values.dp_manager.extraEnvVars "context" $) | nindent 12 }}
95+
{{- end }}
8196

8297
{{- with .Values.nodeSelector }}
8398
nodeSelector:

‎charts/api7/values.yaml‎

Lines changed: 52 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,26 @@ 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.11.5"
13+
tag: "v3.2.13.0"
14+
extraEnvVars: []
1415

1516
dp_manager:
1617
replicaCount: 1
1718
image:
1819
repository: api7/api7-ee-dp-manager
1920
pullPolicy: Always
2021
# Overrides the image tag whose default is the chart appVersion.
21-
tag: "v3.2.11.5"
22+
tag: "v3.2.13.0"
23+
extraEnvVars: []
24+
25+
developer_portal:
26+
replicaCount: 1
27+
image:
28+
repository: api7/api7-developer-portal
29+
pullPolicy: IfNotPresent
30+
# Overrides the image tag whose default is the chart appVersion.
31+
tag: "v0.0.3"
32+
extraEnvVars: []
2233

2334
imagePullSecret: ""
2435
nameOverride: ""
@@ -86,6 +97,10 @@ dp_manager_service:
8697
# hosts:
8798
# - dp-manager.local
8899

100+
developer_portal_service:
101+
type: ClusterIP
102+
port: 4321
103+
89104
resources: {}
90105
# We usually recommend not to specify default resources and to leave this as a conscious
91106
# choice for the user. This also increases chances charts run on environments with little
@@ -115,6 +130,7 @@ prometheus:
115130
alertmanager:
116131
enabled: false
117132
server:
133+
existingSecret: "" # name of existing secret to mount the path of prometheus client certs.
118134
enableRemoteWriteReceiver: true
119135
enableAdminAPI: true
120136
serviceAccount:
@@ -176,6 +192,16 @@ dashboard_configuration:
176192
# max_open_conns: 30
177193
prometheus:
178194
addr: "http://api7-prometheus-server:9090"
195+
basic_auth: # access the prometheus with basic-auth
196+
username: "" # Basic-auth username. If the username is empty, basic-auth authentication is not performed when requesting prometheus.
197+
password: ""
198+
tls:
199+
server_name: ""
200+
insecure_skip_verify: false
201+
enable_client_cert: false
202+
key_file: "" # the file path of the private key for requesting prometheus, (e.g. /app/prometheus/certs/tls.key)
203+
cert_file: "" # the file path of the certificate for requesting prometheus, (e.g. /app/prometheus/certs/tls.crt)
204+
ca_file: "" # the file path of the ca to verify the prometheus tls server. (e.g. /app/prometheus/certs/ca.crt)
179205
whitelist:
180206
- "/api/v1/query_range"
181207
- "/api/v1/query"
@@ -184,6 +210,13 @@ dashboard_configuration:
184210
- "/api/v1/labels"
185211
console:
186212
addr: "http://127.0.0.1:3000"
213+
# fallback_cp:
214+
# aws_s3:
215+
# access_key: "access"
216+
# secret_key: "secret"
217+
# region: "ap-south-1"
218+
# bucket: "to-push-ha-data"
219+
# cron_spec: "@every 1m"
187220

188221
dp_manager_configuration:
189222
server:
@@ -202,3 +235,20 @@ dp_manager_configuration:
202235
# max_open_conns: 30
203236
prometheus:
204237
addr: "http://api7-prometheus-server:9090"
238+
basic_auth: # access the prometheus with basic-auth
239+
username: "" # Basic-auth username. If the username is empty, basic-auth authentication is not performed when requesting prometheus.
240+
password: ""
241+
tls:
242+
server_name: ""
243+
insecure_skip_verify: false
244+
enable_client_cert: false
245+
key_file: "" # the file path of the private key for requesting prometheus, (e.g. /app/prometheus/certs/tls.key)
246+
cert_file: "" # the file path of the certificate for requesting prometheus, (e.g. /app/prometheus/certs/tls.crt)
247+
ca_file: "" # the file path of the ca to verify the prometheus tls server. (e.g. /app/prometheus/certs/ca.crt)
248+
249+
developer_portal_configuration:
250+
enable: true
251+
server:
252+
listen:
253+
host: "0.0.0.0"
254+
port: 4321

0 commit comments

Comments
 (0)