2

Author: aledbf

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

@@ -150,6 +150,22 @@ 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

@@ -22,6 +22,7 @@ import (
 
 	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) {
@@ -87,7 +88,7 @@ func (r *SubscriberReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Ma
 			old := e.ObjectOld.(*workspacev1.Workspace)
 			new := e.ObjectNew.(*workspacev1.Workspace)
 
-			if !equality.Semantic.DeepDerivative(old.Spec.Ports, new.Spec.Ports) {
+			if !cmp.Equal(old.Spec.Ports, new.Spec.Ports) {
 				return true
 			}