Generalized startupProbe injection in all charts (#153)

* Generalized startupProbe injection & weaker liveness condition in all charts --------- Co-authored-by: gferey <[email protected]> Co-authored-by: Gaspi <[email protected]>
InseeFrLab · Sep 16, 2024 · 034d940 · 034d940
1 parent 58a94af
commit 034d940
Show file tree

Hide file tree

Showing 24 changed files with 114 additions and 38 deletions.
diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/Chart.yaml
@@ -24,8 +24,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-
-version: 2.0.6
+version: 2.0.7
 
 dependencies:
   - name: library-chart

diff --git a/charts/jupyter-pyspark/templates/statefulset.yaml b/charts/jupyter-pyspark/templates/statefulset.yaml
@@ -250,15 +250,19 @@ spec:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
+            timeoutSeconds: 2
+            failureThreshold: 6
           readinessProbe:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
+          {{- if hasKey .Values "startupProbe" }}
           startupProbe:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
-            {{- toYaml .Values.startupProbe | nindent 12 }}     
+            {{- toYaml .Values.startupProbe | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

diff --git a/charts/jupyter-pyspark/values.schema.json b/charts/jupyter-pyspark/values.schema.json
@@ -818,8 +818,14 @@
     },
     "startupProbe": {
       "type": "object",
-      "description": "Start up probe",
-      "default": {},
+      "description": "Startup probe",
+      "default": {
+        "failureThreshold": 60,
+        "initialDelaySeconds": 10,
+        "periodSeconds": 10,
+        "successThreshold": 1,
+        "timeoutSeconds": 2
+      },
       "x-onyxia": {
         "hidden": true,
         "overwriteDefaultWith": "region.startupProbe",

diff --git a/charts/jupyter-pyspark/values.yaml b/charts/jupyter-pyspark/values.yaml
@@ -239,12 +239,12 @@ startupProbe:
   initialDelaySeconds: 10
   periodSeconds: 10
   successThreshold: 1
-  timeoutSeconds: 5
+  timeoutSeconds: 2
 
 userPreferences:
   darkMode: false
   language: "en"
 
 message:
   fr: ""
-  en: ""
+  en: ""
diff --git a/charts/jupyter-python/Chart.yaml b/charts/jupyter-python/Chart.yaml
@@ -22,8 +22,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-
-version: 2.0.6
+version: 2.0.7
 
 dependencies:
   - name: library-chart

diff --git a/charts/jupyter-python/templates/statefulset.yaml b/charts/jupyter-python/templates/statefulset.yaml
@@ -201,15 +201,19 @@ spec:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
+            timeoutSeconds: 2
+            failureThreshold: 6
           readinessProbe:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
+          {{- if hasKey .Values "startupProbe" }}
           startupProbe:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
-            {{- toYaml .Values.startupProbe | nindent 12 }}     
+            {{- toYaml .Values.startupProbe | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

diff --git a/charts/jupyter-python/values.schema.json b/charts/jupyter-python/values.schema.json
@@ -725,14 +725,20 @@
         },
         "startupProbe": {
             "type": "object",
-            "description": "Start up probe",
-            "default": {},
+            "description": "Startup probe",
+            "default": {
+              "failureThreshold": 60,
+              "initialDelaySeconds": 10,
+              "periodSeconds": 10,
+              "successThreshold": 1,
+              "timeoutSeconds": 2
+            },
             "x-onyxia": {
                 "hidden": true,
                 "overwriteDefaultWith": "region.startupProbe",
                 "overwriteSchemaWith": "ide/startupProbe.json"
             }
-        },
+          },
         "tolerations": {
             "type": "array",
             "description": "Array of tolerations",

diff --git a/charts/jupyter-python/values.yaml b/charts/jupyter-python/values.yaml
@@ -208,7 +208,7 @@ startupProbe:
   initialDelaySeconds: 10
   periodSeconds: 10
   successThreshold: 1
-  timeoutSeconds: 5
+  timeoutSeconds: 2
 
 userPreferences:
   darkMode: false

diff --git a/charts/rstudio-sparkr/Chart.yaml b/charts/rstudio-sparkr/Chart.yaml
@@ -23,7 +23,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.5
+version: 2.0.6
 
 dependencies:
   - name: library-chart

diff --git a/charts/rstudio-sparkr/templates/statefulset.yaml b/charts/rstudio-sparkr/templates/statefulset.yaml
@@ -223,19 +223,19 @@ spec:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
+            timeoutSeconds: 2
+            failureThreshold: 6
           readinessProbe:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
+          {{- if hasKey .Values "startupProbe" }}
           startupProbe:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
-            failureThreshold: 60
-            initialDelaySeconds: 10
-            periodSeconds: 10
-            successThreshold: 1
-            timeoutSeconds: 5    
+            {{- toYaml .Values.startupProbe | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

diff --git a/charts/rstudio-sparkr/values.schema.json b/charts/rstudio-sparkr/values.schema.json
@@ -750,8 +750,14 @@
         },
         "startupProbe": {
             "type": "object",
-            "description": "Start up probe",
-            "default": {},
+            "description": "Startup probe",
+            "default": {
+                "failureThreshold": 60,
+                "initialDelaySeconds": 10,
+                "periodSeconds": 10,
+                "successThreshold": 1,
+                "timeoutSeconds": 2
+            },
             "x-onyxia": {
                 "hidden": true,
                 "overwriteDefaultWith": "region.startupProbe",

diff --git a/charts/rstudio-sparkr/values.yaml b/charts/rstudio-sparkr/values.yaml
@@ -220,6 +220,13 @@ tolerations: []
 
 affinity: {}
 
+startupProbe:
+  failureThreshold: 60
+  initialDelaySeconds: 10
+  periodSeconds: 10
+  successThreshold: 1
+  timeoutSeconds: 2
+
 proxy:
   enabled: false
   noProxy: ""

diff --git a/charts/rstudio/Chart.yaml b/charts/rstudio/Chart.yaml
@@ -22,7 +22,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.5
+version: 2.0.6
 
 dependencies:
   - name: library-chart

diff --git a/charts/rstudio/templates/statefulset.yaml b/charts/rstudio/templates/statefulset.yaml
@@ -136,19 +136,19 @@ spec:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
+            timeoutSeconds: 2
+            failureThreshold: 6
           readinessProbe:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
+          {{- if hasKey .Values "startupProbe" }}
           startupProbe:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
-            failureThreshold: 60
-            initialDelaySeconds: 10
-            periodSeconds: 10
-            successThreshold: 1
-            timeoutSeconds: 5      
+            {{- toYaml .Values.startupProbe | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

diff --git a/charts/rstudio/values.schema.json b/charts/rstudio/values.schema.json
@@ -674,8 +674,14 @@
         },
         "startupProbe": {
             "type": "object",
-            "description": "Start up probe",
-            "default": {},
+            "description": "Startup probe",
+            "default": {
+                "failureThreshold": 60,
+                "initialDelaySeconds": 10,
+                "periodSeconds": 10,
+                "successThreshold": 1,
+                "timeoutSeconds": 2
+            },
             "x-onyxia": {
                 "hidden": true,
                 "overwriteDefaultWith": "region.startupProbe",

diff --git a/charts/rstudio/values.yaml b/charts/rstudio/values.yaml
@@ -178,6 +178,13 @@ tolerations: []
 
 affinity: {}
 
+startupProbe:
+  failureThreshold: 60
+  initialDelaySeconds: 10
+  periodSeconds: 10
+  successThreshold: 1
+  timeoutSeconds: 2
+
 repository:
   configMapName: ""
   packageManagerUrl: ""

diff --git a/charts/vscode-pyspark/Chart.yaml b/charts/vscode-pyspark/Chart.yaml
@@ -24,7 +24,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.5
+version: 2.0.6
 
 dependencies:
   - name: library-chart

diff --git a/charts/vscode-pyspark/templates/statefulset.yaml b/charts/vscode-pyspark/templates/statefulset.yaml
@@ -247,15 +247,19 @@ spec:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
+            timeoutSeconds: 2
+            failureThreshold: 6
           readinessProbe:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
+          {{- if hasKey .Values "startupProbe" }}
           startupProbe:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
-            {{- toYaml .Values.startupProbe | nindent 12 }}     
+            {{- toYaml .Values.startupProbe | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

diff --git a/charts/vscode-pyspark/values.schema.json b/charts/vscode-pyspark/values.schema.json
@@ -787,8 +787,14 @@
   },
   "startupProbe": {
       "type": "object",
-      "description": "Start up probe",
-      "default": {},
+      "description": "Startup probe",
+      "default": {
+        "failureThreshold": 60,
+        "initialDelaySeconds": 10,
+        "periodSeconds": 10,
+        "successThreshold": 1,
+        "timeoutSeconds": 2
+      },
       "x-onyxia": {
           "hidden": true,
           "overwriteDefaultWith": "region.startupProbe",

diff --git a/charts/vscode-pyspark/values.yaml b/charts/vscode-pyspark/values.yaml
@@ -239,7 +239,7 @@ startupProbe:
   initialDelaySeconds: 10
   periodSeconds: 10
   successThreshold: 1
-  timeoutSeconds: 5
+  timeoutSeconds: 2
 
 userPreferences:
   darkMode: false

diff --git a/charts/vscode-python/Chart.yaml b/charts/vscode-python/Chart.yaml
@@ -22,7 +22,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.5
+version: 2.0.6
 
 dependencies:
   - name: library-chart

diff --git a/charts/vscode-python/templates/statefulset.yaml b/charts/vscode-python/templates/statefulset.yaml
@@ -187,10 +187,19 @@ spec:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }} 
+            timeoutSeconds: 2
+            failureThreshold: 6
           readinessProbe:
             httpGet:
               path: /
               port: {{ .Values.networking.service.port }}
+          {{- if hasKey .Values "startupProbe" }}
+          startupProbe:
+            httpGet:
+              path: /
+              port: {{ .Values.networking.service.port }}
+            {{- toYaml .Values.startupProbe | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

diff --git a/charts/vscode-python/values.schema.json b/charts/vscode-python/values.schema.json
@@ -734,8 +734,14 @@
     },
     "startupProbe": {
       "type": "object",
-      "description": "Start up probe",
-      "default": {},
+      "description": "Startup probe",
+      "default": {
+        "failureThreshold": 60,
+        "initialDelaySeconds": 10,
+        "periodSeconds": 10,
+        "successThreshold": 1,
+        "timeoutSeconds": 2
+      },
       "x-onyxia": {
           "hidden": true,
           "overwriteDefaultWith": "region.startupProbe",

diff --git a/charts/vscode-python/values.yaml b/charts/vscode-python/values.yaml
@@ -200,6 +200,13 @@ tolerations: []
 
 affinity: {}
 
+startupProbe:
+  failureThreshold: 60
+  initialDelaySeconds: 10
+  periodSeconds: 10
+  successThreshold: 1
+  timeoutSeconds: 2
+
 userPreferences:
   darkMode: false
   language: "en"