Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-1.8] Set transition time initially on sequence statuses #6653

Merged
merged 1 commit into from
Dec 21, 2022
Merged

[release-1.8] Set transition time initially on sequence statuses #6653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions pkg/apis/flows/v1/sequence_lifecycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ limitations under the License.
package v1

import (
"time"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1"
Expand Down Expand Up @@ -93,13 +96,20 @@ func (ss *SequenceStatus) PropagateSubscriptionStatuses(subscriptions []*messagi
Namespace: s.Namespace,
},
}
readyCondition := s.Status.GetCondition(messagingv1.SubscriptionConditionReady)
if readyCondition != nil {

if readyCondition := s.Status.GetCondition(messagingv1.SubscriptionConditionReady); readyCondition != nil {
ss.SubscriptionStatuses[i].ReadyCondition = *readyCondition
if readyCondition.Status != corev1.ConditionTrue {
if !readyCondition.IsTrue() {
allReady = false
}
} else {
ss.SubscriptionStatuses[i].ReadyCondition = apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Now())},
}
allReady = false
}

Expand Down Expand Up @@ -142,7 +152,13 @@ func (ss *SequenceStatus) PropagateChannelStatuses(channels []*eventingduckv1.Ch
allReady = false
}
} else {
ss.ChannelStatuses[i].ReadyCondition = apis.Condition{Type: apis.ConditionReady, Status: corev1.ConditionUnknown, Reason: "NoReady", Message: "Channel does not have Ready condition"}
ss.ChannelStatuses[i].ReadyCondition = apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Channel does not have Ready condition",
LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Now())},
}
allReady = false
}
}
Expand Down
108 changes: 108 additions & 0 deletions pkg/reconciler/sequence/sequence_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 0),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
})),
}},
Expand Down Expand Up @@ -447,6 +453,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 0),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
})),
}},
Expand Down Expand Up @@ -549,6 +561,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 0),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
{
Subscription: corev1.ObjectReference{
Expand All @@ -557,6 +575,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 1),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
{
Subscription: corev1.ObjectReference{
Expand All @@ -565,6 +589,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 2),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
})),
}},
Expand Down Expand Up @@ -667,6 +697,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 0),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
{
Subscription: corev1.ObjectReference{
Expand All @@ -675,6 +711,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 1),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
{
Subscription: corev1.ObjectReference{
Expand All @@ -683,6 +725,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 2),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
})),
}},
Expand Down Expand Up @@ -788,6 +836,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 0),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
{
Subscription: corev1.ObjectReference{
Expand All @@ -796,6 +850,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 1),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
{
Subscription: corev1.ObjectReference{
Expand All @@ -804,6 +864,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 2),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
})),
}},
Expand Down Expand Up @@ -865,6 +931,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 0),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
})),
}},
Expand Down Expand Up @@ -967,6 +1039,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 0),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
{
Subscription: corev1.ObjectReference{
Expand All @@ -975,6 +1053,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 1),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
})),
}},
Expand Down Expand Up @@ -1084,6 +1168,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 0),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
{
Subscription: corev1.ObjectReference{
Expand All @@ -1092,6 +1182,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 1),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
})),
}},
Expand Down Expand Up @@ -1195,6 +1291,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 0),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
{
Subscription: corev1.ObjectReference{
Expand All @@ -1203,6 +1305,12 @@ func TestAllCases(t *testing.T) {
Name: resources.SequenceSubscriptionName(sequenceName, 1),
Namespace: testNS,
},
ReadyCondition: apis.Condition{
Type: apis.ConditionReady,
Status: corev1.ConditionUnknown,
Reason: "NoReady",
Message: "Subscription does not have Ready condition",
},
},
})),
}},
Expand Down