Skip to content

Commit

Permalink
Add options for configuring the ready/liveness probes to baserow
Browse files Browse the repository at this point in the history
  • Loading branch information
@cwgthornton
cwgthornton committed May 7, 2024
1 parent f83634f commit 59e50ab
Show file tree
Hide file tree
Showing 7 changed files with 330 additions and 246 deletions.
432 changes: 220 additions & 212 deletions charts/baserow/README.md
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions charts/baserow/templates/asgi/asgi-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,20 +105,20 @@ spec:
- "/bin/bash"
- "-c"
- "/baserow/backend/docker/docker-entrypoint.sh backend-healthcheck"
initialDelaySeconds: 5
periodSeconds: 5
timeoutSeconds: 5
successThreshold: 1
initialDelaySeconds: {{ .Values.backend.asgi.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.backend.asgi.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.backend.asgi.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.backend.asgi.livenessProbe.successThreshold }}
readinessProbe:
exec:
command:
- "/bin/bash"
- "-c"
- "/baserow/backend/docker/docker-entrypoint.sh backend-healthcheck"
initialDelaySeconds: 5
periodSeconds: 5
timeoutSeconds: 5
successThreshold: 1
initialDelaySeconds: {{ .Values.backend.asgi.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.backend.asgi.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.backend.asgi.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.backend.asgi.readinessProbe.successThreshold }}
{{- with .Values.backend.asgi.resources }}
resources:
{{- toYaml . | nindent 12 }}
Expand Down
24 changes: 12 additions & 12 deletions charts/baserow/templates/celery/celery-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,18 @@ spec:
- /bin/bash
- -c
- /baserow/backend/docker/docker-entrypoint.sh celery-worker-healthcheck
initialDelaySeconds: 10
timeoutSeconds: 10
periodSeconds: 10
initialDelaySeconds: {{ .Values.backend.celery.livenessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.backend.celery.livenessProbe.timeoutSeconds }}
periodSeconds: {{ .Values.backend.celery.livenessProbe.periodSeconds }}
readinessProbe:
exec:
command:
- /bin/bash
- -c
- /baserow/backend/docker/docker-entrypoint.sh celery-worker-healthcheck
initialDelaySeconds: 10
timeoutSeconds: 10
periodSeconds: 10
initialDelaySeconds: {{ .Values.backend.celery.readinessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.backend.celery.readinessProbe.timeoutSeconds }}
periodSeconds: {{ .Values.backend.celery.readinessProbe.periodSeconds }}
{{- with .Values.backend.celery.resources }}
resources:
{{- toYaml . | nindent 12 }}
Expand Down Expand Up @@ -194,18 +194,18 @@ spec:
- /bin/bash
- -c
- /baserow/backend/docker/docker-entrypoint.sh celery-exportworker-healthcheck
initialDelaySeconds: 10
timeoutSeconds: 10
periodSeconds: 10
initialDelaySeconds: {{ .Values.backend.celery.livenessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.backend.celery.livenessProbe.timeoutSeconds }}
periodSeconds: {{ .Values.backend.celery.livenessProbe.periodSeconds }}
readinessProbe:
exec:
command:
- /bin/bash
- -c
- /baserow/backend/docker/docker-entrypoint.sh celery-exportworker-healthcheck
initialDelaySeconds: 10
timeoutSeconds: 10
periodSeconds: 10
initialDelaySeconds: {{ .Values.backend.celery.readinessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.backend.celery.readinessProbe.timeoutSeconds }}
periodSeconds: {{ .Values.backend.celery.readinessProbe.periodSeconds }}
{{- with .Values.backend.celery.resources }}
resources:
{{- toYaml . | nindent 12 }}
Expand Down
12 changes: 6 additions & 6 deletions charts/baserow/templates/frontend/frontend-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ spec:
httpGet:
path: /_health/
port: {{ .Values.frontend.service.port }}
initialDelaySeconds: 5
periodSeconds: 5
successThreshold: 1
initialDelaySeconds: {{ .Values.frontend.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.frontend.livenessProbe.periodSeconds }}
successThreshold: {{ .Values.frontend.livenessProbe.successThreshold }}
readinessProbe:
httpGet:
path: /_health/
port: {{ .Values.frontend.service.port }}
initialDelaySeconds: 5
periodSeconds: 5
successThreshold: 1
initialDelaySeconds: {{ .Values.frontend.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.frontend.readinessProbe.periodSeconds }}
successThreshold: {{ .Values.frontend.readinessProbe.successThreshold }}
{{- with .Values.frontend.resources }}
resources:
{{- toYaml . | nindent 12 }}
Expand Down
16 changes: 8 additions & 8 deletions charts/baserow/templates/wsgi/wsgi-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,20 +107,20 @@ spec:
- "/bin/bash"
- "-c"
- "/baserow/backend/docker/docker-entrypoint.sh backend-healthcheck"
initialDelaySeconds: 5
periodSeconds: 5
timeoutSeconds: 5
successThreshold: 1
initialDelaySeconds: {{ .Values.backend.wsgi.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.backend.wsgi.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.backend.wsgi.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.backend.wsgi.livenessProbe.successThreshold }}
readinessProbe:
exec:
command:
- "/bin/bash"
- "-c"
- "/baserow/backend/docker/docker-entrypoint.sh backend-healthcheck"
initialDelaySeconds: 5
periodSeconds: 5
timeoutSeconds: 5
successThreshold: 1
initialDelaySeconds: {{ .Values.backend.wsgi.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.backend.wsgi.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.backend.wsgi.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.backend.wsgi.readinessProbe.successThreshold }}
{{- with .Values.backend.wsgi.resources }}
resources:
{{- toYaml . | nindent 12 }}
Expand Down
24 changes: 24 additions & 0 deletions charts/baserow/values.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
}
}
},
"priorityClassName": {
"type": "string"
},
"replicaCount": {
"type": "integer"
},
Expand All @@ -94,6 +97,9 @@
}
}
},
"selectorLabels": {
"type": "object"
},
"service": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -190,6 +196,9 @@
}
}
},
"priorityClassName": {
"type": "string"
},
"replicaCount": {
"type": "integer"
},
Expand All @@ -213,6 +222,9 @@
}
}
},
"selectorLabels": {
"type": "object"
},
"serviceAccount": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -592,6 +604,9 @@
}
}
},
"priorityClassName": {
"type": "string"
},
"replicaCount": {
"type": "integer"
},
Expand All @@ -615,6 +630,9 @@
}
}
},
"selectorLabels": {
"type": "object"
},
"service": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -832,6 +850,9 @@
}
}
},
"priorityClassName": {
"type": "string"
},
"replicaCount": {
"type": "integer"
},
Expand All @@ -855,6 +876,9 @@
}
}
},
"selectorLabels": {
"type": "object"
},
"service": {
"type": "object",
"properties": {
Expand Down
52 changes: 52 additions & 0 deletions charts/baserow/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,18 @@ frontend:
# -- Target Memory utilization percentage
targetMemoryUtilizationPercentage: 80

# -- Configure liveness probe timeouts
livenessProbe:
initialDelaySeconds: 5
periodSeconds: 5
successThreshold: 1

# -- Configure readiness probe timeouts
readinessProbe:
initialDelaySeconds: 5
periodSeconds: 5
successThreshold: 1

# -- Node labels for pod assignment
nodeSelector: {}

Expand Down Expand Up @@ -199,6 +211,20 @@ backend:
# -- Target Memory utilization percentage
targetMemoryUtilizationPercentage: 80

# -- Configure liveness probe timeouts
livenessProbe:
initialDelaySeconds: 5
periodSeconds: 5
timeoutSeconds: 5
successThreshold: 1

# -- Configure readiness probe timeouts
readinessProbe:
initialDelaySeconds: 5
periodSeconds: 5
timeoutSeconds: 5
successThreshold: 1

# -- Node labels for pod assignment
nodeSelector: {}

Expand Down Expand Up @@ -279,6 +305,18 @@ backend:
# -- Target Memory utilization percentage
targetMemoryUtilizationPercentage: 80

# -- Configure liveness probe timeouts
livenessProbe:
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 10

# -- Configure readiness probe timeouts
readinessProbe:
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 10

# -- Node labels for pod assignment
nodeSelector: {}

Expand Down Expand Up @@ -519,6 +557,20 @@ backend:
# -- Target Memory utilization percentage
targetMemoryUtilizationPercentage: 80

# -- Configure liveness probe timeouts
livenessProbe:
initialDelaySeconds: 5
periodSeconds: 5
timeoutSeconds: 5
successThreshold: 1

# -- Configure readiness probe timeouts
readinessProbe:
initialDelaySeconds: 5
periodSeconds: 5
timeoutSeconds: 5
successThreshold: 1

# -- Node labels for pod assignment
nodeSelector: {}

Expand Down

0 comments on commit 59e50ab

Please sign in to comment.