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.

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

fix the propagation of Choice address #1611

Merged
merged 1 commit into from Jul 31, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions pkg/apis/messaging/v1alpha1/choice_lifecycle.go
Expand Up @@ -139,6 +139,8 @@ func (ps *ChoiceStatus) PropagateChannelStatuses(ingressChannel *duckv1alpha1.Ch
ps.IngressChannelStatus.ReadyCondition = apis.Condition{Type: apis.ConditionReady, Status: corev1.ConditionFalse, Reason: "NotAddressable", Message: "Channel is not addressable"}
allReady = false
}
// Propagate ingress channel address to Choice
ps.setAddress(address)

for i, c := range channels {
ps.CaseStatuses[i].FilterChannelStatus = ChoiceChannelStatus{
Expand All @@ -158,11 +160,6 @@ func (ps *ChoiceStatus) PropagateChannelStatuses(ingressChannel *duckv1alpha1.Ch
ps.CaseStatuses[i].FilterChannelStatus.ReadyCondition = apis.Condition{Type: apis.ConditionReady, Status: corev1.ConditionFalse, Reason: "NotAddressable", Message: "Channel is not addressable"}
allReady = false
}

// Mark the Choice address as the Address of the first channel.
if i == 0 {
ps.setAddress(address)
}
}
if allReady {
pChoiceCondSet.Manage(ps).MarkTrue(ChoiceConditionChannelsReady)
Expand Down