[MLRun] Use new gRPC probing for k8s >= 1.24 (#1024)

v3io · Apr 17, 2024 · 699bdf7 · 699bdf7
1 parent 4f7599c
commit 699bdf7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -332,6 +332,6 @@ repo-add:
 	helm repo add nuclio https://nuclio.github.io/nuclio/charts
 	helm repo add v3io-stable https://v3io.github.io/helm-charts/stable
 	helm repo add minio https://charts.min.io/
-	helm repo add spark-operator https://googlecloudplatform.github.io/spark-on-k8s-operator
+	helm repo add spark-operator https://kubeflow.github.io/spark-operator
 	helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
 	helm repo add bitnami https://charts.bitnami.com/bitnami
diff --git a/stable/mlrun/Chart.yaml b/stable/mlrun/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mlrun
-version: 0.9.20
+version: 0.9.21
 appVersion: 1.5.2
 description: Machine Learning automation and tracking
 sources:

diff --git a/stable/mlrun/templates/api-chief-deployment.yaml b/stable/mlrun/templates/api-chief-deployment.yaml
@@ -207,14 +207,24 @@ spec:
           {{- end }}
           {{- if .Values.api.sidecars.logCollector.livenessProbe }}
           livenessProbe:
+          {{- if semverCompare ">=1.24-0" .Capabilities.KubeVersion.GitVersion }}
+            grpc:
+              port: {{ .Values.api.sidecars.logCollector.listenPort }}
+          {{- else }}
             exec:
               command: [ "/grpc_health_probe", "-addr=:{{ .Values.api.sidecars.logCollector.listenPort }}" ]
+          {{- end }}
             {{ toYaml .Values.api.sidecars.logCollector.livenessProbe | nindent 12 }}
           {{- end }}
           {{- if .Values.api.sidecars.logCollector.readinessProbe }}
           readinessProbe:
+          {{- if semverCompare ">=1.24-0" .Capabilities.KubeVersion.GitVersion }}
+            grpc:
+              port: {{ .Values.api.sidecars.logCollector.listenPort }}
+          {{- else }}
             exec:
               command: [ "/grpc_health_probe", "-addr=:{{ .Values.api.sidecars.logCollector.listenPort }}" ]
+          {{- end }}
             {{ toYaml .Values.api.sidecars.logCollector.readinessProbe | nindent 12 }}
           {{- end }}
           resources: