Skip to content

parallel/sequence v1beta reconcilers #3075

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

Merged
knative-prow-robot merged 10 commits into from
May 4, 2020
Merged

parallel/sequence v1beta reconcilers #3075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
01dd895
parallel/sequence v1beta reconcilers
vaikas May 1, 2020
9d24378
timeouts back to 4 minutes
vaikas May 2, 2020
d178360
use channelablecombined for dealing with channels
vaikas May 2, 2020
50ae0f7
test with all the channels instead of only the default
vaikas May 2, 2020
1b18f7b
remove the optimistic read after create. drop flows from the method n…
vaikas May 2, 2020
d4534eb
ut for seq lifecycle
vaikas May 2, 2020
c5f8fb2
change to use channelhelper style so parallel does not kill us
vaikas May 2, 2020
f1f6890
test parallels with all channel types also instead of only the hardco…
vaikas May 3, 2020
83f7ec9
no need to use channelable combined, just v1beta1 channelable
vaikas May 3, 2020
c887c89
refactor to make reconcileChannel refactorable later on
vaikas May 3, 2020
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ require (
k8s.io/apimachinery v0.16.5-beta.1
k8s.io/apiserver v0.16.4
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
k8s.io/kubernetes v1.14.7
k8s.io/kubernetes v1.14.7 // indirect
k8s.io/utils v0.0.0-20191010214722-8d271d903fe4
knative.dev/pkg v0.0.0-20200501005942-d980c0865972
knative.dev/test-infra v0.0.0-20200430225942-f7c1fafc1cde
Expand Down
1 change: 0 additions & 1 deletion pkg/apis/flows/v1alpha1/parallel_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
)

// +genclient
// +genreconciler
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// Parallel defines conditional branches that will be wired in
// series through Channels and Subscriptions.
Expand Down
1 change: 0 additions & 1 deletion pkg/apis/flows/v1alpha1/sequence_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
)

// +genclient
// +genreconciler
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// Sequence defines a sequence of Subscribers that will be wired in
// series through Channels and Subscriptions.
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/flows/v1beta1/parallel_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
)

// +genclient
// +genreconciler
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// Parallel defines conditional branches that will be wired in
// series through Channels and Subscriptions.
Expand Down
12 changes: 6 additions & 6 deletions pkg/apis/flows/v1beta1/sequence_lifecycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package v1beta1
import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
duckv1beta1 "knative.dev/eventing/pkg/apis/duck/v1beta1"
eventingduckv1beta1 "knative.dev/eventing/pkg/apis/duck/v1beta1"
messagingv1beta1 "knative.dev/eventing/pkg/apis/messaging/v1beta1"
"knative.dev/pkg/apis"
pkgduckv1 "knative.dev/pkg/apis/duck/v1"
duckv1 "knative.dev/pkg/apis/duck/v1"
)

var pCondSet = apis.NewLivingConditionSet(SequenceConditionReady, SequenceConditionChannelsReady, SequenceConditionSubscriptionsReady, SequenceConditionAddressable)
Expand Down Expand Up @@ -108,7 +108,7 @@ func (ss *SequenceStatus) PropagateSubscriptionStatuses(subscriptions []*messagi

// PropagateChannelStatuses sets the ChannelStatuses and SequenceConditionChannelsReady based on the
// status of the incoming channels.
func (ss *SequenceStatus) PropagateChannelStatuses(channels []*duckv1beta1.Channelable) {
func (ss *SequenceStatus) PropagateChannelStatuses(channels []*eventingduckv1beta1.Channelable) {
ss.ChannelStatuses = make([]SequenceChannelStatus, len(channels))
allReady := true
// If there are no channels, treat that as a False case. Could go either way, but this seems right.
Expand Down Expand Up @@ -159,11 +159,11 @@ func (ss *SequenceStatus) MarkAddressableNotReady(reason, messageFormat string,
pCondSet.Manage(ss).MarkFalse(SequenceConditionAddressable, reason, messageFormat, messageA...)
}

func (ss *SequenceStatus) setAddress(address *pkgduckv1.Addressable) {
ss.Address = address
if address == nil {
func (ss *SequenceStatus) setAddress(address *duckv1.Addressable) {
if address == nil || address.URL == nil {
pCondSet.Manage(ss).MarkFalse(SequenceConditionAddressable, "emptyAddress", "addressable is nil")
} else {
ss.AddressStatus.Address = &duckv1.Addressable{URL: address.URL}
pCondSet.Manage(ss).MarkTrue(SequenceConditionAddressable)
}
}
Loading