diff --git a/internal/services/controller/controller.go b/internal/services/controller/controller.go index 8633e05..013f894 100644 --- a/internal/services/controller/controller.go +++ b/internal/services/controller/controller.go @@ -741,22 +741,7 @@ func getDefaultInformers(f informers.SharedInformerFactory, castwareNamespace st reflect.TypeOf(&corev1.PersistentVolumeClaim{}): {informer: f.Core().V1().PersistentVolumeClaims().Informer()}, reflect.TypeOf(&corev1.ReplicationController{}): {informer: f.Core().V1().ReplicationControllers().Informer()}, reflect.TypeOf(&corev1.Namespace{}): {informer: f.Core().V1().Namespaces().Informer()}, - reflect.TypeOf(&appsv1.Deployment{}): { - informer: f.Apps().V1().Deployments().Informer(), - filters: filters.Filters{ - { - func(e castai.EventType, obj interface{}) bool { - deployment, ok := obj.(*appsv1.Deployment) - if !ok { - return false - } - - return deployment.Namespace == castwareNamespace || - (deployment.Spec.Replicas != nil && *deployment.Spec.Replicas > 0 && deployment.Status.Replicas > 0) - }, - }, - }, - }, + reflect.TypeOf(&appsv1.Deployment{}): {informer: f.Apps().V1().Deployments().Informer()}, reflect.TypeOf(&appsv1.ReplicaSet{}): { informer: f.Apps().V1().ReplicaSets().Informer(), filters: filters.Filters{ diff --git a/internal/services/controller/controller_test.go b/internal/services/controller/controller_test.go index 721debd..02a675d 100644 --- a/internal/services/controller/controller_test.go +++ b/internal/services/controller/controller_test.go @@ -887,14 +887,6 @@ func TestDefaultInformers_MatchFilters(t *testing.T) { }, expectedMatch: true, }, - "keep if deployment in castware namespace": { - obj: &appsv1.Deployment{ - ObjectMeta: metav1.ObjectMeta{ - Namespace: "castware", - }, - }, - expectedMatch: true, - }, "discard if replicaset has zero replicas": { obj: &appsv1.ReplicaSet{ ObjectMeta: metav1.ObjectMeta{ @@ -909,20 +901,6 @@ func TestDefaultInformers_MatchFilters(t *testing.T) { }, expectedMatch: false, }, - "discard if deployment has zero replicas": { - obj: &appsv1.Deployment{ - ObjectMeta: metav1.ObjectMeta{ - Namespace: "test", - }, - Spec: appsv1.DeploymentSpec{ - Replicas: lo.ToPtr(int32(0)), - }, - Status: appsv1.DeploymentStatus{ - Replicas: 0, - }, - }, - expectedMatch: false, - }, "keep if replicaset has more than zero replicas": { obj: &appsv1.ReplicaSet{ ObjectMeta: metav1.ObjectMeta{ @@ -937,20 +915,6 @@ func TestDefaultInformers_MatchFilters(t *testing.T) { }, expectedMatch: true, }, - "keep if deployment has more than zero replicas": { - obj: &appsv1.Deployment{ - ObjectMeta: metav1.ObjectMeta{ - Namespace: "test", - }, - Spec: appsv1.DeploymentSpec{ - Replicas: lo.ToPtr(int32(1)), - }, - Status: appsv1.DeploymentStatus{ - Replicas: 1, - }, - }, - expectedMatch: true, - }, } for name, data := range tests {