Revert "Filter subscriber reconciler events (#18660)" (#18694)

This reverts commit 9470fb8.

components/ws-manager-api/go/crd/v1/workspace_types.go

@@ -150,22 +150,6 @@ type PortSpec struct {
 	Protocol PortProtocol `json:"protocol"`
 }
 
-func (ps PortSpec) Equal(other PortSpec) bool {
-	if ps.Port != other.Port {
-		return false
-	}
-
-	if ps.Visibility != other.Visibility {
-		return false
-	}
-
-	if ps.Protocol != other.Protocol {
-		return false
-	}
-
-	return true
-}
-
 // WorkspaceStatus defines the observed state of Workspace
 type WorkspaceStatus struct {
 	PodStarts  int    `json:"podStarts"`

components/ws-manager-mk2/controllers/subscriber_controller.go

@@ -7,22 +7,18 @@ package controllers
 import (
 	"context"
 	"os"
-	"reflect"
 
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
-	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	config "github.com/gitpod-io/gitpod/ws-manager/api/config"
 	workspacev1 "github.com/gitpod-io/gitpod/ws-manager/api/crd/v1"
-	"github.com/google/go-cmp/cmp"
 )
 
 func NewSubscriberReconciler(c client.Client, cfg *config.Configuration) (*SubscriberReconciler, error) {
@@ -80,28 +76,5 @@ func (r *SubscriberReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Ma
 		}
 	}()
 
-	// we need several reconciliation loops during a workspace creation until it reaches a stable state.
-	// this introduces the side effect of multiple notifications to the subscribers with partial information.
-	// the filterByUpdate predicate acts as a filter to avoid this
-	filterByUpdate := predicate.Funcs{
-		CreateFunc: func(ce event.CreateEvent) bool {
-			return true
-		},
-		UpdateFunc: func(e event.UpdateEvent) bool {
-			old := e.ObjectOld.(*workspacev1.Workspace)
-			new := e.ObjectNew.(*workspacev1.Workspace)
-
-			if !cmp.Equal(old.Spec.Ports, new.Spec.Ports) {
-				return true
-			}
-
-			// do not notify LastActivity changes
-			old.Status.LastActivity = nil
-			new.Status.LastActivity = nil
-
-			return !reflect.DeepEqual(old.Status, new.Status)
-		},
-	}
-
-	return c.Watch(source.Kind(mgr.GetCache(), &workspacev1.Workspace{}), &handler.EnqueueRequestForObject{}, filterByUpdate)
+	return c.Watch(source.Kind(mgr.GetCache(), &workspacev1.Workspace{}), &handler.EnqueueRequestForObject{})
 }