dapr
/
kubernetes-operator
mirror of https://github.com/dapr/kubernetes-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #145 from lburgazzoli/cleanup-conditions 

Cleanup condition handling
This commit is contained in:
Luca Burgazzoli 2024-05-03 17:41:06 +02:00 committed by GitHub
parent a997d05c6b da1d71c9c6
commit 042bff10ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/operator/v1alpha1/dapr_control_plane_types.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package v1alpha1
import (
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/conditions"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
@ -52,6 +53,10 @@ type DaprControlPlane struct {
Status DaprControlPlaneStatus `json:"status,omitempty"`
}
func (in *DaprControlPlane) GetConditions() conditions.Conditions {
return in.Status.Conditions
}
// +kubebuilder:object:root=true
type DaprControlPlaneList struct {

5
api/operator/v1alpha1/dapr_cruise_control_types.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package v1alpha1
import (
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/conditions"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
@ -52,6 +53,10 @@ type DaprCruiseControl struct {
Status DaprCruiseControlStatus `json:"status,omitempty"`
}
func (in *DaprCruiseControl) GetConditions() conditions.Conditions {
return in.Status.Conditions
}
// +kubebuilder:object:root=true
// DaprCruiseControlList contains a list of DaprCruiseControl.

5
api/operator/v1alpha1/dapr_instance_types.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package v1alpha1
import (
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/conditions"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
@ -57,6 +58,10 @@ type DaprInstance struct {
Status DaprInstanceStatus `json:"status,omitempty"`
}
func (in *DaprInstance) GetConditions() conditions.Conditions {
return in.Status.Conditions
}
// +kubebuilder:object:root=true
// DaprInstanceList contains a list of DaprInstance.

49
pkg/conditions/conditions.go
View File

@ -1,7 +1,6 @@
package conditions
import (
daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -71,30 +70,6 @@ func ConditionStatus[T GenericConditionType](object any, conditionType T) corev1
}
}
}
case *daprApi.DaprControlPlane:
if o != nil {
for i := range o.Status.Conditions {
if o.Status.Conditions[i].Type == string(conditionType) {
return corev1.ConditionStatus(o.Status.Conditions[i].Status)
}
}
}
case *daprApi.DaprInstance:
if o != nil {
for i := range o.Status.Conditions {
if o.Status.Conditions[i].Type == string(conditionType) {
return corev1.ConditionStatus(o.Status.Conditions[i].Status)
}
}
}
case *daprApi.DaprCruiseControl:
if o != nil {
for i := range o.Status.Conditions {
if o.Status.Conditions[i].Type == string(conditionType) {
return corev1.ConditionStatus(o.Status.Conditions[i].Status)
}
}
}
}
return corev1.ConditionUnknown
@ -128,30 +103,6 @@ func ConditionReason[T GenericConditionType](object any, conditionType T) string
}
}
}
case *daprApi.DaprControlPlane:
if o != nil {
for i := range o.Status.Conditions {
if o.Status.Conditions[i].Type == string(conditionType) {
return o.Status.Conditions[i].Reason
}
}
}
case *daprApi.DaprInstance:
if o != nil {
for i := range o.Status.Conditions {
if o.Status.Conditions[i].Type == string(conditionType) {
return o.Status.Conditions[i].Reason
}
}
}
case *daprApi.DaprCruiseControl:
if o != nil {
for i := range o.Status.Conditions {
if o.Status.Conditions[i].Type == string(conditionType) {
return o.Status.Conditions[i].Reason
}
}
}
}
return ""