Remove version check in KnativeEventing (#2529)

openshift-knative · Feb 29, 2024 · 625690a · 625690a
1 parent 3fd451a
commit 625690a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/...es/eventing_namespace_global_resync.patch → ...13-eventing_namespace_global_resync.patch b/...es/eventing_namespace_global_resync.patch → ...13-eventing_namespace_global_resync.patch
diff --git a/...patches/remove_eventing_ns_manifest.patch → ...hes/014-remove_eventing_ns_manifest.patch b/...patches/remove_eventing_ns_manifest.patch → ...hes/014-remove_eventing_ns_manifest.patch
diff --git a/hack/patches/unset_status_manifestval.patch → ...atches/015-unset_status_manifestval.patch b/hack/patches/unset_status_manifestval.patch → ...atches/015-unset_status_manifestval.patch
diff --git a/hack/patches/016-knativeeventing-remove-version-check.patch b/hack/patches/016-knativeeventing-remove-version-check.patch
@@ -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 {
diff --git a/openshift-knative-operator/cmd/operator/main.go b/openshift-knative-operator/cmd/operator/main.go
@@ -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"
 )
 

diff --git 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 {