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

fixed: check the cluster has initialized

Browse Source 
Previously, always check whether the cluster has been initialized, but the updateClusterCondition function always removes the old condition and then adds the new condition, resulting in always returning after updating the initialized condition.

This commit check the cluster has initialized, if initialized will not updated condition

Signed-off-by: linruichao <linruichao@ruijie.com.cn>
This commit is contained in:
linruichao
2020-12-14 15:02:30 +08:00
parent a314b31bf0
commit 98ae80207f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -538,7 +538,10 @@ func (c *clusterController) syncCluster(key string) error {
LastUpdateTime: metav1.Now(),
LastTransitionTime: metav1.Now(),
}
c.updateClusterCondition(cluster, initializedCondition)
if !isConditionTrue(cluster, clusterv1alpha1.ClusterInitialized) {
c.updateClusterCondition(cluster, initializedCondition)
}
if !reflect.DeepEqual(oldCluster, cluster) {
cluster, err = c.clusterClient.Update(cluster)
@@ -546,7 +549,6 @@ func (c *clusterController) syncCluster(key string) error {
klog.Errorf("Error updating cluster %s, error %s", cluster.Name, err)
return err
}
return nil
}
}