From 301f7f0c75ad95862b59faa742be9cbaa30e8012 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@oceanbox.io>
Date: Sat, 21 Jun 2025 08:10:17 +0200
Subject: [PATCH] fix: deploy dapr as normal helm chart to invoke post hooks

---
 helmfile.d/dapr.yaml.gotmpl                   |  9 ---------
 justfile                                      |  4 ++--
 values/argo/manifests/sys-project.yaml        |  1 +
 values/dapr/manifests/dapr.yaml               | 19 ++++++++-----------
 .../values/{dapr.yaml.gotmpl => dapr.yaml}    |  0
 5 files changed, 11 insertions(+), 22 deletions(-)
 rename values/dapr/values/{dapr.yaml.gotmpl => dapr.yaml} (100%)

diff --git a/helmfile.d/dapr.yaml.gotmpl b/helmfile.d/dapr.yaml.gotmpl
index 78abd205..f51caa11 100644
--- a/helmfile.d/dapr.yaml.gotmpl
+++ b/helmfile.d/dapr.yaml.gotmpl
@@ -9,15 +9,6 @@ commonLabels:
   tier: system
 
 releases:
-- name: dapr
-  namespace: dapr-system
-  chart: dapr/dapr
-  version: 1.14.4
-  condition: dapr.enabled
-  values:
-  - ../values/dapr/values/dapr.yaml.gotmpl
-  - ../values/dapr/values/dapr-{{ .Environment.Name }}.yaml.gotmpl
-  missingFileHandler: Info
 - name: dapr-manifests
   namespace: dapr-system
   chart: _dapr-manifests
diff --git a/justfile b/justfile
index be57382b..db21bbae 100644
--- a/justfile
+++ b/justfile
@@ -4,5 +4,5 @@ default:
 
 # Render a specifc helm chart
 r HELMFILE ENV="default":
-  #helmfile --environment={{ENV}} lint --args --quiet -f helmfile.d/{{HELMFILE}}.yaml.gotmpl
-  helmfile --environment={{ENV}} template -q -f helmfile.d/{{HELMFILE}}.yaml.gotmpl --output-dir-template="../_manifests/{{HELMFILE}}/{{ENV}}"
+  helmfile --environment={{ENV}} lint --args --quiet -f helmfile.d/{{HELMFILE}}.yaml.gotmpl
+  helmfile --environment={{ENV}} template -q -f helmfile.d/{{HELMFILE}}.yaml.gotmpl --include-crds --output-dir-template="../_manifests/{{HELMFILE}}/{{ENV}}"
diff --git a/values/argo/manifests/sys-project.yaml b/values/argo/manifests/sys-project.yaml
index 8bd9422a..5ecbb91c 100644
--- a/values/argo/manifests/sys-project.yaml
+++ b/values/argo/manifests/sys-project.yaml
@@ -87,4 +87,5 @@ spec:
   - https://helm.mariadb.com/mariadb-operator
   - https://helm.cilium.io
   - https://chartmuseum.github.io/charts
+  - https://dapr.github.io/helm-charts
 
diff --git a/values/dapr/manifests/dapr.yaml b/values/dapr/manifests/dapr.yaml
index 62248775..3d768c73 100644
--- a/values/dapr/manifests/dapr.yaml
+++ b/values/dapr/manifests/dapr.yaml
@@ -13,18 +13,15 @@ spec:
     namespace: dapr-system
     server: 'https://kubernetes.default.svc'
   sources:
+  - repoURL:  https://dapr.github.io/helm-charts/
+    targetRevision: 1.14.4
+    chart: dapr
+    helm:
+      valuesFiles:
+        - $values/values/dapr/values/dapr.yaml
   - repoURL: {{ .Values.clusterConfig.manifests }}
-    targetRevision: HEAD
-    path: helmfile.d
-    plugin:
-      name: helmfile-cmp
-      env:
-        - name: CLUSTER_NAME
-          value: {{ .Values.clusterConfig.cluster }}
-        - name: HELMFILE_ENVIRONMENT
-          value: default
-        - name: HELMFILE_FILE_PATH
-          value: dapr.yaml.gotmpl
+    targetRevision: main
+    ref: values
   project: sys
   syncPolicy:
     managedNamespaceMetadata:
diff --git a/values/dapr/values/dapr.yaml.gotmpl b/values/dapr/values/dapr.yaml
similarity index 100%
rename from values/dapr/values/dapr.yaml.gotmpl
rename to values/dapr/values/dapr.yaml