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

Convert volume.TestConfig to use NodeSelection

Browse Source 
Change-Id: I6adbb53b65e4a4f7e220fc0d91a26dc6bc135c36
This commit is contained in:
Michelle Au
2020-02-11 21:01:16 -08:00
parent 76a4a34dae
commit d9184b75c9
6 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/storage/drivers/in_tree.go
View File

@@ -442,7 +442,7 @@ func (i *iSCSIDriver) CreateVolume(config *testsuites.PerTestConfig, volType tes
c, serverPod, serverIP, iqn := newISCSIServer(cs, ns.Name)
config.ServerConfig = &c
config.ClientNodeSelection = e2epod.NodeSelection{Name: c.ClientNodeName}
config.ClientNodeSelection = c.ClientNodeSelection
return &iSCSIVolume{
serverPod: serverPod,
serverIP: serverIP,
@@ -473,7 +473,7 @@ func newISCSIServer(cs clientset.Interface, namespace string) (config volume.Tes
}
pod, ip = volume.CreateStorageServer(cs, config)
// Make sure the client runs on the same node as server so we don't need to open any firewalls.
config.ClientNodeName = pod.Spec.NodeName
config.ClientNodeSelection = e2epod.NodeSelection{Name: pod.Spec.NodeName}
return config, pod, ip, iqn
}