From 96d8dd0fc154cf2b5fd000d9360a7423a05d09f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Larivi=C3=A8re?=
 <sebastien.lariviere@goto.com>
Date: Wed, 29 Jul 2026 13:40:38 -0400
Subject: [PATCH 1/2] fix(helm): add startupProbe for hubble-ui backend to
 tolerate slow hubble-relay startup

---
 .../helm/retina/templates/hubble-ui/deployment.yaml       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/deploy/hubble/manifests/controller/helm/retina/templates/hubble-ui/deployment.yaml b/deploy/hubble/manifests/controller/helm/retina/templates/hubble-ui/deployment.yaml
index a3b22206c8..8f30efa58c 100644
--- a/deploy/hubble/manifests/controller/helm/retina/templates/hubble-ui/deployment.yaml
+++ b/deploy/hubble/manifests/controller/helm/retina/templates/hubble-ui/deployment.yaml
@@ -118,6 +118,14 @@ spec:
         {{- with .Values.hubble.ui.backend.extraEnv }}
         {{- toYaml . | trim | nindent 8 }}
         {{- end }}
+        {{- if or .Values.hubble.ui.backend.livenessProbe.enabled .Values.hubble.ui.backend.readinessProbe.enabled }}
+        startupProbe:
+          httpGet:
+            path: /healthz
+            port: 8090
+          failureThreshold: 30
+          periodSeconds: 3
+        {{- end }}
         {{- if .Values.hubble.ui.backend.livenessProbe.enabled }}
         livenessProbe:
           httpGet:

From de1655c86f50198ec3be0242df89cd90711b77c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Larivi=C3=A8re?=
 <sebastien.lariviere@goto.com>
Date: Tue, 1 Sep 2026 11:58:58 -0400
Subject: [PATCH 2/2] fix(helm): remove broken hubble-ui backend health probes

---
 .../templates/hubble-ui/deployment.yaml       | 20 -------------------
 .../controller/helm/retina/values.yaml        |  8 --------
 2 files changed, 28 deletions(-)

diff --git a/deploy/hubble/manifests/controller/helm/retina/templates/hubble-ui/deployment.yaml b/deploy/hubble/manifests/controller/helm/retina/templates/hubble-ui/deployment.yaml
index 8f30efa58c..c3de35e288 100644
--- a/deploy/hubble/manifests/controller/helm/retina/templates/hubble-ui/deployment.yaml
+++ b/deploy/hubble/manifests/controller/helm/retina/templates/hubble-ui/deployment.yaml
@@ -118,26 +118,6 @@ spec:
         {{- with .Values.hubble.ui.backend.extraEnv }}
         {{- toYaml . | trim | nindent 8 }}
         {{- end }}
-        {{- if or .Values.hubble.ui.backend.livenessProbe.enabled .Values.hubble.ui.backend.readinessProbe.enabled }}
-        startupProbe:
-          httpGet:
-            path: /healthz
-            port: 8090
-          failureThreshold: 30
-          periodSeconds: 3
-        {{- end }}
-        {{- if .Values.hubble.ui.backend.livenessProbe.enabled }}
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 8090
-        {{- end }}
-        {{- if .Values.hubble.ui.backend.readinessProbe.enabled }}
-        readinessProbe:
-          httpGet:
-            path: /healthz
-            port: 8090
-        {{- end }}
         ports:
         - name: grpc
           containerPort: 8090
diff --git a/deploy/hubble/manifests/controller/helm/retina/values.yaml b/deploy/hubble/manifests/controller/helm/retina/values.yaml
index f8bccc1c71..25e368d0fc 100644
--- a/deploy/hubble/manifests/controller/helm/retina/values.yaml
+++ b/deploy/hubble/manifests/controller/helm/retina/values.yaml
@@ -706,14 +706,6 @@ hubble:
       # -- Additional hubble-ui backend volumeMounts.
       extraVolumeMounts: []
 
-      livenessProbe:
-        # -- Enable liveness probe for Hubble-ui backend (requires Hubble-ui 0.12+)
-        enabled: false
-
-      readinessProbe:
-        # -- Enable readiness probe for Hubble-ui backend (requires Hubble-ui 0.12+)
-        enabled: false
-
       # -- Resource requests and limits for the 'backend' container of the 'hubble-ui' deployment.
       resources: {}
       #   limits: