Unverified Commit 4531ce69 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub

Merge pull request #72965 from mrIncompetent/use-correct-hostname-in-conformance-tests

Use actual node hostname during test "EmptyDir Wrapper Volume, ConfigMap volumes, no race"
parents bab4256e cf7a8935
......@@ -342,6 +342,8 @@ func makeConfigMapVolumes(configMapNames []string) (volumes []v1.Volume, volumeM
}
func testNoWrappedVolumeRace(f *framework.Framework, volumes []v1.Volume, volumeMounts []v1.VolumeMount, podCount int32) {
const nodeHostnameLabelKey = "kubernetes.io/hostname"
rcName := wrappedVolumeRaceRCNamePrefix + string(uuid.NewUUID())
nodeList := framework.GetReadySchedulableNodesOrDie(f.ClientSet)
Expect(len(nodeList.Items)).To(BeNumerically(">", 0))
......@@ -355,9 +357,9 @@ func testNoWrappedVolumeRace(f *framework.Framework, volumes []v1.Volume, volume
{
MatchExpressions: []v1.NodeSelectorRequirement{
{
Key: "kubernetes.io/hostname",
Key: nodeHostnameLabelKey,
Operator: v1.NodeSelectorOpIn,
Values: []string{targetNode.Name},
Values: []string{targetNode.Labels[nodeHostnameLabelKey]},
},
},
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment