Skip to content

Commit a08db24

Browse files
author
datacore-bolt-ci
committed
ci(stability): merge the develop branch
2 parents b3bf80d + b7dd0fb commit a08db24

File tree

4 files changed

+60
-1
lines changed

4 files changed

+60
-1
lines changed

chart/README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,17 @@ This removes all the Kubernetes components associated with the chart and deletes
9393
| agents.​ha.​node.​resources.​requests.​cpu | Cpu requests for ha node agent | `"100m"` |
9494
| agents.​ha.​node.​resources.​requests.​memory | Memory requests for ha node agent | `"64Mi"` |
9595
| agents.​ha.​node.​tolerations | Set tolerations, overrides global | `[]` |
96+
| apis.​rest.​healthProbes.​liveness.​enabled | Toggle liveness probe. | `true` |
97+
| apis.​rest.​healthProbes.​liveness.​failureThreshold | No. of failures the liveness probe will tolerate. | `1` |
98+
| apis.​rest.​healthProbes.​liveness.​initialDelaySeconds | No. of seconds of delay before checking the liveness status. | `0` |
99+
| apis.​rest.​healthProbes.​liveness.​periodSeconds | No. of seconds between liveness probe checks. | `30` |
100+
| apis.​rest.​healthProbes.​liveness.​timeoutSeconds | No. of seconds of timeout tolerance. | `5` |
101+
| apis.​rest.​healthProbes.​readiness.​agentCoreProbeFreq | Frequency for the agent-core liveness probe. | `"20s"` |
102+
| apis.​rest.​healthProbes.​readiness.​enabled | Toggle readiness probe. | `true` |
103+
| apis.​rest.​healthProbes.​readiness.​failureThreshold | No. of failures the readiness probe will tolerate. | `2` |
104+
| apis.​rest.​healthProbes.​readiness.​initialDelaySeconds | No. of seconds of delay before checking the readiness status. | `0` |
105+
| apis.​rest.​healthProbes.​readiness.​periodSeconds | No. of seconds between readiness probe checks. | `20` |
106+
| apis.​rest.​healthProbes.​readiness.​timeoutSeconds | No. of seconds of timeout tolerance. | `5` |
96107
| apis.​rest.​logLevel | Log level for the rest service | `"info"` |
97108
| apis.​rest.​priorityClassName | Set PriorityClass, overrides global. If both local and global are not set, the final deployment manifest has a mayastor custom critical priority class assigned to the pod by default. Refer the `templates/_helpers.tpl` and `templates/mayastor/apis/rest/api-rest-deployment.yaml` for more details. | `""` |
98109
| apis.​rest.​replicaCount | Number of replicas of rest | `1` |

chart/templates/mayastor/apis/api-rest-deployment.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ spec:
5353
- "--core-grpc=https://{{ .Release.Name }}-agent-core:50051"
5454
- "--ansi-colors={{ .Values.base.logging.color }}"
5555
- "--fmt-style={{ include "logFormat" . }}"
56+
{{- if .Values.apis.rest.healthProbes.readiness.enabled }}
57+
- "--core-health-freq={{ .Values.apis.rest.healthProbes.readiness.agentCoreProbeFreq }}"
58+
{{- end }}
5659
ports:
5760
- containerPort: 8080
5861
- containerPort: 8081
@@ -63,3 +66,23 @@ spec:
6366
- name: RUST_LOG_SILENCE
6467
value: {{ default .Values.base.logging.silenceLevel .Values.apis.rest.logSilenceLevel }}
6568
{{- end }}
69+
{{- if .Values.apis.rest.healthProbes.readiness.enabled }}
70+
readinessProbe:
71+
httpGet:
72+
path: /ready
73+
port: 8081
74+
failureThreshold: {{ .Values.apis.rest.healthProbes.readiness.failureThreshold }}
75+
initialDelaySeconds: {{ .Values.apis.rest.healthProbes.readiness.initialDelaySeconds }}
76+
periodSeconds: {{ .Values.apis.rest.healthProbes.readiness.periodSeconds }}
77+
timeoutSeconds: {{ .Values.apis.rest.healthProbes.readiness.timeoutSeconds }}
78+
{{- end }}
79+
{{- if .Values.apis.rest.healthProbes.liveness.enabled }}
80+
livenessProbe:
81+
httpGet:
82+
path: /live
83+
port: 8081
84+
failureThreshold: {{ .Values.apis.rest.healthProbes.liveness.failureThreshold }}
85+
initialDelaySeconds: {{ .Values.apis.rest.healthProbes.liveness.initialDelaySeconds }}
86+
periodSeconds: {{ .Values.apis.rest.healthProbes.liveness.periodSeconds }}
87+
timeoutSeconds: {{ .Values.apis.rest.healthProbes.liveness.timeoutSeconds }}
88+
{{- end }}

chart/values.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,31 @@ apis:
254254
rest:
255255
# -- Log level for the rest service
256256
logLevel: info
257+
healthProbes:
258+
readiness:
259+
# -- Toggle readiness probe.
260+
enabled: true
261+
# -- Frequency for the agent-core liveness probe.
262+
agentCoreProbeFreq: "20s"
263+
# -- No. of failures the readiness probe will tolerate.
264+
failureThreshold: 2
265+
# -- No. of seconds of delay before checking the readiness status.
266+
initialDelaySeconds: 0
267+
# -- No. of seconds between readiness probe checks.
268+
periodSeconds: 20
269+
# -- No. of seconds of timeout tolerance.
270+
timeoutSeconds: 5
271+
liveness:
272+
# -- Toggle liveness probe.
273+
enabled: true
274+
# -- No. of failures the liveness probe will tolerate.
275+
failureThreshold: 1
276+
# -- No. of seconds of delay before checking the liveness status.
277+
initialDelaySeconds: 0
278+
# -- No. of seconds between liveness probe checks.
279+
periodSeconds: 30
280+
# -- No. of seconds of timeout tolerance.
281+
timeoutSeconds: 5
257282
# -- Number of replicas of rest
258283
replicaCount: 1
259284
resources:

dependencies/control-plane

Submodule control-plane updated 52 files

0 commit comments

Comments
 (0)