github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kubelet: DRA: update manager test to adhere to new claiminfo cache APIs

Browse Source 
Signed-off-by: Kevin Klues <kklues@nvidia.com>
This commit is contained in:
Kevin Klues
2024-04-30 11:12:55 +00:00
parent 805e7c3434
commit 86a18d5333
1 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
pkg/kubelet/cm/dra/manager_test.go
View File

@@ -31,6 +31,7 @@ import (
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
resourcev1alpha2 "k8s.io/api/resource/v1alpha2" resourcev1alpha2 "k8s.io/api/resource/v1alpha2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"
"k8s.io/dynamic-resource-allocation/resourceclaim" "k8s.io/dynamic-resource-allocation/resourceclaim"
@@ -789,7 +790,7 @@ func TestPrepareResources(t *testing.T) {
DriverName: driverName, DriverName: driverName,
Allocation: &resourcev1alpha2.AllocationResult{ Allocation: &resourcev1alpha2.AllocationResult{
ResourceHandles: []resourcev1alpha2.ResourceHandle{ ResourceHandles: []resourcev1alpha2.ResourceHandle{
{Data: "test-data"}, {Data: "test-data", DriverName: driverName},
}, },
}, },
ReservedFor: []resourcev1alpha2.ResourceClaimConsumerReference{ ReservedFor: []resourcev1alpha2.ResourceClaimConsumerReference{
@@ -839,16 +840,13 @@ func TestPrepareResources(t *testing.T) {
}, },
claimInfo: &ClaimInfo{ claimInfo: &ClaimInfo{
ClaimInfoState: state.ClaimInfoState{ ClaimInfoState: state.ClaimInfoState{
DriverName: driverName, DriverName: driverName,
ClassName: "test-class", ClassName: "test-class",
ClaimName: "test-pod-claim", ClaimName: "test-pod-claim",
ClaimUID: "test-reserved", ClaimUID: "test-reserved",
Namespace: "test-namespace", Namespace: "test-namespace",
PodUIDs: sets.Set[string]{"test-reserved": sets.Empty{}}, PodUIDs: sets.Set[string]{"test-reserved": sets.Empty{}},
CDIDevices: map[string][]string{ ResourceHandles: []resourcev1alpha2.ResourceHandle{{Data: "test-data", DriverName: driverName}},
driverName: {fmt.Sprintf("%s/%s=some-device", driverName, driverClassName)},
},
ResourceHandles: []resourcev1alpha2.ResourceHandle{{Data: "test-data"}},
}, },
annotations: make(map[string][]kubecontainer.Annotation), annotations: make(map[string][]kubecontainer.Annotation),
prepared: false, prepared: false,
@@ -866,7 +864,7 @@ func TestPrepareResources(t *testing.T) {
DriverName: driverName, DriverName: driverName,
Allocation: &resourcev1alpha2.AllocationResult{ Allocation: &resourcev1alpha2.AllocationResult{
ResourceHandles: []resourcev1alpha2.ResourceHandle{ ResourceHandles: []resourcev1alpha2.ResourceHandle{
{Data: "test-data"}, {Data: "test-data", DriverName: driverName},
}, },
}, },
ReservedFor: []resourcev1alpha2.ResourceClaimConsumerReference{ ReservedFor: []resourcev1alpha2.ResourceClaimConsumerReference{
@@ -940,8 +938,8 @@ func TestPrepareResources(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
claimInfo := manager.cache.get(*claimName, test.pod.Namespace) claimInfo, ok := manager.cache.get(*claimName, test.pod.Namespace)
if claimInfo == nil { if !ok {
t.Fatalf("claimInfo not found in cache for claim %s", *claimName) t.Fatalf("claimInfo not found in cache for claim %s", *claimName)
} }
if claimInfo.DriverName != test.resourceClaim.Status.DriverName { if claimInfo.DriverName != test.resourceClaim.Status.DriverName {
@@ -1316,8 +1314,7 @@ func TestUnprepareResources(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
claimInfo := manager.cache.get(*claimName, test.pod.Namespace) if manager.cache.contains(*claimName, test.pod.Namespace) {
if claimInfo != nil {
t.Fatalf("claimInfo still found in cache after calling UnprepareResources") t.Fatalf("claimInfo still found in cache after calling UnprepareResources")
} }
}) })
@@ -1337,16 +1334,20 @@ func TestPodMightNeedToUnprepareResources(t *testing.T) {
cache: cache, cache: cache,
} }
podUID := sets.Set[string]{} claimName := "test-claim"
podUID.Insert("test-pod-uid") podUID := "test-pod-uid"
manager.cache.add(&ClaimInfo{ namespace := "test-namespace"
ClaimInfoState: state.ClaimInfoState{PodUIDs: podUID, ClaimName: "test-claim", Namespace: "test-namespace"},
})
testClaimInfo := manager.cache.get("test-claim", "test-namespace") claimInfo := &ClaimInfo{
testClaimInfo.addPodReference("test-pod-uid") ClaimInfoState: state.ClaimInfoState{PodUIDs: sets.New(podUID), ClaimName: claimName, Namespace: namespace},
}
manager.PodMightNeedToUnprepareResources("test-pod-uid") manager.cache.add(claimInfo)
if !manager.cache.contains(claimName, namespace) {
t.Fatalf("failed to get claimInfo from cache for claim name %s, namespace %s: err:%v", claimName, namespace, err)
}
claimInfo.addPodReference(types.UID(podUID))
needsUnprepare := manager.PodMightNeedToUnprepareResources(types.UID(podUID))
assert.True(t, needsUnprepare)
} }
func TestGetContainerClaimInfos(t *testing.T) { func TestGetContainerClaimInfos(t *testing.T) {