From 2887d7ab0268bf014c65d8ecd2b312c98601591a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= <loikeseke@gmail.com>
Date: Fri, 29 Nov 2024 14:40:48 +0100
Subject: [PATCH] fix(core): makes Subflow labels dynamic (again)

Fixes #6203
---
 .../src/main/java/io/kestra/core/runners/ExecutableUtils.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/io/kestra/core/runners/ExecutableUtils.java b/core/src/main/java/io/kestra/core/runners/ExecutableUtils.java
index 45ee06f55b2..336c0c785c3 100644
--- a/core/src/main/java/io/kestra/core/runners/ExecutableUtils.java
+++ b/core/src/main/java/io/kestra/core/runners/ExecutableUtils.java
@@ -19,6 +19,8 @@
 import java.time.ZonedDateTime;
 import java.util.*;
 
+import static io.kestra.core.utils.Rethrow.throwConsumer;
+
 @Slf4j
 public final class ExecutableUtils {
 
@@ -88,7 +90,7 @@ public static <T extends Task & ExecutableTask<?>> SubflowExecution<?> subflowEx
 
         List<Label> newLabels = inheritLabels ? new ArrayList<>(currentExecution.getLabels()) : new ArrayList<>(systemLabels(currentExecution));
         if (labels != null) {
-            newLabels.addAll(labels);
+            labels.forEach(throwConsumer(label -> newLabels.add(new Label(runContext.render(label.key()), runContext.render(label.value())))));
         }
 
         Map<String, Object> variables = ImmutableMap.of(