Skip to content

The Unified and Autonomous Development Platform

fix(k8s-executor): apply step env vars to containers

Work Horse11bca428b09b
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
index 321d3463d6..a983ee4daa 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
@@ -786,7 +786,13 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
var volumeMounts = buildVolumeMounts(cacheMounts);
volumeMounts.addAll(commonVolumeMounts);
stepContainerSpec.put("volumeMounts", SerializationUtils.clone(volumeMounts));
- stepContainerSpec.put("env", SerializationUtils.clone(commonEnvs));
+ var envs = SerializationUtils.clone(commonEnvs);
+ for (var entry: commandFacade.getEnvMap().entrySet()) {
+ envs.add(newLinkedHashMap(
+ "name", entry.getKey(),
+ "value", entry.getValue()));
+ }
+ stepContainerSpec.put("env", envs);
var runAs = commandFacade.getRunAs();
setupSecurityContext(stepContainerSpec, runAs);
} else if (facade instanceof BuildImageFacade) {