Remove version check in KnativeServing (#2531)

openshift-knative · Mar 1, 2024 · 9ca1416 · 9ca1416
1 parent 625690a
commit 9ca1416
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/hack/patches/017-knativeserving-remove-version-check.patch b/hack/patches/017-knativeserving-remove-version-check.patch
@@ -0,0 +1,15 @@
+diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go b/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go
+index 08610b70d..c2f0b0aaf 100644
+--- a/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go
++++ b/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go
+@@ -106,10 +106,6 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ks *v1beta1.KnativeServi
+
+ 	logger.Infow("Reconciling KnativeServing", "status", ks.Status)
+
+-	if err := common.IsVersionValidMigrationEligible(ks); err != nil {
+-		ks.Status.MarkVersionMigrationNotEligible(err.Error())
+-		return nil
+-	}
+ 	ks.Status.MarkVersionMigrationEligible()
+
+ 	if err := r.extension.Reconcile(ctx, ks); err != nil {
diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go b/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go
@@ -106,10 +106,6 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ks *v1beta1.KnativeServi
 
 	logger.Infow("Reconciling KnativeServing", "status", ks.Status)
 
-	if err := common.IsVersionValidMigrationEligible(ks); err != nil {
-		ks.Status.MarkVersionMigrationNotEligible(err.Error())
-		return nil
-	}
 	ks.Status.MarkVersionMigrationEligible()
 
 	if err := r.extension.Reconcile(ctx, ks); err != nil {