From d334b54a3325e70c92035bb46c02c4b8010772ed Mon Sep 17 00:00:00 2001
From: fengxsong <fengxsong@outlook.com>
Date: Thu, 29 Feb 2024 07:58:43 +0800
Subject: [PATCH] fix: issue #4536 (#4540)

---
 .../applydrivers/apply_drivers_default.go      | 18 +++++-------------
 pkg/apply/processor/interface.go               |  1 +
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkg/apply/applydrivers/apply_drivers_default.go b/pkg/apply/applydrivers/apply_drivers_default.go
index 1c6d8e61f66..df70864515a 100644
--- a/pkg/apply/applydrivers/apply_drivers_default.go
+++ b/pkg/apply/applydrivers/apply_drivers_default.go
@@ -22,12 +22,10 @@ import (
 	"strconv"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/version"
 
 	"golang.org/x/sync/errgroup"
 
 	"github.com/labring/sealos/pkg/apply/processor"
-	"github.com/labring/sealos/pkg/client-go/kubernetes"
 	"github.com/labring/sealos/pkg/clusterfile"
 	"github.com/labring/sealos/pkg/constants"
 	"github.com/labring/sealos/pkg/exec"
@@ -76,12 +74,10 @@ func NewDefaultScaleApplier(ctx context.Context, current, cluster *v2.Cluster) (
 
 type Applier struct {
 	context.Context
-	ClusterDesired     *v2.Cluster
-	ClusterCurrent     *v2.Cluster
-	ClusterFile        clusterfile.Interface
-	Client             kubernetes.Client
-	CurrentClusterInfo *version.Info
-	RunNewImages       []string
+	ClusterDesired *v2.Cluster
+	ClusterCurrent *v2.Cluster
+	ClusterFile    clusterfile.Interface
+	RunNewImages   []string
 }
 
 func (c *Applier) Apply() error {
@@ -221,11 +217,7 @@ func (c *Applier) installApp(images []string) error {
 	if err != nil {
 		return err
 	}
-	err = installProcessor.Execute(c.ClusterDesired)
-	if err != nil {
-		return err
-	}
-	return nil
+	return installProcessor.Execute(c.ClusterDesired)
 }
 
 func (c *Applier) scaleCluster(mj, md, nj, nd []string) error {
diff --git a/pkg/apply/processor/interface.go b/pkg/apply/processor/interface.go
index 812a3858d21..5cb7ff62d90 100644
--- a/pkg/apply/processor/interface.go
+++ b/pkg/apply/processor/interface.go
@@ -229,6 +229,7 @@ func MountClusterImages(bdah buildah.Interface, cluster *v2.Cluster, skipApp boo
 			return err
 		}
 		if idx >= 0 {
+			mount.Env = maps.Merge(mount.Env, cluster.Status.Mounts[idx].Env)
 			cluster.Status.Mounts[idx] = *mount
 		} else {
 			cluster.Status.Mounts = append(cluster.Status.Mounts, *mount)