Merge pull request #455 from Garrybest/clean-up

use meta.IsStatusConditionTrue in cluster.go
This commit is contained in:
karmada-bot 2021-06-20 09:49:14 +08:00 committed by GitHub
commit 6c80fbb8e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions

View File

@ -3,7 +3,7 @@ package util
import (
"context"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
@ -17,14 +17,7 @@ const (
// IsClusterReady tells whether the cluster status in 'Ready' condition.
func IsClusterReady(clusterStatus *v1alpha1.ClusterStatus) bool {
for _, condition := range clusterStatus.Conditions {
if condition.Type == v1alpha1.ClusterConditionReady {
if condition.Status == metav1.ConditionTrue {
return true
}
}
}
return false
return meta.IsStatusConditionTrue(clusterStatus.Conditions, v1alpha1.ClusterConditionReady)
}
// GetCluster returns the given Cluster resource