Merge pull request kosmos-io#672 from qiuming520/release-0.4.0

duanmengkk · web-flow · commit 8f4a7aebcc8f · 2024-08-11T13:16:50.000+08:00
Cherry-Pick: network-manager support clusterLinkOptions.enable
diff --git a/pkg/clusterlink/network-manager/network_manager.go b/pkg/clusterlink/network-manager/network_manager.go
@@ -28,6 +28,12 @@ func ExcludeInvalidItems(clusters []v1alpha1.Cluster, clusterNodes []v1alpha1.Cl
 			klog.Infof("the cluster %s's ClusterLinkOptions is empty, will exclude.", c.Name)
 			continue
 		}
+
+		if !c.Spec.ClusterLinkOptions.Enable {
+			klog.Infof("the cluster %s's ClusterLinkOptions is enable, will exclude.", c.Name)
+			continue
+		}
+
 		clustersMap[c.Name] = c
 		cs = append(cs, c)
 	}

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,12 @@ func ExcludeInvalidItems(clusters []v1alpha1.Cluster, clusterNodes []v1alpha1.Cl`
`28`	`28`	`klog.Infof("the cluster %s's ClusterLinkOptions is empty, will exclude.", c.Name)`
`29`	`29`	`continue`
`30`	`30`	`}`
	`31`	`+`
	`32`	`+ if !c.Spec.ClusterLinkOptions.Enable {`
	`33`	`+ klog.Infof("the cluster %s's ClusterLinkOptions is enable, will exclude.", c.Name)`
	`34`	`+ continue`
	`35`	`+ }`
	`36`	`+`
`31`	`37`	`clustersMap[c.Name] = c`
`32`	`38`	`cs = append(cs, c)`
`33`	`39`	`}`