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

[release-1.32] Remove version check in KnativeEventing #2530

Closed
wants to merge 1 commit into from
Closed

[release-1.32] Remove version check in KnativeEventing #2530

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
0 ...es/eventing_namespace_global_resync.patch → ...13-eventing_namespace_global_resync.patch
View file
Open in desktop
File renamed without changes.
0 ...patches/remove_eventing_ns_manifest.patch → ...hes/014-remove_eventing_ns_manifest.patch
View file
Open in desktop
File renamed without changes.
0 hack/patches/unset_status_manifestval.patch → ...atches/015-unset_status_manifestval.patch
View file
Open in desktop
File renamed without changes.
15 changes: 15 additions & 0 deletions hack/patches/016-knativeeventing-remove-version-check.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go
index baf7240c6..f0d4c777d 100644
--- a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go
+++ b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go
@@ -124,10 +124,6 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ke *v1beta1.KnativeEvent

logger.Infow("Reconciling KnativeEventing", "status", ke.Status)

- if err := common.IsVersionValidMigrationEligible(ke); err != nil {
- ke.Status.MarkVersionMigrationNotEligible(err.Error())
- return nil
- }
ke.Status.MarkVersionMigrationEligible()

if err := r.extension.Reconcile(ctx, ke); err != nil {
2 changes: 1 addition & 1 deletion openshift-knative-operator/cmd/operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/openshift-knative/serverless-operator/openshift-knative-operator/pkg/eventing"
"github.com/openshift-knative/serverless-operator/openshift-knative-operator/pkg/serving"

// Force vendor this package since it's included in the patch in hack/patches/remove_eventing_ns_manifest.patch
// Force vendor this package since it's included in the patch in hack/patches/014-remove_eventing_ns_manifest.patch
_ "knative.dev/pkg/client/injection/kube/informers/core/v1/namespace"
)

Expand Down
4 changes: 0 additions & 4 deletions vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,6 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ke *v1beta1.KnativeEvent

logger.Infow("Reconciling KnativeEventing", "status", ke.Status)

if err := common.IsVersionValidMigrationEligible(ke); err != nil {
ke.Status.MarkVersionMigrationNotEligible(err.Error())
return nil
}
ke.Status.MarkVersionMigrationEligible()

if err := r.extension.Reconcile(ctx, ke); err != nil {
Expand Down
Loading