From cf7a8935af37fc4200a77674c83f33afc0868855 Mon Sep 17 00:00:00 2001 From: mrIncompetent Date: Wed, 16 Jan 2019 14:39:00 +0100 Subject: [PATCH] Use actual node hostname during test "EmptyDir Wrapper Volume, ConfigMap volumes, no race" --- test/e2e/storage/empty_dir_wrapper.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/e2e/storage/empty_dir_wrapper.go b/test/e2e/storage/empty_dir_wrapper.go index 87c3a4fc4c4..d3204aed6a6 100644 --- a/test/e2e/storage/empty_dir_wrapper.go +++ b/test/e2e/storage/empty_dir_wrapper.go @@ -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]}, }, }, },