Use built-in function to evaluate ReadyCondition

... instead of duplicating the logic.
openstack-k8s-operators · May 31, 2023 · ebaeca6 · ebaeca6
1 parent 122c78d
commit ebaeca6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/api/v1beta1/nova_types.go b/api/v1beta1/nova_types.go
@@ -18,7 +18,6 @@ package v1beta1
 
 import (
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -165,9 +164,8 @@ func (s NovaStatus) GetConditions() condition.Conditions {
 }
 
 // IsReady returns true if Nova reconciled successfully
-func (c Nova) IsReady() bool {
-	readyCond := c.Status.Conditions.Get(condition.ReadyCondition)
-	return readyCond != nil && readyCond.Status == corev1.ConditionTrue
+func (instance Nova) IsReady() bool {
+	return instance.Status.Conditions.IsTrue(condition.ReadyCondition)
 }
 
 // RbacConditionsSet - set the conditions for the rbac object

diff --git a/api/v1beta1/novacell_types.go b/api/v1beta1/novacell_types.go
@@ -18,7 +18,6 @@ package v1beta1
 
 import (
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -214,7 +213,6 @@ func (s NovaCellStatus) GetConditions() condition.Conditions {
 }
 
 // IsReady returns true if the Cell reconciled successfully
-func (c NovaCell) IsReady() bool {
-	readyCond := c.Status.Conditions.Get(condition.ReadyCondition)
-	return readyCond != nil && readyCond.Status == corev1.ConditionTrue
+func (instance NovaCell) IsReady() bool {
+	return instance.Status.Conditions.IsTrue(condition.ReadyCondition)
 }
diff --git a/api/v1beta1/novaexternalcompute_types.go b/api/v1beta1/novaexternalcompute_types.go
@@ -18,7 +18,6 @@ package v1beta1
 
 import (
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -130,9 +129,8 @@ func (s NovaExternalComputeStatus) GetConditions() condition.Conditions {
 }
 
 // IsReady returns true if Nova reconciled successfully
-func (c NovaExternalCompute) IsReady() bool {
-	readyCond := c.Status.Conditions.Get(condition.ReadyCondition)
-	return readyCond != nil && readyCond.Status == corev1.ConditionTrue
+func (instance NovaExternalCompute) IsReady() bool {
+	return instance.Status.Conditions.IsTrue(condition.ReadyCondition)
 }
 
 // NewNovaExternalComputeSpec returns a NovaExternalComputeSpec where the fields are defaulted according