Merge pull request #3199 from fafucoder/master

fixed: check the cluster has initialized
2020-12-14 16:05:45 +08:00
parent a314b31bf0 98ae80207f
commit 41fc9636c3
1 changed files with 4 additions and 2 deletions
--- a/pkg/controller/cluster/cluster_controller.go
+++ b/pkg/controller/cluster/cluster_controller.go
@@ -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
 		}
 	}