Merge pull request #32133 from cmurphy/fix-condition-set-master

Do not set unknown condition for creating cluster

pkg/controllers/management/clusteroperator/utils.go

@@ -147,7 +147,7 @@ func (e *OperatorController) SetUnknown(cluster *mgmtv3.Cluster, condition condi
 	var err error
 	cluster, err = e.ClusterClient.Update(cluster)
 	if err != nil {
-		return cluster, fmt.Errorf("failed setting cluster [%s] condition %s unknown with message: %s", cluster.Name, condition, message)
+		return cluster, err
 	}
 	return cluster, nil
 }
@@ -162,7 +162,7 @@ func (e *OperatorController) SetTrue(cluster *mgmtv3.Cluster, condition conditio
 	var err error
 	cluster, err = e.ClusterClient.Update(cluster)
 	if err != nil {
-		return cluster, fmt.Errorf("failed setting cluster [%s] condition %s true with message: %s", cluster.Name, condition, message)
+		return cluster, err
 	}
 	return cluster, nil
 }
@@ -177,7 +177,7 @@ func (e *OperatorController) SetFalse(cluster *mgmtv3.Cluster, condition conditi
 	var err error
 	cluster, err = e.ClusterClient.Update(cluster)
 	if err != nil {
-		return cluster, fmt.Errorf("failed setting cluster [%s] condition %s false with message: %s", cluster.Name, condition, message)
+		return cluster, err
 	}
 	return cluster, nil
 }

pkg/controllers/management/eks/eks_cluster_handler.go

@@ -160,12 +160,6 @@ func (e *eksOperatorController) onClusterChange(key string, cluster *mgmtv3.Clus
 	}
 	switch phase {
 	case "creating":
-		// set provisioning to unknown
-		cluster, err = e.SetUnknown(cluster, apimgmtv3.ClusterConditionProvisioned, "")
-		if err != nil {
-			return cluster, err
-		}
-
 		if cluster.Status.EKSStatus.UpstreamSpec == nil {
 			cluster, err = e.setInitialUpstreamSpec(cluster)
 			if err != nil {

pkg/controllers/management/gke/gke_cluster_handler.go

@@ -153,12 +153,6 @@ func (e *gkeOperatorController) onClusterChange(key string, cluster *mgmtv3.Clus
 
 	switch phase {
 	case "creating":
-		// set provisioning to unknown
-		cluster, err = e.SetUnknown(cluster, apimgmtv3.ClusterConditionProvisioned, "")
-		if err != nil {
-			return cluster, err
-		}
-
 		if cluster.Status.GKEStatus.UpstreamSpec == nil {
 			cluster, err = e.setInitialUpstreamSpec(cluster)
 			if err != nil {