Merge pull request #120834 from dzjiang91/fix-panic

Fix panic testing intree vSphere dynamic PV.
This commit is contained in:
Kubernetes Prow Robot 2023-09-28 18:00:40 -07:00 committed by GitHub
commit f599a98205
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -753,13 +753,15 @@ func getUUIDFromProviderID(providerID string) string {
// GetReadySchedulableNodeInfos returns NodeInfo objects for all nodes with Ready and schedulable state
func GetReadySchedulableNodeInfos(ctx context.Context, c clientset.Interface) []*NodeInfo {
nodeList, err := e2enode.GetReadySchedulableNodes(ctx, c)
framework.ExpectNoError(err)
var nodesInfo []*NodeInfo
for _, node := range nodeList.Items {
nodeInfo := TestContext.NodeMapper.GetNodeInfo(node.Name)
if nodeInfo != nil {
nodesInfo = append(nodesInfo, nodeInfo)
if TestContext.NodeMapper != nil {
nodeList, err := e2enode.GetReadySchedulableNodes(ctx, c)
framework.ExpectNoError(err)
for _, node := range nodeList.Items {
nodeInfo := TestContext.NodeMapper.GetNodeInfo(node.Name)
if nodeInfo != nil {
nodesInfo = append(nodesInfo, nodeInfo)
}
}
}
return nodesInfo