Permalink
Browse files

Merge pull request #73586 from carlo-colombo/automated-cherry-pick-of…

…-#72965-upstream-release-1.13

Automated cherry pick of #72965: Use actual node hostname during test "EmptyDir Wrapper
  • Loading branch information...
k8s-ci-robot committed Feb 1, 2019
2 parents f305cd8 + 7faf826 commit 721bfa751924da8d1680787490c54b9179b1fed0
Showing with 4 additions and 2 deletions.
  1. +4 −2 test/e2e/storage/empty_dir_wrapper.go
@@ -343,6 +343,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))
@@ -356,9 +358,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]},
},
},
},

0 comments on commit 721bfa7

Please sign in to comment.