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

controller/cluster: ensure cluster is Ready when cleanup notifications (#5392)

Browse Source
This commit is contained in:
Xinzhao Xu
2022-12-06 17:06:58 +08:00
committed by GitHub
parent d739c693c1
commit aab3ad8b87
3 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,7 @@ import (
clusterlister "kubesphere.io/kubesphere/pkg/client/listers/cluster/v1alpha1"
iamv1alpha2listers "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2"
"kubesphere.io/kubesphere/pkg/constants"
clusterutils "kubesphere.io/kubesphere/pkg/controller/cluster/utils"
"kubesphere.io/kubesphere/pkg/simple/client/multicluster"
"kubesphere.io/kubesphere/pkg/utils/k8sutil"
"kubesphere.io/kubesphere/pkg/version"
@@ -352,7 +353,7 @@ func (c *clusterController) syncCluster(key string) error {
return err
}
if cluster.Annotations[NotificationCleanup] == "true" {
if clusterutils.IsClusterReady(cluster) && cluster.Annotations[NotificationCleanup] == "true" {
if err := c.cleanupNotification(cluster); err != nil {
klog.Errorf("Failed to cleanup notification config in cluster %s: %v", name, err)
return err