admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the kube-system UID to identify if the member cluster already exists

Browse Source
This commit is contained in:
Xinzhao Xu
2022-01-27 11:27:41 +08:00
parent 794129d056
commit d3ed81059f
4 changed files with 55 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/controller/cluster/cluster_controller.go
View File

@@ -576,7 +576,6 @@ func (c *clusterController) syncCluster(key string) error {
klog.Errorf("Failed to get kubernetes version, %#v", err)
return err
}
cluster.Status.KubernetesVersion = version.GitVersion
nodes, err := clusterDt.client.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
@@ -584,7 +583,6 @@ func (c *clusterController) syncCluster(key string) error {
klog.Errorf("Failed to get cluster nodes, %#v", err)
return err
}
cluster.Status.NodeCount = len(nodes.Items)
configz, err := c.tryToFetchKubeSphereComponents(clusterDt.config.Host, clusterDt.transport)
@@ -599,6 +597,13 @@ func (c *clusterController) syncCluster(key string) error {
cluster.Status.KubeSphereVersion = v
}
// Use kube-system namespace UID as cluster ID
kubeSystem, err := clusterDt.client.CoreV1().Namespaces().Get(context.TODO(), metav1.NamespaceSystem, metav1.GetOptions{})
if err != nil {
return err
}
cluster.Status.UID = kubeSystem.UID
// label cluster host cluster if configz["multicluster"]==true
if mc, ok := configz[configzMultiCluster]; ok && mc && c.checkIfClusterIsHostCluster(nodes) {
if cluster.Labels == nil {