configs not getting updated after install

Signed-off-by: Maxwell <144507225+maxwell-can-not-fly@users.noreply.github.com>
sealerio · Dec 26, 2023 · 1e465ea · 1e465ea
1 parent f07e804
commit 1e465ea
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/cmd/sealer/cmd/cluster/apply.go b/cmd/sealer/cmd/cluster/apply.go
@@ -134,6 +134,7 @@ func NewApplyCmd() *cobra.Command {
 				RunMode:                 applyMode,
 				SkipPrepareAppMaterials: skipPrepareAppMaterials,
 				IgnoreCache:             applyFlags.IgnoreCache,
+				Configs:                 cf.GetConfigs(),
 			})
 		},
 	}

diff --git a/cmd/sealer/cmd/cluster/installer.go b/cmd/sealer/cmd/cluster/installer.go
@@ -52,6 +52,7 @@ type AppInstallOptions struct {
 	RunMode                 string
 	SkipPrepareAppMaterials bool
 	IgnoreCache             bool
+	Configs                 []v1.Config
 }
 
 func (i AppInstaller) Install(imageName string, options AppInstallOptions) error {
@@ -60,7 +61,7 @@ func (i AppInstaller) Install(imageName string, options AppInstallOptions) error
 	i.infraDriver.AddClusterEnv(options.Envs)
 
 	if !options.SkipPrepareAppMaterials {
-		if err := i.prepareMaterials(imageName, options.RunMode, options.IgnoreCache); err != nil {
+		if err := i.prepareMaterials(imageName, options.RunMode, options.IgnoreCache, options.Configs); err != nil {
 			return err
 		}
 	}
@@ -87,7 +88,7 @@ func (i AppInstaller) Install(imageName string, options AppInstallOptions) error
 	return nil
 }
 
-func (i AppInstaller) prepareMaterials(appImageName string, mode string, ignoreCache bool) error {
+func (i AppInstaller) prepareMaterials(appImageName string, mode string, ignoreCache bool, configs []v1.Config) error {
 	clusterHosts := i.infraDriver.GetHostIPList()
 	clusterHostsPlatform, err := i.infraDriver.GetHostsPlatform(clusterHosts)
 	if err != nil {
@@ -118,7 +119,7 @@ func (i AppInstaller) prepareMaterials(appImageName string, mode string, ignoreC
 		}
 	}
 
-	distributor, err := imagedistributor.NewScpDistributor(imageMountInfo, i.infraDriver, nil, imagedistributor.DistributeOption{
+	distributor, err := imagedistributor.NewScpDistributor(imageMountInfo, i.infraDriver, configs, imagedistributor.DistributeOption{
 		IgnoreCache: ignoreCache,
 	})
 	if err != nil {

diff --git a/cmd/sealer/cmd/cluster/run.go b/cmd/sealer/cmd/cluster/run.go
@@ -171,6 +171,7 @@ func runWithClusterfile(clusterFile string, runFlags *types.RunFlags) error {
 			Envs:        runFlags.CustomEnv,
 			RunMode:     runFlags.Mode,
 			IgnoreCache: runFlags.IgnoreCache,
+			Configs:     cf.GetConfigs(),
 		})
 	}
 
@@ -218,6 +219,7 @@ func runWithArgs(imageName string, runFlags *types.RunFlags) error {
 			Envs:        runFlags.CustomEnv,
 			RunMode:     runFlags.Mode,
 			IgnoreCache: runFlags.IgnoreCache,
+			Configs:     nil,
 		})
 	}