Update readinessprobe for DPUs

Signed-off-by: nithyar <[email protected]>
ovn-org · Sep 30, 2024 · 7d4bb98 · 7d4bb98
1 parent a65242d
commit 7d4bb98
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/dist/templates/ovnkube-node.yaml.j2 b/dist/templates/ovnkube-node.yaml.j2
@@ -261,11 +261,21 @@ spec:
               fieldPath: metadata.name
 
         readinessProbe:
+        {%- if ovnkube_app_name!="ovnkube-node-dpu" %}
           exec:
             command: ["/usr/bin/ovn-kube-util", "readiness-probe", "-t", "ovnkube-node"]
           initialDelaySeconds: 30
           timeoutSeconds: 30
           periodSeconds: 60
+        {%- else %}
+          httpGet:
+            path: /metrics
+            port: 9476
+            scheme: HTTP
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
+          periodSeconds: 30
+        {%- endif %}
       {% endif %}
       {% if ovnkube_app_name!="ovnkube-node-dpu-host" -%}
       - name: ovn-controller

diff --git a/helm/ovn-kubernetes/charts/ovnkube-node-dpu/templates/ovnkube-node-dpu.yaml b/helm/ovn-kubernetes/charts/ovnkube-node-dpu/templates/ovnkube-node-dpu.yaml
@@ -240,11 +240,13 @@ spec:
               apiVersion: v1
               fieldPath: metadata.name
         readinessProbe:
-          exec:
-            command: ["/usr/bin/ovn-kube-util", "readiness-probe", "-t", "ovnkube-node"]
+          httpGet:
+            path: /metrics
+            port: {{ .Values.metricsPort }}
+            scheme: HTTP
           initialDelaySeconds: 30
-          timeoutSeconds: 30
-          periodSeconds: 60
+          timeoutSeconds: 5
+          periodSeconds: 30
       {{- end }}
       - name: ovn-controller
         image: {{ include "getDPUImage" . }}

diff --git a/helm/ovn-kubernetes/charts/ovnkube-node-dpu/values.yaml b/helm/ovn-kubernetes/charts/ovnkube-node-dpu/values.yaml
@@ -3,3 +3,5 @@ logFileMaxSize: 100
 logFileMaxBackups: 5
 logFileMaxAge: 5
 ovnControllerLogLevel: "-vconsole:info"
+# -- TCP port serving metrics
+metricsPort: 9476