From c8694ad81d0f23f74e21d679a8e75fda465f08d3 Mon Sep 17 00:00:00 2001
From: Brad Stein <Brad.Stein@gmail.com>
Date: Mon, 30 Mar 2026 10:16:42 -0300
Subject: [PATCH] longhorn: avoid webhook deadlock and forced image pulls

---
 infrastructure/longhorn/core/helmrelease.yaml | 37 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/infrastructure/longhorn/core/helmrelease.yaml b/infrastructure/longhorn/core/helmrelease.yaml
index 575f4bdd..fefd0a78 100644
--- a/infrastructure/longhorn/core/helmrelease.yaml
+++ b/infrastructure/longhorn/core/helmrelease.yaml
@@ -6,6 +6,39 @@ metadata:
   namespace: longhorn-system
 spec:
   interval: 30m
+  postRenderers:
+    - kustomize:
+        patches:
+          - target:
+              kind: Service
+              name: longhorn-conversion-webhook
+              namespace: longhorn-system
+            patch: |
+              - op: add
+                path: /spec/publishNotReadyAddresses
+                value: true
+          - target:
+              kind: Service
+              name: longhorn-admission-webhook
+              namespace: longhorn-system
+            patch: |
+              - op: add
+                path: /spec/publishNotReadyAddresses
+                value: true
+          - target:
+              kind: DaemonSet
+              name: longhorn-manager
+              namespace: longhorn-system
+            patch: |
+              - op: replace
+                path: /spec/template/spec/containers/0/readinessProbe/httpGet/path
+                value: /v1/healthz
+              - op: replace
+                path: /spec/template/spec/containers/0/readinessProbe/httpGet/port
+                value: 9500
+              - op: replace
+                path: /spec/template/spec/containers/0/readinessProbe/httpGet/scheme
+                value: HTTP
   chart:
     spec:
       chart: longhorn
@@ -34,7 +67,7 @@ spec:
       createSecret: false
       registrySecret: longhorn-registry
     image:
-      pullPolicy: Always
+      pullPolicy: IfNotPresent
       longhorn:
         engine:
           repository: registry.bstein.dev/infra/longhorn-engine
@@ -77,4 +110,4 @@ spec:
           repository: registry.bstein.dev/infra/longhorn-livenessprobe
           tag: v2.16.0
     defaultSettings:
-      systemManagedPodsImagePullPolicy: Always
+      systemManagedPodsImagePullPolicy: IfNotPresent