mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 03:38:15 +00:00 
			
		
		
		
	Merge pull request #116152 from torredil/fix-windows-e2e-test
Add windows nodeSelector to provisioning functions
This commit is contained in:
		@@ -747,8 +747,7 @@ func PVWriteReadSingleNodeCheck(ctx context.Context, client clientset.Interface,
 | 
				
			|||||||
		// agnhost doesn't support mount
 | 
							// agnhost doesn't support mount
 | 
				
			||||||
		command = "grep 'hello world' /mnt/test/data"
 | 
							command = "grep 'hello world' /mnt/test/data"
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	RunInPodWithVolume(ctx, client, timeouts, claim.Namespace, claim.Name, "pvc-volume-tester-reader", command, e2epod.NodeSelection{Name: actualNodeName})
 | 
						RunInPodWithVolume(ctx, client, timeouts, claim.Namespace, claim.Name, "pvc-volume-tester-reader", command, e2epod.NodeSelection{Name: actualNodeName, Selector: node.Selector})
 | 
				
			||||||
 | 
					 | 
				
			||||||
	return e2evolume
 | 
						return e2evolume
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1184,7 +1183,7 @@ func MultiplePVMountSingleNodeCheck(ctx context.Context, client clientset.Interf
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	pod2Config := e2epod.Config{
 | 
						pod2Config := e2epod.Config{
 | 
				
			||||||
		NS:            pvc2.Namespace,
 | 
							NS:            pvc2.Namespace,
 | 
				
			||||||
		NodeSelection: e2epod.NodeSelection{Name: pod1.Spec.NodeName},
 | 
							NodeSelection: e2epod.NodeSelection{Name: pod1.Spec.NodeName, Selector: node.Selector},
 | 
				
			||||||
		PVCs:          []*v1.PersistentVolumeClaim{pvc2},
 | 
							PVCs:          []*v1.PersistentVolumeClaim{pvc2},
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	pod2, err := e2epod.CreateSecPodWithNodeSelection(ctx, client, &pod2Config, timeouts.PodStart)
 | 
						pod2, err := e2epod.CreateSecPodWithNodeSelection(ctx, client, &pod2Config, timeouts.PodStart)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user