Merge pull request kosmos-io#308 from ONE7live/main

fix: Single cluster network check problem
OrangeBao · Nov 29, 2023 · ac00d7e · ac00d7e
2 parents 56f1258 + bb29eb9
commit ac00d7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pkg/kosmosctl/floater/check.go b/pkg/kosmosctl/floater/check.go
@@ -107,11 +107,13 @@ func (o *CommandCheckOptions) Complete() error {
 	}
 	o.SrcFloater = srcFloater
 
-	dstFloater := NewCheckFloater(o, true)
-	if err := dstFloater.completeFromKubeConfigPath(o.DstKubeConfig); err != nil {
-		return err
+	if o.DstKubeConfig != "" {
+		dstFloater := NewCheckFloater(o, true)
+		if err := dstFloater.completeFromKubeConfigPath(o.DstKubeConfig); err != nil {
+			return err
+		}
+		o.DstFloater = dstFloater
 	}
-	o.DstFloater = dstFloater
 
 	return nil
 }

diff --git a/pkg/kosmosctl/floater/floater.go b/pkg/kosmosctl/floater/floater.go
@@ -218,7 +218,7 @@ func (f *Floater) applyDaemonSet() error {
 
 	floaterLabel := map[string]string{"app": f.Name}
 	if err = util.WaitPodReady(f.Client, f.Namespace, util.MapToString(floaterLabel), f.PodWaitTime); err != nil {
-		return err
+		klog.Warningf("exist cluster node startup floater timeout, error: %v", err)
 	}
 
 	return nil