From 92c9faa533255c356cf1defecc308fb1b0adaeb9 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Wed, 15 Oct 2025 20:54:16 +0200
Subject: [PATCH 1/4] fix(template/tilt): Support secret-operator helm
 overrides, and DaemonSet image_json_path

---
 template/Tiltfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/template/Tiltfile b/template/Tiltfile
index fb84bcc0..1a79a48b 100644
--- a/template/Tiltfile
+++ b/template/Tiltfile
@@ -26,6 +26,7 @@ if os.path.exists('result'):
 # oci.stackable.tech/sandbox/opa-operator:7y19m3d8clwxlv34v5q2x4p7v536s00g instead of
 # oci.stackable.tech/sandbox/opa-operator:0.0.0-dev (which does not exist)
 k8s_kind('Deployment', image_json_path='{.spec.template.metadata.annotations.internal\\.stackable\\.tech/image}')
+k8s_kind('DaemonSet', image_json_path='{.spec.template.metadata.annotations.internal\\.stackable\\.tech/image}')
 
 # Exclude stale CRDs from Helm chart, and apply the rest
 helm_crds, helm_non_crds = filter_yaml(
@@ -35,6 +36,7 @@ helm_crds, helm_non_crds = filter_yaml(
       namespace="stackable-operators",
       set=[
          'image.repository=' + registry + '/' + operator_name,
+         'secretOperator.image.repository=' + registry + '/' + operator_name,
       ],
    ),
    api_version = "^apiextensions\\.k8s\\.io/.*$",

From 49b44c1f86e12ac1213a2621c07506c86fa0c8e4 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Wed, 15 Oct 2025 20:59:58 +0200
Subject: [PATCH 2/4] chore(template/tilt): Make the helm override for image
 repository more concise

---
 template/Tiltfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/template/Tiltfile b/template/Tiltfile
index 1a79a48b..79b38ddc 100644
--- a/template/Tiltfile
+++ b/template/Tiltfile
@@ -28,6 +28,11 @@ if os.path.exists('result'):
 k8s_kind('Deployment', image_json_path='{.spec.template.metadata.annotations.internal\\.stackable\\.tech/image}')
 k8s_kind('DaemonSet', image_json_path='{.spec.template.metadata.annotations.internal\\.stackable\\.tech/image}')
 
+helm_override_image_repository = 'image.repository=' + registry + '/' + operator_name
+if operator_name == "secret-operator":
+   # secret-operator image reference is under the secretOperator section
+   helm_override_image_repository = "secretOperator." + helm_override_image_repository
+
 # Exclude stale CRDs from Helm chart, and apply the rest
 helm_crds, helm_non_crds = filter_yaml(
    helm(
@@ -35,8 +40,7 @@ helm_crds, helm_non_crds = filter_yaml(
       name=operator_name,
       namespace="stackable-operators",
       set=[
-         'image.repository=' + registry + '/' + operator_name,
-         'secretOperator.image.repository=' + registry + '/' + operator_name,
+         helm_override_image_repository,
       ],
    ),
    api_version = "^apiextensions\\.k8s\\.io/.*$",

From cc89a955b900b1850c2e61bcf75d3005c77cc0b1 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Wed, 15 Oct 2025 22:11:53 +0200
Subject: [PATCH 3/4] chore(template/tilt): Allow a custom helm values file

Co-authored-by: Techassi <git@techassi.dev>
---
 template/Tiltfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/template/Tiltfile b/template/Tiltfile
index 79b38ddc..679573e9 100644
--- a/template/Tiltfile
+++ b/template/Tiltfile
@@ -28,6 +28,11 @@ if os.path.exists('result'):
 k8s_kind('Deployment', image_json_path='{.spec.template.metadata.annotations.internal\\.stackable\\.tech/image}')
 k8s_kind('DaemonSet', image_json_path='{.spec.template.metadata.annotations.internal\\.stackable\\.tech/image}')
 
+# Optionally specify a custom Helm values file to be passed to the Helm deployment below.
+# This file can for example be used to set custom telemetry options (like log level) which is not
+# supported by helm(set).
+helm_values = settings.get('helm_values', None)
+
 helm_override_image_repository = 'image.repository=' + registry + '/' + operator_name
 if operator_name == "secret-operator":
    # secret-operator image reference is under the secretOperator section
@@ -42,6 +47,7 @@ helm_crds, helm_non_crds = filter_yaml(
       set=[
          helm_override_image_repository,
       ],
+      values=helm_values,
    ),
    api_version = "^apiextensions\\.k8s\\.io/.*$",
    kind = "^CustomResourceDefinition$",

From 2146c5f4f13d127099de4fda272e538a79ac02d3 Mon Sep 17 00:00:00 2001
From: Nick <10092581+NickLarsenNZ@users.noreply.github.com>
Date: Wed, 22 Oct 2025 09:58:40 +0200
Subject: [PATCH 4/4] Update template/Tiltfile

---
 template/Tiltfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/template/Tiltfile b/template/Tiltfile
index 679573e9..ee0941c3 100644
--- a/template/Tiltfile
+++ b/template/Tiltfile
@@ -34,9 +34,6 @@ k8s_kind('DaemonSet', image_json_path='{.spec.template.metadata.annotations.inte
 helm_values = settings.get('helm_values', None)
 
 helm_override_image_repository = 'image.repository=' + registry + '/' + operator_name
-if operator_name == "secret-operator":
-   # secret-operator image reference is under the secretOperator section
-   helm_override_image_repository = "secretOperator." + helm_override_image_repository
 
 # Exclude stale CRDs from Helm chart, and apply the rest
 helm_crds, helm_non_crds = filter_yaml(