[sophora-server]: add flags to enable or disable probes (#104) (#105)

* [sophora-server]: add flags to enable probes (#104) * [sophora-server]: bump version (#104) --------- Co-authored-by: Philip Dakowitz <[email protected]>
subshell · Jul 9, 2024 · fda2d53 · fda2d53
1 parent f4c7ec5
commit fda2d53
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/charts/sophora-server/Chart.yaml b/charts/sophora-server/Chart.yaml
@@ -15,7 +15,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.3.0
+version: 2.3.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/sophora-server/templates/statefulset.yaml b/charts/sophora-server/templates/statefulset.yaml
@@ -282,35 +282,35 @@ spec:
             - containerPort: 1199
               name: rmi-registry
           {{- end }}
-          {{- with .Values.livenessProbe }}
+          {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
               path: /status/liveness
               port: 1196
-            failureThreshold: {{ .failureThreshold }}
-            initialDelaySeconds: {{ .initialDelaySeconds }}
-            periodSeconds: {{ .periodSeconds }}
-            timeoutSeconds: {{ .timeoutSeconds }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
           {{- end }}
-          {{- with .Values.readinessProbe }}
+          {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
               path: /status/ready
               port: 1196
-            failureThreshold: {{ .failureThreshold }}
-            initialDelaySeconds: {{ .initialDelaySeconds }}
-            periodSeconds: {{ .periodSeconds }}
-            timeoutSeconds: {{ .timeoutSeconds }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
           {{- end }}
-          {{- with .Values.startupProbe }}
+          {{- if .Values.startupProbe.enabled }}
           startupProbe:
             httpGet:
               path: /status/started
               port: 1196
-            failureThreshold: {{ .failureThreshold }}
-            initialDelaySeconds: {{ .initialDelaySeconds }}
-            periodSeconds: {{ .periodSeconds }}
-            timeoutSeconds: {{ .timeoutSeconds }}
+            failureThreshold: {{ .Values.startupProbe.failureThreshold }}
+            initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.startupProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}
           {{- end }}
           {{ if and .Values.sophora.server.isClusterServer .Values.preStop.enabled -}}
           lifecycle:

diff --git a/charts/sophora-server/values.yaml b/charts/sophora-server/values.yaml
@@ -272,18 +272,21 @@ configInitializer:
   envFrom:
 
 startupProbe:
+  enabled: true
   failureThreshold: 35
   initialDelaySeconds: 10
   timeoutSeconds: 5
   periodSeconds: 5
 
 readinessProbe:
+  enabled: true
   failureThreshold: 15
   initialDelaySeconds: 30
   timeoutSeconds: 5
   periodSeconds: 15
 
 livenessProbe:
+  enabled: true
   failureThreshold: 3
   initialDelaySeconds: 60
   timeoutSeconds: 10