Make probes configurable

kamu-data · Aug 31, 2024 · 91f8a7d · 91f8a7d
1 parent f806e0c
commit 91f8a7d
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 24 deletions.
diff --git a/charts/kamu-api-server/Chart.yaml b/charts/kamu-api-server/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kamu-api-server
 description: API server component of the Kamu Compute Node
 type: application
-version: 0.34.0
+version: 0.34.1
 appVersion: "0.34.0"
 home: https://kamu.dev
 icon: https://www.kamu.dev/images/kamu_logo_icon_bg_square.png

diff --git a/charts/kamu-api-server/templates/deployment.yaml b/charts/kamu-api-server/templates/deployment.yaml
@@ -130,14 +130,15 @@ spec:
             - name: flightsql
               containerPort: 50050
               protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /system/health
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /system/health?type=readiness
-              port: http
+          {{- if .Values.startupProbe }}
+          readinessProbe: {{- .Values.startupProbe | toYaml | nindent 12 }}
+          {{- end }}
+          {{- if .Values.readinessProbe }}
+          readinessProbe: {{- .Values.readinessProbe | toYaml | nindent 12 }}
+          {{- end }}
+          {{- if .Values.livenessProbe }}
+          livenessProbe: {{- .Values.livenessProbe | toYaml | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       volumes:

diff --git a/charts/kamu-api-server/values.yaml b/charts/kamu-api-server/values.yaml
@@ -50,7 +50,6 @@ imageMigrations:
   databasePort: 5432
   databaseName: ""
 
-
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
@@ -68,6 +67,16 @@ serviceAccount:
 extraEnv: []
 extraEnvFrom: []
 
+startupProbe: {}
+readinessProbe:
+  httpGet:
+    path: /system/health?type=readiness
+    port: http
+livenessProbe:
+  httpGet:
+    path: /system/health
+    port: http
+
 podAnnotations: {}
 
 podSecurityContext: {}

diff --git a/charts/kamu-oracle-provider/Chart.yaml b/charts/kamu-oracle-provider/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kamu-oracle-provider
 description: Oracle provider that uses Kamu Node to supply data to blockchain smart contracts
 type: application
-version: 0.29.6
+version: 0.29.7
 appVersion: "0.29.1"
 home: https://kamu.dev
 icon: https://www.kamu.dev/images/kamu_logo_icon_bg_square.png

diff --git a/charts/kamu-oracle-provider/templates/deployment.yaml b/charts/kamu-oracle-provider/templates/deployment.yaml
@@ -57,10 +57,15 @@ spec:
             - name: http
               containerPort: 8080
               protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /system/health
-              port: http
+          {{- if .Values.startupProbe }}
+          readinessProbe: {{- .Values.startupProbe | toYaml | nindent 12 }}
+          {{- end }}
+          {{- if .Values.readinessProbe }}
+          readinessProbe: {{- .Values.readinessProbe | toYaml | nindent 12 }}
+          {{- end }}
+          {{- if .Values.livenessProbe }}
+          livenessProbe: {{- .Values.livenessProbe | toYaml | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       volumes:

diff --git a/charts/kamu-oracle-provider/values.yaml b/charts/kamu-oracle-provider/values.yaml
@@ -47,6 +47,13 @@ serviceAccount:
 extraEnv: []
 extraEnvFrom: []
 
+startupProbe: {}
+readinessProbe: {}
+livenessProbe:
+  httpGet:
+    path: /system/health
+    port: http
+
 podAnnotations: {}
 
 podSecurityContext: {}

diff --git a/charts/kamu-web-ui/Chart.yaml b/charts/kamu-web-ui/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kamu-web-ui
 description: Web frontend component of the Kamu Compute Node
 type: application
-version: 0.26.0
+version: 0.26.1
 appVersion: "0.26.0"
 home: https://kamu.dev
 icon: https://www.kamu.dev/images/kamu_logo_icon_bg_square.png

diff --git a/charts/kamu-web-ui/templates/deployment.yaml b/charts/kamu-web-ui/templates/deployment.yaml
@@ -51,14 +51,15 @@ spec:
             - name: configs
               subPath: runtime-config.json
               mountPath: /usr/share/nginx/html/assets/runtime-config.json
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /
-              port: http
+          {{- if .Values.startupProbe }}
+          readinessProbe: {{- .Values.startupProbe | toYaml | nindent 12 }}
+          {{- end }}
+          {{- if .Values.readinessProbe }}
+          readinessProbe: {{- .Values.readinessProbe | toYaml | nindent 12 }}
+          {{- end }}
+          {{- if .Values.livenessProbe }}
+          livenessProbe: {{- .Values.livenessProbe | toYaml | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       volumes:

diff --git a/charts/kamu-web-ui/values.yaml b/charts/kamu-web-ui/values.yaml
@@ -52,6 +52,16 @@ serviceAccount:
 extraEnv: []
 extraEnvFrom: []
 
+startupProbe: {}
+readinessProbe:
+  httpGet:
+    path: /
+    port: http
+livenessProbe:
+  httpGet:
+    path: /
+    port: http
+
 podAnnotations: {}
 
 podSecurityContext: {}