From 25e12759065b63b5f892b49e88366cf2096b4e53 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@oceanbox.io>
Date: Fri, 11 Jul 2025 10:01:16 +0200
Subject: [PATCH] fix: allow different dapr versions on different clusters

---
 values/dapr/env.yaml.gotmpl     | 1 +
 values/dapr/manifests/dapr.yaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/values/dapr/env.yaml.gotmpl b/values/dapr/env.yaml.gotmpl
index 7f3c1db1..6499eff5 100644
--- a/values/dapr/env.yaml.gotmpl
+++ b/values/dapr/env.yaml.gotmpl
@@ -2,3 +2,4 @@ dapr:
   enabled: true
   autsync: false
   ingress: false
+  cluster: {{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}
diff --git a/values/dapr/manifests/dapr.yaml b/values/dapr/manifests/dapr.yaml
index 6b76cc81..32e6346f 100644
--- a/values/dapr/manifests/dapr.yaml
+++ b/values/dapr/manifests/dapr.yaml
@@ -27,7 +27,7 @@ spec:
       - name: HELMFILE_FILE_PATH
         value: dapr.yaml.gotmpl
   - repoURL: https://dapr.github.io/helm-charts
-    targetRevision: 1.14.5
+    targetRevision: {{- if eq .Values.dapr.cluster "ekman" }} 1.14.5 {{- else }} 1.15.6 {{- end }}
     chart: dapr
     helm:
       valueFiles: