Skip to content

chore(core): add indexers for slowest client.List operations #1641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

chore(core): add indexers for slowest client.List operations #1641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
653945f
feat(core): add indexers for slowest client.List operations
danilrwx Oct 30, 2025
40cabe4
fix tests
danilrwx Nov 1, 2025
b735839
Merge branch 'main' into feat/core/add-indexers-for-list-handlers
danilrwx Nov 5, 2025
63cb6c9
try to fix e2e
danilrwx Nov 6, 2025
a143866
fix vmip
danilrwx Nov 6, 2025
fdccc70
test without
danilrwx Nov 6, 2025
59b7fc8
test again
danilrwx Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions images/virtualization-artifact/pkg/controller/indexer/indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const (
IndexFieldVMByVD = "spec.blockDeviceRefs.VirtualDisk"
IndexFieldVMByVI = "spec.blockDeviceRefs.VirtualImage"
IndexFieldVMByCVI = "spec.blockDeviceRefs.ClusterVirtualImage"
IndexFieldVMByIP = "status.ipAddress"
IndexFieldVMByNode = "status.node"

IndexFieldVDByVDSnapshot = "vd,spec.DataSource.ObjectRef.Name,.Kind=VirtualDiskSnapshot"
Expand Down Expand Up @@ -64,6 +65,7 @@ var IndexGetters = []IndexGetter{
IndexVMByVD,
IndexVMByVI,
IndexVMByCVI,
IndexVMByIP,
IndexVMByNode,
IndexVMSnapshotByVM,
IndexVMSnapshotByVDSnapshot,
Expand Down Expand Up @@ -121,6 +123,16 @@ func IndexVMByCVI() (obj client.Object, field string, extractValue client.Indexe
}
}

func IndexVMByIP() (obj client.Object, field string, extractValue client.IndexerFunc) {
return &v1alpha2.VirtualMachine{}, IndexFieldVMByIP, func(object client.Object) []string {
vm, ok := object.(*v1alpha2.VirtualMachine)
if !ok || vm == nil || vm.Status.IPAddress == "" {
return nil
}
return []string{vm.Status.IPAddress}
}
}

func IndexVMByNode() (obj client.Object, field string, extractValue client.IndexerFunc) {
return &v1alpha2.VirtualMachine{}, IndexFieldVMByNode, func(object client.Object) []string {
vm, ok := object.(*v1alpha2.VirtualMachine)
Expand Down
5 changes: 4 additions & 1 deletion images/virtualization-artifact/pkg/controller/vd/internal/inuse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
virtv1 "kubevirt.io/api/core/v1"
Expand All @@ -33,6 +34,7 @@ import (
"github.com/deckhouse/virtualization-controller/pkg/common/object"
commonvd "github.com/deckhouse/virtualization-controller/pkg/common/vd"
"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
"github.com/deckhouse/virtualization-controller/pkg/controller/indexer"
"github.com/deckhouse/virtualization/api/core/v1alpha2"
"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
)
Expand Down Expand Up @@ -153,7 +155,8 @@ func (h InUseHandler) checkImageUsage(ctx context.Context, vd *v1alpha2.VirtualD
func (h InUseHandler) updateAttachedVirtualMachines(ctx context.Context, vd *v1alpha2.VirtualDisk) error {
var vms v1alpha2.VirtualMachineList
err := h.client.List(ctx, &vms, &client.ListOptions{
Namespace: vd.GetNamespace(),
Namespace: vd.Namespace,
FieldSelector: fields.OneTermEqualSelector(indexer.IndexFieldVMByVD, vd.Name),
})
if err != nil {
return fmt.Errorf("error getting virtual machines: %w", err)
Expand Down
52 changes: 35 additions & 17 deletions images/virtualization-artifact/pkg/controller/vd/internal/inuse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
virtv1 "kubevirt.io/api/core/v1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
"github.com/deckhouse/virtualization-controller/pkg/common/testutil"
"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
"github.com/deckhouse/virtualization/api/core/v1alpha2"
"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
Expand Down Expand Up @@ -150,7 +150,8 @@ var _ = Describe("InUseHandler", func() {
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vm, vm2, vm3).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vm, vm2, vm3)
Expect(err).ToNot(HaveOccurred())
handler = &InUseHandler{client: k8sClient}

result, err := handler.Handle(ctx, vd)
Expand Down Expand Up @@ -215,7 +216,9 @@ var _ = Describe("InUseHandler", func() {
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vm).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vm)
Expect(err).ToNot(HaveOccurred())

handler = &InUseHandler{client: k8sClient}

result, err := handler.Handle(ctx, vd)
Expand Down Expand Up @@ -243,7 +246,8 @@ var _ = Describe("InUseHandler", func() {
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd)
Expect(err).ToNot(HaveOccurred())
handler = &InUseHandler{client: k8sClient}

result, err := handler.Handle(ctx, vd)
Expand Down Expand Up @@ -272,7 +276,9 @@ var _ = Describe("InUseHandler", func() {
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd)
Expect(err).ToNot(HaveOccurred())

handler = &InUseHandler{client: k8sClient}

result, err := handler.Handle(ctx, vd)
Expand Down Expand Up @@ -300,7 +306,8 @@ var _ = Describe("InUseHandler", func() {
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd)
Expect(err).ToNot(HaveOccurred())
handler = NewInUseHandler(k8sClient)

result, err := handler.Handle(ctx, vd)
Expand Down Expand Up @@ -331,7 +338,8 @@ var _ = Describe("InUseHandler", func() {
}
vd.Generation = 3

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd)
Expect(err).ToNot(HaveOccurred())
handler = NewInUseHandler(k8sClient)

result, err := handler.Handle(ctx, vd)
Expand Down Expand Up @@ -380,7 +388,8 @@ var _ = Describe("InUseHandler", func() {
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vm).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vm)
Expect(err).ToNot(HaveOccurred())
handler = NewInUseHandler(k8sClient)

result, err := handler.Handle(ctx, vd)
Expand Down Expand Up @@ -431,7 +440,8 @@ var _ = Describe("InUseHandler", func() {
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vm).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vm)
Expect(err).ToNot(HaveOccurred())
handler = NewInUseHandler(k8sClient)

result, err := handler.Handle(ctx, vd)
Expand Down Expand Up @@ -477,7 +487,8 @@ var _ = Describe("InUseHandler", func() {
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vi).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vi)
Expect(err).ToNot(HaveOccurred())
handler = NewInUseHandler(k8sClient)

result, err := handler.Handle(ctx, vd)
Expand Down Expand Up @@ -525,7 +536,8 @@ var _ = Describe("InUseHandler", func() {
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, cvi).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd, cvi)
Expect(err).ToNot(HaveOccurred())
handler = NewInUseHandler(k8sClient)

result, err := handler.Handle(ctx, vd)
Expand Down Expand Up @@ -587,7 +599,8 @@ var _ = Describe("InUseHandler", func() {
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vi, vm).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vi, vm)
Expect(err).ToNot(HaveOccurred())
handler = NewInUseHandler(k8sClient)

result, err := handler.Handle(ctx, vd)
Expand Down Expand Up @@ -635,7 +648,8 @@ var _ = Describe("InUseHandler", func() {
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vm).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vm)
Expect(err).ToNot(HaveOccurred())
handler = NewInUseHandler(k8sClient)

result, err := handler.Handle(ctx, vd)
Expand Down Expand Up @@ -688,7 +702,8 @@ var _ = Describe("InUseHandler", func() {
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vi).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vi)
Expect(err).ToNot(HaveOccurred())
handler = NewInUseHandler(k8sClient)

result, err := handler.Handle(ctx, vd)
Expand Down Expand Up @@ -720,7 +735,8 @@ var _ = Describe("InUseHandler", func() {
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd)
Expect(err).ToNot(HaveOccurred())
handler = NewInUseHandler(k8sClient)

result, err := handler.Handle(ctx, vd)
Expand Down Expand Up @@ -752,7 +768,8 @@ var _ = Describe("InUseHandler", func() {
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd)
Expect(err).ToNot(HaveOccurred())
handler = NewInUseHandler(k8sClient)

result, err := handler.Handle(ctx, vd)
Expand Down Expand Up @@ -792,7 +809,8 @@ var _ = Describe("InUseHandler", func() {
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, pvc).Build()
k8sClient, err := testutil.NewFakeClientWithObjects(vd, pvc)
Expect(err).ToNot(HaveOccurred())
handler = NewInUseHandler(k8sClient)

result, err := handler.Handle(ctx, vd)
Expand Down
7 changes: 6 additions & 1 deletion images/virtualization-artifact/pkg/controller/vmip/internal/attached_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@ import (

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
"github.com/deckhouse/virtualization-controller/pkg/common/object"
"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
"github.com/deckhouse/virtualization-controller/pkg/controller/indexer"
"github.com/deckhouse/virtualization-controller/pkg/eventrecord"
"github.com/deckhouse/virtualization/api/core/v1alpha2"
"github.com/deckhouse/virtualization/api/core/v1alpha2/vmipcondition"
Expand Down Expand Up @@ -83,7 +85,10 @@ func (h *AttachedHandler) Handle(ctx context.Context, vmip *v1alpha2.VirtualMach

func (h *AttachedHandler) getAttachedVirtualMachine(ctx context.Context, vmip *v1alpha2.VirtualMachineIPAddress) (*v1alpha2.VirtualMachine, error) {
var vms v1alpha2.VirtualMachineList
err := h.client.List(ctx, &vms, &client.ListOptions{Namespace: vmip.Namespace})
err := h.client.List(ctx, &vms, &client.ListOptions{
Namespace: vmip.Namespace,
FieldSelector: fields.OneTermEqualSelector(indexer.IndexFieldVMByIP, vmip.Status.Address),
})
if err != nil {
return nil, fmt.Errorf("list vms: %w", err)
}
Expand Down
Loading