From 79e359717385db1b2a8d3bd0629534c638a6a7ab Mon Sep 17 00:00:00 2001 From: zryfish Date: Thu, 11 Jun 2020 16:10:19 +0800 Subject: [PATCH] fix cluster status (#2192) --- pkg/controller/application/application_controller.go | 3 +++ pkg/controller/cluster/cluster_controller.go | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/controller/application/application_controller.go b/pkg/controller/application/application_controller.go index 020102e1c..b4a9aa990 100644 --- a/pkg/controller/application/application_controller.go +++ b/pkg/controller/application/application_controller.go @@ -205,6 +205,9 @@ func (v *ApplicationController) syncApplication(key string) error { } annotations := application.GetAnnotations() + if annotations == nil { + annotations = make(map[string]string) + } annotations["kubesphere.io/last-updated"] = time.Now().String() application.SetAnnotations(annotations) diff --git a/pkg/controller/cluster/cluster_controller.go b/pkg/controller/cluster/cluster_controller.go index ea3d021a4..8fccb8341 100644 --- a/pkg/controller/cluster/cluster_controller.go +++ b/pkg/controller/cluster/cluster_controller.go @@ -518,7 +518,8 @@ func (c *clusterController) syncCluster(key string) error { c.updateClusterCondition(cluster, clusterReadyCondition) } - if !isConditionTrue(cluster, clusterv1alpha1.ClusterAgentAvailable) { + if cluster.Spec.Connection.Type == clusterv1alpha1.ConnectionTypeProxy && + !isConditionTrue(cluster, clusterv1alpha1.ClusterAgentAvailable) { clusterNotReadyCondition := clusterv1alpha1.ClusterCondition{ Type: clusterv1alpha1.ClusterReady, Status: v1.ConditionFalse,