From 93961f75fb5b16e72a51fae3fc191173f0034205 Mon Sep 17 00:00:00 2001 From: fengxsong Date: Mon, 23 Oct 2023 12:03:10 +0800 Subject: [PATCH] fix: --env not work during sealos run (#4140) Signed-off-by: fengxsong --- pkg/guest/guest.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/guest/guest.go b/pkg/guest/guest.go index a7324c3fda9..03c22311fa5 100644 --- a/pkg/guest/guest.go +++ b/pkg/guest/guest.go @@ -43,7 +43,7 @@ func NewGuestManager() (Interface, error) { } func (d *Default) Apply(cluster *v2.Cluster, mounts []v2.MountImage, targetHosts []string) error { - envWrapper := env.NewEnvProcessor(cluster) + envGetter := env.NewEnvProcessor(cluster) sshClient := ssh.NewCacheClientFromCluster(cluster, true) execer, err := exec.New(sshClient) if err != nil { @@ -56,7 +56,7 @@ func (d *Default) Apply(cluster *v2.Cluster, mounts []v2.MountImage, targetHosts eg, ctx := errgroup.WithContext(context.Background()) for j := range targetHosts { node := targetHosts[j] - envs := envWrapper.Getenv(node) + envs := maps.Merge(m.Env, envGetter.Getenv(node)) cmds := formalizeImageCommands(cluster, i, m, envs) eg.Go(func() error { return execer.CmdAsyncWithContext(ctx, node, @@ -69,7 +69,7 @@ func (d *Default) Apply(cluster *v2.Cluster, mounts []v2.MountImage, targetHosts } case m.IsApplication(): // on run on the first master - envs := envWrapper.Getenv(cluster.GetMaster0IP()) + envs := maps.Merge(m.Env, envGetter.Getenv(cluster.GetMaster0IP())) cmds := formalizeImageCommands(cluster, i, m, envs) if err := execer.CmdAsync(cluster.GetMaster0IPAndPort(), stringsutil.RenderShellWithEnv(strings.Join(cmds, "; "), envs),