simplify DomainInfo struct

Author: enoodle

internal/compute-domain-dra-plugin/cdi_test.go

@@ -24,7 +24,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"k8s.io/apimachinery/pkg/types"
 	drapbv1 "k8s.io/kubelet/pkg/apis/dra/v1beta1"
 
 	cdiparser "tags.cncf.io/container-device-interface/pkg/parser"
@@ -209,14 +208,8 @@ func TestComputeDomainCDIHandler_CreateDomainCDIDevice(t *testing.T) {
 	require.NoError(t, err)
 
 	domainInfo := &DomainInfo{
-		DomainID:          "test-domain-id",
-		ComputeDomainName: "test-domain",
-		ComputeDomainUID:  types.UID("test-uid"),
-		Nodes:             []string{"node1", "node2"},
-		Pods: []types.NamespacedName{
-			{Name: "pod1", Namespace: "default"},
-		},
-		Claims: []string{"claim-uid"},
+		DomainID: "test-domain-id",
+		Claims:   []string{"claim-uid"},
 	}
 
 	edits, err := handler.CreateDomainCDIDevice(domainInfo)

internal/compute-domain-dra-plugin/checkpoint_test.go

@@ -19,12 +19,10 @@ package computedomaindraplugin
 import (
 	"encoding/json"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"k8s.io/apimachinery/pkg/types"
 	drapbv1 "k8s.io/kubelet/pkg/apis/dra/v1beta1"
 	"k8s.io/kubernetes/pkg/kubelet/checkpointmanager/checksum"
 )
@@ -116,13 +114,8 @@ func TestComputeDomainCheckpointV1_Domains(t *testing.T) {
 	checkpoint := newComputeDomainCheckpoint()
 
 	domainInfo := &DomainInfo{
-		DomainID:          "test-domain-id",
-		ComputeDomainName: "test-domain",
-		ComputeDomainUID:  types.UID("test-uid"),
-		Nodes:             []string{"node1"},
-		Pods:              []types.NamespacedName{{Name: "pod1", Namespace: "default"}},
-		Claims:            []string{"claim-uid"},
-		CreatedAt:         time.Now(),
+		DomainID: "test-domain-id",
+		Claims:   []string{"claim-uid"},
 	}
 
 	checkpoint.V1.Domains["test-domain-id"] = domainInfo

internal/compute-domain-dra-plugin/nvcdi_device_test.go

@@ -7,8 +7,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	"k8s.io/apimachinery/pkg/types"
 )
 
 func TestComputeDomainNvcdiDevice(t *testing.T) {
@@ -19,9 +17,8 @@ func TestComputeDomainNvcdiDevice(t *testing.T) {
 	require.NoError(t, err)
 
 	info := &DomainInfo{
-		DomainID:          "domain-123",
-		ComputeDomainName: "demo",
-		ComputeDomainUID:  types.UID("uid-123"),
+		DomainID: "domain-123",
+		Claims:   []string{},
 	}
 
 	edits, err := device.ContainerEdits(info)

internal/compute-domain-dra-plugin/state.go

@@ -19,12 +19,10 @@ package computedomaindraplugin
 import (
 	"encoding/json"
 	"fmt"
-	"slices"
 	"sync"
 	"time"
 
 	resourceapi "k8s.io/api/resource/v1"
-	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog/v2"
 	drapbv1 "k8s.io/kubelet/pkg/apis/dra/v1beta1"
 	"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
@@ -51,13 +49,9 @@ func (pds ComputeDomainPreparedDevices) GetDevices() []*drapbv1.Device {
 }
 
 type DomainInfo struct {
-	DomainID          string
-	ComputeDomainName string
-	ComputeDomainUID  types.UID
-	Nodes             []string
-	Pods              []types.NamespacedName
-	Claims            []string // ResourceClaim UIDs
-	CreatedAt         time.Time
+	DomainID  string
+	Claims    []string // ResourceClaim UIDs
+	CreatedAt time.Time
 }
 
 type ComputeDomainState struct {
@@ -242,7 +236,7 @@ func (s *ComputeDomainState) Unprepare(claimUID string) error {
 		for i, claim := range domainInfo.Claims {
 			if claim == claimUID {
 				domainInfo.Claims = append(domainInfo.Claims[:i], domainInfo.Claims[i+1:]...)
-				if len(domainInfo.Claims) == 0 && len(domainInfo.Pods) == 0 {
+				if len(domainInfo.Claims) == 0 {
 					delete(domains, domainID)
 				}
 				break
@@ -297,21 +291,14 @@ func (s *ComputeDomainState) getOrCreateDomain(domains map[string]*DomainInfo, c
 	// Check if domain already exists
 	if domainInfo, exists := domains[computeDomainID]; exists {
 		domainInfo.Claims = append(domainInfo.Claims, string(claim.UID))
-		if !slices.Contains(domainInfo.Nodes, s.nodeName) {
-			domainInfo.Nodes = append(domainInfo.Nodes, s.nodeName)
-		}
 		return computeDomainID
 	}
 
 	// Create new domain
 	domainInfo := &DomainInfo{
-		DomainID:          computeDomainID,
-		ComputeDomainName: computeDomainID, // Use domainID as name
-		ComputeDomainUID:  types.UID(computeDomainID),
-		Nodes:             []string{s.nodeName},
-		Pods:              []types.NamespacedName{},
-		Claims:            []string{string(claim.UID)},
-		CreatedAt:         time.Now(),
+		DomainID:  computeDomainID,
+		Claims:    []string{string(claim.UID)},
+		CreatedAt: time.Now(),
 	}
 
 	domains[computeDomainID] = domainInfo

internal/compute-domain-dra-plugin/state_test.go

@@ -73,21 +73,11 @@ func TestComputeDomainPreparedDevicesGetDevices(t *testing.T) {
 
 func TestDomainInfo(t *testing.T) {
 	domainInfo := &DomainInfo{
-		DomainID:          "test-domain-id",
-		ComputeDomainName: "test-domain",
-		ComputeDomainUID:  types.UID("test-uid"),
-		Nodes:             []string{"node1", "node2"},
-		Pods: []types.NamespacedName{
-			{Name: "pod1", Namespace: "default"},
-			{Name: "pod2", Namespace: "default"},
-		},
-		Claims: []string{"claim-uid-1", "claim-uid-2"},
+		DomainID: "test-domain-id",
+		Claims:   []string{"claim-uid-1", "claim-uid-2"},
 	}
 
 	assert.Equal(t, "test-domain-id", domainInfo.DomainID)
-	assert.Equal(t, "test-domain", domainInfo.ComputeDomainName)
-	assert.Len(t, domainInfo.Nodes, 2)
-	assert.Len(t, domainInfo.Pods, 2)
 	assert.Len(t, domainInfo.Claims, 2)
 }