Skip to content

[release-v1.8] Populate a Subscriptions subscriber and reply namespace only if not set already #93

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
openshift-merge-robot merged 1 commit into from
Jan 24, 2023
Merged

[release-v1.8] Populate a Subscriptions subscriber and reply namespace only if not set already #93

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
8 changes: 4 additions & 4 deletions pkg/reconciler/subscription/subscription.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ func (r *Reconciler) resolveSubscriber(ctx context.Context, subscription *v1.Sub
// Resolve Subscriber.
subscriber := subscription.Spec.Subscriber.DeepCopy()
if !isNilOrEmptyDestination(subscriber) {
// Populate the namespace for the subscriber since it is in the namespace
if subscriber.Ref != nil {
// Populate the namespace for the subscriber if required
if subscriber.Ref != nil && subscriber.Ref.Namespace == "" {
subscriber.Ref.Namespace = subscription.Namespace
}

Expand Down Expand Up @@ -238,8 +238,8 @@ func (r *Reconciler) resolveReply(ctx context.Context, subscription *v1.Subscrip
// Resolve Reply.
reply := subscription.Spec.Reply.DeepCopy()
if !isNilOrEmptyDestination(reply) {
// Populate the namespace for the subscriber since it is in the namespace
if reply.Ref != nil {
// Populate the namespace for the subscriber if required
if reply.Ref != nil && reply.Ref.Namespace == "" {
reply.Ref.Namespace = subscription.Namespace
}
replyURI, err := r.destinationResolver.URIFromDestinationV1(ctx, *reply, subscription)
Expand Down
132 changes: 132 additions & 0 deletions pkg/reconciler/subscription/subscription_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,138 @@ func TestAllCases(t *testing.T) {
MarkSubscriptionReady,
),
}},
}, {
Name: "subscription goes ready with subscriber in different namespace",
Objects: []runtime.Object{
NewSubscription(subscriptionName, testNS,
WithSubscriptionUID(subscriptionUID),
WithSubscriptionChannel(imcV1GVK, channelName),
WithSubscriptionSubscriberRef(subscriberGVK, subscriberName, testNS+"-2"),
WithSubscriptionReply(imcV1GVK, replyName, testNS),
WithInitSubscriptionConditions,
WithSubscriptionFinalizers(finalizerName),
MarkReferencesResolved,
MarkAddedToChannel,
WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI),
WithSubscriptionPhysicalSubscriptionReply(replyURI),
),
// Subscriber
NewUnstructured(subscriberGVK, subscriberName, testNS+"-2",
WithUnstructuredAddressable(subscriberDNS),
),
// Reply
NewInMemoryChannel(replyName, testNS,
WithInitInMemoryChannelConditions,
WithInMemoryChannelAddress(replyDNS),
),
// Channel
NewInMemoryChannel(channelName, testNS,
WithInitInMemoryChannelConditions,
WithInMemoryChannelReady(channelDNS),
WithInMemoryChannelSubscribers([]eventingduck.SubscriberSpec{{
UID: subscriptionUID,
Generation: 0,
SubscriberURI: subscriberURI,
ReplyURI: replyURI,
}, {
UID: "34c5aec8-deb6-11e8-9f32-f2801f1b9fd1",
Generation: 1,
SubscriberURI: apis.HTTP("call2"),
ReplyURI: apis.HTTP("sink2"),
}}),
WithInMemoryChannelStatusSubscribers([]eventingduck.SubscriberStatus{{
UID: subscriptionUID,
ObservedGeneration: 0,
Ready: "True",
}, {
UID: "34c5aec8-deb6-11e8-9f32-f2801f1b9fd1",
ObservedGeneration: 1,
Ready: "True",
}}),
),
},
Key: testNS + "/" + subscriptionName,
WantErr: false,
WantStatusUpdates: []clientgotesting.UpdateActionImpl{{
Object: NewSubscription(subscriptionName, testNS,
WithSubscriptionUID(subscriptionUID),
WithSubscriptionChannel(imcV1GVK, channelName),
WithSubscriptionSubscriberRef(subscriberGVK, subscriberName, testNS+"-2"),
WithSubscriptionReply(imcV1GVK, replyName, testNS),
WithInitSubscriptionConditions,
WithSubscriptionFinalizers(finalizerName),
WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI),
WithSubscriptionPhysicalSubscriptionReply(replyURI),
// - Status Update -
MarkSubscriptionReady,
),
}},
}, {
Name: "subscription goes ready with reply in different namespace",
Objects: []runtime.Object{
NewSubscription(subscriptionName, testNS,
WithSubscriptionUID(subscriptionUID),
WithSubscriptionChannel(imcV1GVK, channelName),
WithSubscriptionSubscriberRef(subscriberGVK, subscriberName, testNS),
WithSubscriptionReply(imcV1GVK, replyName, testNS+"-2"),
WithInitSubscriptionConditions,
WithSubscriptionFinalizers(finalizerName),
MarkReferencesResolved,
MarkAddedToChannel,
WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI),
WithSubscriptionPhysicalSubscriptionReply(replyURI),
),
// Subscriber
NewUnstructured(subscriberGVK, subscriberName, testNS,
WithUnstructuredAddressable(subscriberDNS),
),
// Reply
NewInMemoryChannel(replyName, testNS+"-2",
WithInitInMemoryChannelConditions,
WithInMemoryChannelAddress(replyDNS),
),
// Channel
NewInMemoryChannel(channelName, testNS,
WithInitInMemoryChannelConditions,
WithInMemoryChannelReady(channelDNS),
WithInMemoryChannelSubscribers([]eventingduck.SubscriberSpec{{
UID: subscriptionUID,
Generation: 0,
SubscriberURI: subscriberURI,
ReplyURI: replyURI,
}, {
UID: "34c5aec8-deb6-11e8-9f32-f2801f1b9fd1",
Generation: 1,
SubscriberURI: apis.HTTP("call2"),
ReplyURI: apis.HTTP("sink2"),
}}),
WithInMemoryChannelStatusSubscribers([]eventingduck.SubscriberStatus{{
UID: subscriptionUID,
ObservedGeneration: 0,
Ready: "True",
}, {
UID: "34c5aec8-deb6-11e8-9f32-f2801f1b9fd1",
ObservedGeneration: 1,
Ready: "True",
}}),
),
},
Key: testNS + "/" + subscriptionName,
WantErr: false,
WantStatusUpdates: []clientgotesting.UpdateActionImpl{{
Object: NewSubscription(subscriptionName, testNS,
WithSubscriptionUID(subscriptionUID),
WithSubscriptionChannel(imcV1GVK, channelName),
WithSubscriptionSubscriberRef(subscriberGVK, subscriberName, testNS),
WithSubscriptionReply(imcV1GVK, replyName, testNS+"-2"),
WithInitSubscriptionConditions,
WithSubscriptionFinalizers(finalizerName),
WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI),
WithSubscriptionPhysicalSubscriptionReply(replyURI),
// - Status Update -
MarkSubscriptionReady,
),
}},
}, {
Name: "subscription goes ready without api version",
Ctx: feature.ToContext(context.TODO(), feature.Flags{
Expand Down