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.

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

Jump to bottom

KafkaChannel hack to upgrade #5085

Merged
merged 4 commits into from
Mar 19, 2021
Merged

KafkaChannel hack to upgrade #5085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11bfab0
KafkaChannel hack
slinkydeveloper Mar 17, 2021
c5082c5
This hack will do the trick?
slinkydeveloper Mar 18, 2021
8679b1b
This is a proper hack
slinkydeveloper Mar 18, 2021
a8a50cc
fmt
slinkydeveloper Mar 18, 2021
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
6 changes: 5 additions & 1 deletion pkg/apis/messaging/v1/subscription_defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,9 @@ func (s *Subscription) SetDefaults(ctx context.Context) {
}

func (ss *SubscriptionSpec) SetDefaults(ctx context.Context) {
// TODO anything?
// 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"
}
}
10 changes: 9 additions & 1 deletion pkg/apis/messaging/v1/subscription_validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,16 @@ 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{}, "Subscriber", "Reply")
ignoreArguments := cmpopts.IgnoreFields(SubscriptionSpec{}, ignoredFields...)
if diff, err := kmp.ShortDiff(original.Spec, s.Spec, ignoreArguments); err != nil {
return &apis.FieldError{
Message: "Failed to diff Subscription",
Expand Down
23 changes: 23 additions & 0 deletions pkg/apis/messaging/v1/subscription_validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,29 @@ 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{
Expand Down
6 changes: 5 additions & 1 deletion pkg/apis/messaging/v1beta1/subscription_defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,9 @@ func (s *Subscription) SetDefaults(ctx context.Context) {
}

func (ss *SubscriptionSpec) SetDefaults(ctx context.Context) {
// TODO anything?
// 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"
}
}
10 changes: 9 additions & 1 deletion pkg/apis/messaging/v1beta1/subscription_validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,16 @@ 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{}, "Subscriber", "Reply")
ignoreArguments := cmpopts.IgnoreFields(SubscriptionSpec{}, ignoredFields...)
if diff, err := kmp.ShortDiff(original.Spec, s.Spec, ignoreArguments); err != nil {
return &apis.FieldError{
Message: "Failed to diff Subscription",
Expand Down
23 changes: 23 additions & 0 deletions pkg/apis/messaging/v1beta1/subscription_validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,29 @@ 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: "valid, new Reply",
c: &Subscription{
Expand Down