fix: merge cluster.spec.env (labring#4100)

sealos-ci-robot · Oct 17, 2023 · 3d1cd30 · 3d1cd30
1 parent e62bf53
commit 3d1cd30
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/apply/processor/create.go b/pkg/apply/processor/create.go
@@ -97,9 +97,11 @@ func (c *CreateProcessor) preProcess(cluster *v2.Cluster) error {
  if err := MountClusterImages(c.Buildah, cluster, false); err != nil {
  return err
  }
+ // env in cluster.spec will be merged into every mounts object
+ env := maps.FromSlice(cluster.Spec.Env)
  // extra env must been set at the very first
  for i := range cluster.Status.Mounts {
- cluster.Status.Mounts[i].Env = maps.Merge(cluster.Status.Mounts[i].Env, c.ExtraEnvs)
+ cluster.Status.Mounts[i].Env = maps.Merge(cluster.Status.Mounts[i].Env, env, c.ExtraEnvs)
  }
 
  rt, err := factory.New(cluster, c.ClusterFile.GetRuntimeConfig())