opensource/sealos
3
0
Fork 0
mirror of https://github.com/labring/sealos.git synced 2026-10-29 17:25:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(apply): conditionally append components based on distribution type (#5909)

Browse Source 
* feat(apply): conditionally append components based on distribution type

Signed-off-by: cuisongliu <cuisongliu@qq.com>

* fix(cluster): return nil for rootfs image if image spec is empty

Signed-off-by: cuisongliu <cuisongliu@qq.com>

---------

Signed-off-by: cuisongliu <cuisongliu@qq.com>
This commit is contained in:
cuisongliu
2025-09-01 13:05:33 +08:00
committed by GitHub
parent caeddca959
commit a422aa696c
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lifecycle/pkg/apply/applydrivers/apply_drivers_default.go
+6 -1
View File
@@ -21,6 +21,8 @@ import (
"os"
"strconv"
"github.com/labring/sealos/pkg/runtime/k3s"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"golang.org/x/sync/errgroup"
@@ -123,9 +125,12 @@ func (c *Applier) Apply() error {
func (c *Applier) getWriteBackObjects() []interface{} {
obj := []interface{}{c.ClusterDesired}
distribution := c.ClusterFile.GetCluster().GetDistribution()
if runtimeConfig := c.ClusterFile.GetRuntimeConfig(); runtimeConfig != nil {
if components := runtimeConfig.GetComponents(); len(components) > 0 {
obj = append(obj, components...)
if distribution == k3s.Distribution {
obj = append(obj, components...)
}
}
}
if configs := c.ClusterFile.GetConfigs(); len(configs) > 0 {
lifecycle/pkg/types/v1beta1/utils.go
+3
View File
@@ -109,6 +109,9 @@ func (c *Cluster) GetAllIPS() []string {
}
func (c *Cluster) GetRootfsImage() *MountImage {
if c == nil || len(c.Status.Mounts) == 0 {
return nil
}
for _, img := range c.Status.Mounts {
if img.IsRootFs() {
return &img