fix

Signed-off-by: Yaroslav Borbat <[email protected]>

Author: yaroslavborbat

images/virtualization-artifact/pkg/controller/gc/cron_source_test.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2025 Flant JSC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package gc
 
 import (
@@ -19,7 +35,7 @@ import (
 	"github.com/deckhouse/virtualization-controller/pkg/common/testutil"
 )
 
-var _ = FDescribe("CronSource", func() {
+var _ = Describe("CronSource", func() {
 	const (
 		// Every day at 00:00
 		scheduleSpec = "0 * * * *"
@@ -31,7 +47,6 @@ var _ = FDescribe("CronSource", func() {
 		fakeClient client.Client
 		mgr        *fakeGCManager
 		fakeClock  *clock.FakeClock
-		//queue      workqueue.RateLimitingInterface
 	)
 
 	BeforeEach(func() {
@@ -50,7 +65,6 @@ var _ = FDescribe("CronSource", func() {
 
 		mgr = newFakeGCManager(fakeClient, time.Hour, 10)
 		fakeClock = clock.NewFakeClock(time.Now())
-		//queue = workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter())
 	})
 
 	newSource := func(scheduleSpec string) *CronSource {
@@ -91,30 +105,6 @@ var _ = FDescribe("CronSource", func() {
 			Expect(obj.Phase).NotTo(Equal(fakeObjectPhaseCompleted))
 		}
 	})
-
-	//It("should return the oldest object", func() {
-	//	// Every day at 00:00
-	//	scheduleSpec := "0 * * * *"
-	//	source := newSource(scheduleSpec)
-	//
-	//	for i := range 2 {
-	//		namespace := fmt.Sprintf("test-namespace-%d", i)
-	//		for j := range 5 {
-	//			obj := NewFakeObject(fmt.Sprintf("fake-%d", j), namespace)
-	//			obj.Phase = fakeObjectPhaseCompleted
-	//
-	//			Expect(obj.Phase).To(Equal(fakeObjectPhaseCompleted))
-	//			Expect(fakeClient.Create(context.Background(), obj)).To(Succeed())
-	//		}
-	//	}
-	//
-	//	Expect(source.Start(context.Background(), nil, queue)).To(Succeed())
-	//	Expect(queue.Len()).To(Equal(0))
-	//
-	//	fakeClock.Step(time.Hour * 25)
-	//
-	//	Eventually(queue.Len()).WithTimeout(10 * time.Second).Should(Equal(20))
-	//})
 })
 
 func spawnFakeObjects(countNamespaces, countPerNamespace int, phase string, client client.Client) {

images/virtualization-artifact/pkg/controller/gc/fake.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2025 Flant JSC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package gc
 
 import (

images/virtualization-artifact/pkg/controller/gc/filter.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2025 Flant JSC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package gc
 
 import (

images/virtualization-artifact/pkg/controller/gc/suite_test.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2025 Flant JSC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package gc
 
 import (

images/virtualization-artifact/pkg/controller/vm/gc.go

@@ -93,14 +93,12 @@ func (m *vmimGCManager) ListForDelete(ctx context.Context) ([]client.Object, err
 
 	objs := make([]client.Object, 0, len(vmimList.Items))
 	for _, vmim := range vmimList.Items {
-		if m.ShouldBeDeleted(&vmim) {
-			objs = append(objs, &vmim)
-		}
+		objs = append(objs, &vmim)
 	}
-	objs = gc.ExpiredFilter(objs, m.ttl)
-	objs = gc.MaxByIndexFilter(objs, m.getIndex, m.max)
 
-	return objs, nil
+	result := gc.DefaultFilter(objs, m.ShouldBeDeleted, m.ttl, m.getIndex, m.max)
+
+	return result, nil
 }
 
 func (m *vmimGCManager) getIndex(obj client.Object) string {

images/virtualization-artifact/pkg/controller/vmop/gc.go

@@ -94,14 +94,12 @@ func (m *vmopGCManager) ListForDelete(ctx context.Context) ([]client.Object, err
 
 	objs := make([]client.Object, 0, len(vmopList.Items))
 	for _, vmop := range vmopList.Items {
-		if m.ShouldBeDeleted(&vmop) {
-			objs = append(objs, &vmop)
-		}
+		objs = append(objs, &vmop)
 	}
-	objs = gc.ExpiredFilter(objs, m.ttl)
-	objs = gc.MaxByIndexFilter(objs, m.getIndex, m.max)
 
-	return objs, nil
+	result := gc.DefaultFilter(objs, m.ShouldBeDeleted, m.ttl, m.getIndex, m.max)
+
+	return result, nil
 }
 
 func (m *vmopGCManager) getIndex(obj client.Object) string {