diff --git a/pkg/apis/eventing/v1alpha1/trigger_lifecycle.go b/pkg/apis/eventing/v1alpha1/trigger_lifecycle.go index 7a198dc514b..cff1ab92459 100644 --- a/pkg/apis/eventing/v1alpha1/trigger_lifecycle.go +++ b/pkg/apis/eventing/v1alpha1/trigger_lifecycle.go @@ -31,7 +31,7 @@ const ( TriggerConditionBroker apis.ConditionType = "BrokerReady" - TriggerConditionSubscribed apis.ConditionType = "Subscribed" + TriggerConditionSubscribed apis.ConditionType = "SubscriptionReady" TriggerConditionDependency apis.ConditionType = "DependencyReady" diff --git a/pkg/apis/eventing/v1alpha1/trigger_lifecycle_test.go b/pkg/apis/eventing/v1alpha1/trigger_lifecycle_test.go index 3f056780d5a..a6dc3763ac8 100644 --- a/pkg/apis/eventing/v1alpha1/trigger_lifecycle_test.go +++ b/pkg/apis/eventing/v1alpha1/trigger_lifecycle_test.go @@ -142,10 +142,10 @@ func TestTriggerInitializeConditions(t *testing.T) { Type: TriggerConditionReady, Status: corev1.ConditionUnknown, }, { - Type: TriggerConditionSubscribed, + Type: TriggerConditionSubscriberResolved, Status: corev1.ConditionUnknown, }, { - Type: TriggerConditionSubscriberResolved, + Type: TriggerConditionSubscribed, Status: corev1.ConditionUnknown, }, }, @@ -174,10 +174,10 @@ func TestTriggerInitializeConditions(t *testing.T) { Type: TriggerConditionReady, Status: corev1.ConditionUnknown, }, { - Type: TriggerConditionSubscribed, + Type: TriggerConditionSubscriberResolved, Status: corev1.ConditionUnknown, }, { - Type: TriggerConditionSubscriberResolved, + Type: TriggerConditionSubscribed, Status: corev1.ConditionUnknown, }, }, @@ -204,12 +204,12 @@ func TestTriggerInitializeConditions(t *testing.T) { }, { Type: TriggerConditionReady, Status: corev1.ConditionUnknown, - }, { - Type: TriggerConditionSubscribed, - Status: corev1.ConditionTrue, }, { Type: TriggerConditionSubscriberResolved, Status: corev1.ConditionUnknown, + }, { + Type: TriggerConditionSubscribed, + Status: corev1.ConditionTrue, }, }, }, diff --git a/pkg/apis/eventing/v1beta1/trigger_lifecycle.go b/pkg/apis/eventing/v1beta1/trigger_lifecycle.go index 31d6db5006d..0e122a37486 100644 --- a/pkg/apis/eventing/v1beta1/trigger_lifecycle.go +++ b/pkg/apis/eventing/v1beta1/trigger_lifecycle.go @@ -31,7 +31,7 @@ const ( TriggerConditionBroker apis.ConditionType = "BrokerReady" - TriggerConditionSubscribed apis.ConditionType = "Subscribed" + TriggerConditionSubscribed apis.ConditionType = "SubscriptionReady" TriggerConditionDependency apis.ConditionType = "DependencyReady" diff --git a/pkg/apis/eventing/v1beta1/trigger_lifecycle_test.go b/pkg/apis/eventing/v1beta1/trigger_lifecycle_test.go index 8a88465a257..4a71369c19d 100644 --- a/pkg/apis/eventing/v1beta1/trigger_lifecycle_test.go +++ b/pkg/apis/eventing/v1beta1/trigger_lifecycle_test.go @@ -146,10 +146,10 @@ func TestTriggerInitializeConditions(t *testing.T) { Type: TriggerConditionReady, Status: corev1.ConditionUnknown, }, { - Type: TriggerConditionSubscribed, + Type: TriggerConditionSubscriberResolved, Status: corev1.ConditionUnknown, }, { - Type: TriggerConditionSubscriberResolved, + Type: TriggerConditionSubscribed, Status: corev1.ConditionUnknown, }, }, @@ -178,10 +178,10 @@ func TestTriggerInitializeConditions(t *testing.T) { Type: TriggerConditionReady, Status: corev1.ConditionUnknown, }, { - Type: TriggerConditionSubscribed, + Type: TriggerConditionSubscriberResolved, Status: corev1.ConditionUnknown, }, { - Type: TriggerConditionSubscriberResolved, + Type: TriggerConditionSubscribed, Status: corev1.ConditionUnknown, }, }, @@ -208,12 +208,12 @@ func TestTriggerInitializeConditions(t *testing.T) { }, { Type: TriggerConditionReady, Status: corev1.ConditionUnknown, - }, { - Type: TriggerConditionSubscribed, - Status: corev1.ConditionTrue, }, { Type: TriggerConditionSubscriberResolved, Status: corev1.ConditionUnknown, + }, { + Type: TriggerConditionSubscribed, + Status: corev1.ConditionTrue, }, }, },