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

Make PodResources API include restartable init containers

Browse Source
This commit is contained in:
Gunju Kim
2023-09-17 20:17:58 +09:00
parent 11785bb815
commit dd890b899f
4 changed files with 932 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/e2e_node/device_plugin_test.go
View File

@@ -687,21 +687,21 @@ func testDevicePlugin(f *framework.Framework, pluginSockDir string) {
gomega.Expect(resourcesForOurPod.Name).To(gomega.Equal(pod1.Name))
gomega.Expect(resourcesForOurPod.Namespace).To(gomega.Equal(pod1.Namespace))
// Note that the kubelet does not report resources for restartable
// init containers for now.
// See https://github.com/kubernetes/kubernetes/issues/120501.
// TODO: Fix this test to check the resources allocated to the
// restartable init container once the kubelet reports resources
// for restartable init containers.
gomega.Expect(resourcesForOurPod.Containers).To(gomega.HaveLen(1))
gomega.Expect(resourcesForOurPod.Containers).To(gomega.HaveLen(2))
gomega.Expect(resourcesForOurPod.Containers[0].Name).To(gomega.Equal(pod1.Spec.Containers[0].Name))
gomega.Expect(resourcesForOurPod.Containers[0].Devices).To(gomega.HaveLen(1))
gomega.Expect(resourcesForOurPod.Containers[0].Devices[0].ResourceName).To(gomega.Equal(SampleDeviceResourceName))
gomega.Expect(resourcesForOurPod.Containers[0].Devices[0].DeviceIds).To(gomega.HaveLen(1))
for _, container := range resourcesForOurPod.Containers {
if container.Name == pod1.Spec.InitContainers[1].Name {
gomega.Expect(container.Devices).To(gomega.HaveLen(1))
gomega.Expect(container.Devices[0].ResourceName).To(gomega.Equal(SampleDeviceResourceName))
gomega.Expect(container.Devices[0].DeviceIds).To(gomega.HaveLen(1))
} else if container.Name == pod1.Spec.Containers[0].Name {
gomega.Expect(container.Devices).To(gomega.HaveLen(1))
gomega.Expect(container.Devices[0].ResourceName).To(gomega.Equal(SampleDeviceResourceName))
gomega.Expect(container.Devices[0].DeviceIds).To(gomega.HaveLen(1))
} else {
framework.Failf("unexpected container name: %s", container.Name)
}
}
})
})
}