Skip to content

Commit

Permalink
fix(main): fix: skip pulling app image (#3649)
Browse files Browse the repository at this point in the history
Signed-off-by: cuisongliu <[email protected]>
  • Loading branch information
cuisongliu authored Aug 9, 2023
1 parent dc76a9c commit 81609b2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pkg/apply/processor/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ func MountClusterImages(bdah buildah.Interface, cluster *v2.Cluster, skipApp boo
hasRootfsType = true
}
}
if imageType != "" && imageType != string(v2.RootfsImage) && imageType != string(v2.PatchImage) && skipApp {
if (imageType == "" || imageType == string(v2.AppImage)) && skipApp {
// then it's an application type image
continue
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/apply/processor/scale.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,11 @@ func (c *ScaleProcessor) preProcess(cluster *v2.Cluster) error {
if err != nil {
return err
}
// cluster status might be overwrite by inappropriate usage, add mounts if loss.
if err = MountClusterImages(c.Buildah, cluster, true); err != nil {
return err
}
if c.IsScaleUp {
// cluster status might be overwrite by inappropriate usage, add mounts if loss.
if err = MountClusterImages(c.Buildah, cluster, true); err != nil {
return err
}
if cluster.GetRootfsImage().KubeVersion() == "" {
return fmt.Errorf("rootfs image not found kube version")
}
Expand Down

0 comments on commit 81609b2

Please sign in to comment.