Skip to content

Commit 19fea74

Browse files
committed
gpu/rm: move to fake.NewClientSet()
k8s v1.32 client-go makes FakePods private so the current resourcemanager fake client won't work anymore. client-go provides a simple fake Client that works easily so just move to use it. Signed-off-by: Mikko Ylinen <[email protected]>
1 parent 03d4222 commit 19fea74

File tree

1 file changed

+9
-34
lines changed

1 file changed

+9
-34
lines changed

cmd/gpu_plugin/rm/gpu_plugin_resource_manager_test.go

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -27,42 +27,10 @@ import (
2727
"k8s.io/apimachinery/pkg/api/resource"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/client-go/kubernetes/fake"
30-
corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
31-
fakecorev1 "k8s.io/client-go/kubernetes/typed/core/v1/fake"
3230
"k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
3331
podresourcesv1 "k8s.io/kubelet/pkg/apis/podresources/v1"
3432
)
3533

36-
// mockClient implements enough of k8s API for the resource manager tests.
37-
type mockClient struct {
38-
fake.Clientset
39-
mockCoreV1
40-
}
41-
42-
func (m *mockClient) CoreV1() corev1.CoreV1Interface {
43-
return m
44-
}
45-
46-
type mockCoreV1 struct {
47-
fakecorev1.FakeCoreV1
48-
mockPods
49-
}
50-
51-
func (m *mockCoreV1) Pods(namespace string) corev1.PodInterface {
52-
return m
53-
}
54-
55-
type mockPods struct {
56-
fakecorev1.FakePods
57-
pods []v1.Pod
58-
}
59-
60-
func (m *mockPods) List(ctx context.Context, opts metav1.ListOptions) (*v1.PodList, error) {
61-
return &v1.PodList{
62-
Items: m.pods,
63-
}, nil
64-
}
65-
6634
type mockPodResources struct {
6735
pods []v1.Pod
6836
}
@@ -99,8 +67,15 @@ func newMockResourceManager(pods []v1.Pod) ResourceManager {
9967
os.Exit(1)
10068
}
10169

102-
mc := &mockClient{}
103-
mc.mockCoreV1.mockPods.pods = pods
70+
mc := fake.NewClientset()
71+
72+
for _, p := range pods {
73+
_, err = mc.CoreV1().Pods(p.Namespace).Create(context.Background(), &p, metav1.CreateOptions{})
74+
if err != nil {
75+
fmt.Printf("failed to Create Pod: %v\n", err)
76+
}
77+
}
78+
10479
rm := resourceManager{
10580
clientset: mc,
10681
nodeName: "TestNode",

0 commit comments

Comments
 (0)