From e6dce748ba57868277a0ffe59c0c3a802e14a862 Mon Sep 17 00:00:00 2001 From: AndrewChubatiuk Date: Wed, 24 Apr 2024 09:04:53 +0300 Subject: [PATCH] set livenessProbes timeouts, upgraded dependency charts, updated doc, added scheduler replicaCount --- charts/redash/README.md | 8 +++++--- charts/redash/requirements.lock | 6 +++--- charts/redash/templates/scheduler-deployment.yaml | 2 +- charts/redash/values.yaml | 5 +++++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/charts/redash/README.md b/charts/redash/README.md index 480a33b..44a2254 100644 --- a/charts/redash/README.md +++ b/charts/redash/README.md @@ -8,7 +8,7 @@ This chart bootstraps a [Redash](https://github.com/getredash/redash) deployment This is a contributed project developed by volunteers and not officially supported by Redash. -Current chart version is `3.1.0-alpha5` +Current chart version is `3.1.0-alpha6` * @@ -203,14 +203,16 @@ The following table lists the configurable parameters of the Redash chart and th | redis.database | int | `0` | | | redis.enabled | bool | `true` | Whether to deploy a Redis server to satisfy the applications database requirements. To use an external Redis set this to false and configure the externalRedis parameter. | | redis.master.service.ports.redis | int | `6379` | | +| redis.replica.replicaCount | int | `0` | | | scheduler.affinity | object | `{}` | Affinity for scheduler pod assignment [ref](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity) | | scheduler.env | object | `{}` | Redash scheduler specific environment variables. | | scheduler.initContainers | list | `[]` | Redash scheduler init containers configuration. | -| scheduler.livenessProbe | object | `{}` | Liveness probe for scheduler to ensure workers are running fine | +| scheduler.livenessProbe | object | `{"exec":{"command":["/bin/sh","-c","/app/bin/docker-entrypoint workers_healthcheck"]},"initialDelaySeconds":60,"periodSeconds":100,"timeoutSeconds":10}` | Liveness probe for scheduler to ensure workers are running fine | | scheduler.nodeSelector | object | `{}` | Node labels for scheduler pod assignment [ref](https://kubernetes.io/docs/user-guide/node-selection/) | | scheduler.podAnnotations | object | `{}` | Annotations for scheduler pod assignment [ref](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) | | scheduler.podLabels | object | `{}` | Labels for scheduler pod assignment [ref](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) | | scheduler.podSecurityContext | object | `{}` | Security contexts for scheduler pod assignment [ref](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) | +| scheduler.replicaCount | int | `1` | Number of scheduler pods to run | | scheduler.resources | string | `nil` | scheduler resource requests and limits [ref](http://kubernetes.io/docs/user-guide/compute-resources/) | | scheduler.securityContext | object | `{}` | | | scheduler.tolerations | list | `[]` | Tolerations for scheduler pod assignment [ref](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | @@ -244,7 +246,7 @@ The following table lists the configurable parameters of the Redash chart and th | volumes | list | `[]` | Redash global volumes configuration - applied to all containers | | worker.affinity | object | `{}` | Default affinity for worker pod assignment [ref](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity) | | worker.initContainers | list | `[]` | Worker default init containers configuration | -| worker.livenessProbe | object | `{}` | Default worker's liveness probe to ensure workers are running fine | +| worker.livenessProbe | object | `{"exec":{"command":["/bin/sh","-c","/app/bin/docker-entrypoint workers_healthcheck"]},"initialDelaySeconds":60,"periodSeconds":100,"timeoutSeconds":10}` | Default worker's liveness probe to ensure workers are running fine | | worker.nodeSelector | object | `{}` | Default node labels for worker pod assignment [ref](https://kubernetes.io/docs/user-guide/node-selection/) | | worker.podAnnotations | object | `{}` | Default annotations for worker pod assignment [ref](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) | | worker.podLabels | object | `{}` | Default labels for worker pod assignment [ref](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) | diff --git a/charts/redash/requirements.lock b/charts/redash/requirements.lock index e9564ac..b90c78c 100644 --- a/charts/redash/requirements.lock +++ b/charts/redash/requirements.lock @@ -1,9 +1,9 @@ dependencies: - name: redis repository: oci://registry-1.docker.io/bitnamicharts - version: 19.1.0 + version: 19.1.3 - name: postgresql repository: oci://registry-1.docker.io/bitnamicharts version: 15.2.5 -digest: sha256:737414ecea2a8b28eb5170ec23dcc35251a77836e71283623d29874c4404159c -generated: "2024-04-11T10:04:30.905003+03:00" +digest: sha256:151965ff63f41c38de182793b57c890da72de2e699c7f69a98e179cfa07ece09 +generated: "2024-04-24T09:02:42.314748+03:00" diff --git a/charts/redash/templates/scheduler-deployment.yaml b/charts/redash/templates/scheduler-deployment.yaml index 571c179..7a8194b 100644 --- a/charts/redash/templates/scheduler-deployment.yaml +++ b/charts/redash/templates/scheduler-deployment.yaml @@ -6,7 +6,7 @@ metadata: {{- include "redash.labels" . | nindent 4 }} app.kubernetes.io/component: scheduler spec: - replicas: 1 + replicas: {{ .Values.scheduler.replicaCount }} strategy: type: Recreate selector: diff --git a/charts/redash/values.yaml b/charts/redash/values.yaml index efe04db..d602f9b 100644 --- a/charts/redash/values.yaml +++ b/charts/redash/values.yaml @@ -454,6 +454,7 @@ worker: - /bin/sh - -c - /app/bin/docker-entrypoint workers_healthcheck + timeoutSeconds: 10 initialDelaySeconds: 60 periodSeconds: 100 @@ -462,6 +463,9 @@ scheduler: # scheduler.env -- Redash scheduler specific environment variables. env: {} + # scheduler.replicaCount -- Number of scheduler pods to run + replicaCount: 1 + # scheduler.initContainers -- Redash scheduler init containers configuration. initContainers: [] @@ -485,6 +489,7 @@ scheduler: - /bin/sh - -c - /app/bin/docker-entrypoint workers_healthcheck + timeoutSeconds: 10 initialDelaySeconds: 60 periodSeconds: 100