Fix channel subscribers patching for v1alpha1 channels. (knative#2986) (

knative#3020) Co-authored-by: Alexey Karnov <void.alexey@gmail.com>
matzew · Apr 21, 2020 · 6615249 · 6615249
1 parent 4c05c4f
commit 6615249
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/pkg/reconciler/subscription/subscription.go b/pkg/reconciler/subscription/subscription.go
@@ -473,7 +473,7 @@ func (r *Reconciler) updateChannelRemoveSubscription(ctx context.Context, channe
 			return
 		}
 	}
-	r.updateChannelAddSubscriptionV1Alpha1(ctx, channel, sub)
+	r.updateChannelRemoveSubscriptionV1Alpha1(ctx, channel, sub)
 }
 
 func (r *Reconciler) updateChannelRemoveSubscriptionV1Beta1(ctx context.Context, channel *eventingduckv1alpha1.ChannelableCombined, sub *v1alpha1.Subscription) {
@@ -487,6 +487,21 @@ func (r *Reconciler) updateChannelRemoveSubscriptionV1Beta1(ctx context.Context,
 	}
 }
 
+func (r *Reconciler) updateChannelRemoveSubscriptionV1Alpha1(ctx context.Context, channel *eventingduckv1alpha1.ChannelableCombined, sub *v1alpha1.Subscription) {
+	if channel.Spec.Subscribable == nil {
+		return
+	}
+
+	for i, v := range channel.Spec.Subscribable.Subscribers {
+		if v.UID == sub.UID {
+			channel.Spec.Subscribable.Subscribers = append(
+				channel.Spec.Subscribable.Subscribers[:i],
+				channel.Spec.Subscribable.Subscribers[i+1:]...)
+			return
+		}
+	}
+}
+
 func (r *Reconciler) updateChannelAddSubscription(ctx context.Context, channel *eventingduckv1alpha1.ChannelableCombined, sub *v1alpha1.Subscription) {
 	if channel.Annotations != nil {
 		if channel.Annotations[messaging.SubscribableDuckVersionAnnotation] == "v1beta1" {

diff --git a/pkg/reconciler/subscription/subscription_test.go b/pkg/reconciler/subscription/subscription_test.go
@@ -957,6 +957,9 @@ func TestAllCases(t *testing.T) {
 				NewInMemoryChannel(channelName, testNS,
 					WithInitInMemoryChannelConditions,
 					WithInMemoryChannelAddress(channelDNS),
+					WithInMemoryChannelSubscribers([]eventingduck.SubscriberSpec{
+						{UID: subscriptionUID, SubscriberURI: subscriberURI},
+					}),
 				),
 			},
 			Key:     testNS + "/" + subscriptionName,
@@ -966,9 +969,7 @@ func TestAllCases(t *testing.T) {
 				Eventf(corev1.EventTypeNormal, "SubscriberRemoved", "Subscription was removed from channel \"origin\""),
 			},
 			WantPatches: []clientgotesting.PatchActionImpl{
-				patchSubscribers(testNS, channelName, []eventingduck.SubscriberSpec{
-					{UID: subscriptionUID, SubscriberURI: serviceURI},
-				}),
+				patchSubscribers(testNS, channelName, nil),
 				patchRemoveFinalizers(testNS, subscriptionName),
 			},
 		}, {
@@ -1017,9 +1018,7 @@ func TestAllCases(t *testing.T) {
 				),
 			}},
 			WantPatches: []clientgotesting.PatchActionImpl{
-				patchSubscribers(testNS, channelName, []eventingduck.SubscriberSpec{
-					{UID: subscriptionUID, SubscriberURI: serviceURI},
-				}),
+				patchSubscribers(testNS, channelName, nil),
 			},
 		}, {
 			Name: "subscription deleted - channel does not exists",