From 4a16844d7dd5c4366949199b50f6e32220c869dc Mon Sep 17 00:00:00 2001
From: Federico Stagni <federico.stagni@cern.ch>
Date: Thu, 26 Sep 2024 14:32:46 +0200
Subject: [PATCH] increase delay for mysql probe

---
 README.md          | 10 ++++++++--
 diracx/values.yaml | 17 +++++++++--------
 k3s/README.md      |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index cff8854..ee9c94e 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ This helm chart is intended to be used in two ways:
  * Development: The ./run_demo.sh script allows the infrastructure to be ran locally with docker+kind
  * Production: TODO
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1a](https://img.shields.io/badge/AppVersion-0.0.1a-informational?style=flat-square)
+![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1a17](https://img.shields.io/badge/AppVersion-0.0.1a17-informational?style=flat-square)
 
 ![DiracX Chart tests](https://github.com/DIRACGrid/diracx-charts/actions/workflows/main.yml/badge.svg?branch=master)
 
@@ -301,7 +301,7 @@ Note that this configuration is trivial and does not follow production recommand
 | elasticsearch.volumeClaimTemplate.resources.requests.storage | string | `"100M"` |  |
 | elasticsearch.volumeClaimTemplate.storageClassName | string | `"standard"` |  |
 | fullnameOverride | string | `""` |  |
-| global.activeDeadlineSeconds | int | `900` | timeout for job deadlines |
+| global.activeDeadlineSeconds | int | `3600` | timeout for job deadlines |
 | global.batchJobTTL | int | `600` | How long should batch jobs be retained after completing? |
 | global.imagePullPolicy | string | `"Always"` |  |
 | global.images.client | string | `"ghcr.io/diracgrid/diracx/client"` |  |
@@ -381,6 +381,12 @@ Note that this configuration is trivial and does not follow production recommand
 | mysql.auth.username | string | `"sqldiracx"` |  |
 | mysql.enabled | bool | `true` |  |
 | mysql.initdbScriptsConfigMap | string | `"mysql-init-diracx-dbs"` |  |
+| mysql.startupProbe.enabled | bool | `true` |  |
+| mysql.startupProbe.failureThreshold | int | `30` |  |
+| mysql.startupProbe.initialDelaySeconds | int | `15` |  |
+| mysql.startupProbe.periodSeconds | int | `10` |  |
+| mysql.startupProbe.successThreshold | int | `1` |  |
+| mysql.startupProbe.timeoutSeconds | int | `1` |  |
 | nameOverride | string | `""` | type=kubernetes.io/dockerconfigjson imagePullSecrets:   - name: regcred |
 | nodeSelector | object | `{}` |  |
 | opensearch.config | object | `{}` |  |
diff --git a/diracx/values.yaml b/diracx/values.yaml
index 9176de1..4f7adbb 100644
--- a/diracx/values.yaml
+++ b/diracx/values.yaml
@@ -351,15 +351,16 @@ mysql:
 
   # if mysql pod is failing and restarting due to mysql update
   # it can be that the prob failure treshold is too low
-  # increasing this number can help:
+  # increasing this number can help.
   #
-  # startupProbe:
-  #   enabled: true
-  #   initialDelaySeconds: 15
-  #   periodSeconds: 10
-  #   timeoutSeconds: 1
-  #   failureThreshold: 30
-  #   successThreshold: 1
+  # Also have a look at https://github.com/bitnami/charts/issues/7433#issuecomment-938748980
+  startupProbe:
+    enabled: true
+    initialDelaySeconds: 15
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 30
+    successThreshold: 1
 
 ##########################
 
diff --git a/k3s/README.md b/k3s/README.md
index a384a5b..d309795 100644
--- a/k3s/README.md
+++ b/k3s/README.md
@@ -225,7 +225,7 @@ Few tutorials:
 sed -i 's/<your_hostname>/thenameyouareacutally.using.com/g' ./diracx-charts/k3s/examples/*
 ```
 
-Now, it is time to choose what to install, so go through `./diracx-charts/diracx/values.yaml` file and edit it accordingly. 
+Now, it is time to choose what to install, so go through `./diracx-charts/diracx/values.yaml` file and edit it accordingly.
 
 ```
 # Deploy time!