From 12a0216b68c583b75c64b365ccfd2541a3403dde Mon Sep 17 00:00:00 2001
From: slinkydeveloper <francescoguard@gmail.com>
Date: Mon, 19 Apr 2021 16:09:42 +0200
Subject: [PATCH] Remove KafkaChannel upgrade hack

Signed-off-by: Francesco Guardiani <francescoguard@gmail.com>
---
 .../messaging/v1/subscription_defaults.go     |  8 +------
 .../messaging/v1/subscription_validation.go   | 10 +-------
 .../v1/subscription_validation_test.go        | 23 -------------------
 3 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/pkg/apis/messaging/v1/subscription_defaults.go b/pkg/apis/messaging/v1/subscription_defaults.go
index 6cdf2bab9b5..2beb73d00d1 100644
--- a/pkg/apis/messaging/v1/subscription_defaults.go
+++ b/pkg/apis/messaging/v1/subscription_defaults.go
@@ -24,10 +24,4 @@ func (s *Subscription) SetDefaults(ctx context.Context) {
 	s.Spec.SetDefaults(ctx)
 }
 
-func (ss *SubscriptionSpec) SetDefaults(ctx context.Context) {
-	// HACK if a channel ref is a kafka channel ref, we need to hack it around to use only v1beta1
-	//  TODO(slinkydeveloper) REMOVE AFTER 0.22 release
-	if ss.Channel.Kind == "KafkaChannel" && ss.Channel.APIVersion == "messaging.knative.dev/v1alpha1" {
-		ss.Channel.APIVersion = "messaging.knative.dev/v1beta1"
-	}
-}
+func (ss *SubscriptionSpec) SetDefaults(ctx context.Context) {}
diff --git a/pkg/apis/messaging/v1/subscription_validation.go b/pkg/apis/messaging/v1/subscription_validation.go
index e3f3a517290..f2496bc7afa 100644
--- a/pkg/apis/messaging/v1/subscription_validation.go
+++ b/pkg/apis/messaging/v1/subscription_validation.go
@@ -80,16 +80,8 @@ func (s *Subscription) CheckImmutableFields(ctx context.Context, original *Subsc
 		return nil
 	}
 
-	// TODO(slinkydeveloper)
-	//  HACK around the immutability check to make sure the update script can upgrade the api version
-	//  REMOVE AFTER 0.22 release
-	ignoredFields := []string{"Subscriber", "Reply"}
-	if original.Spec.Channel.Kind == "KafkaChannel" && original.Spec.Channel.APIVersion == "messaging.knative.dev/v1alpha1" && s.Spec.Channel.APIVersion == "messaging.knative.dev/v1beta1" {
-		ignoredFields = append(ignoredFields, "Channel.APIVersion")
-	}
-
 	// Only Subscriber and Reply are mutable.
-	ignoreArguments := cmpopts.IgnoreFields(SubscriptionSpec{}, ignoredFields...)
+	ignoreArguments := cmpopts.IgnoreFields(SubscriptionSpec{}, "Subscriber", "Reply")
 	if diff, err := kmp.ShortDiff(original.Spec, s.Spec, ignoreArguments); err != nil {
 		return &apis.FieldError{
 			Message: "Failed to diff Subscription",
diff --git a/pkg/apis/messaging/v1/subscription_validation_test.go b/pkg/apis/messaging/v1/subscription_validation_test.go
index b956b8215ae..e31086eba62 100644
--- a/pkg/apis/messaging/v1/subscription_validation_test.go
+++ b/pkg/apis/messaging/v1/subscription_validation_test.go
@@ -329,29 +329,6 @@ func TestSubscriptionImmutable(t *testing.T) {
 			},
 		},
 		want: nil,
-	}, {
-		name: "valid, kafkachannel hack",
-		c: &Subscription{
-			Spec: SubscriptionSpec{
-				Channel: corev1.ObjectReference{
-					Name:       channelName,
-					Kind:       "KafkaChannel",
-					APIVersion: "messaging.knative.dev/v1beta1",
-				},
-				Subscriber: getValidDestination(),
-			},
-		},
-		og: &Subscription{
-			Spec: SubscriptionSpec{
-				Channel: corev1.ObjectReference{
-					Name:       channelName,
-					Kind:       "KafkaChannel",
-					APIVersion: "messaging.knative.dev/v1alpha1",
-				},
-				Subscriber: getValidDestination(),
-			},
-		},
-		want: nil,
 	}, {
 		name: "Channel changed",
 		c: &Subscription{