github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

use actual hostname in NodeSelector for network test Pod

Browse Source
This commit is contained in:
Dan Gillespie 2017-06-07 13:51:24 -07:00
parent 783b940c30
commit fa67fdea1e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/framework/networking_utils.go
View File

@ -308,7 +308,7 @@ func (config *NetworkingTestConfig) GetSelfURL(port int32, path string, expected
} }
} }
func (config *NetworkingTestConfig) createNetShellPodSpec(podName string, node string) *v1.Pod { func (config *NetworkingTestConfig) createNetShellPodSpec(podName, hostname string) *v1.Pod {
probe := &v1.Probe{ probe := &v1.Probe{
InitialDelaySeconds: 10, InitialDelaySeconds: 10,
TimeoutSeconds: 30, TimeoutSeconds: 30,
@ -358,7 +358,7 @@ func (config *NetworkingTestConfig) createNetShellPodSpec(podName string, node s
}, },
}, },
NodeSelector: map[string]string{ NodeSelector: map[string]string{
"kubernetes.io/hostname": node, "kubernetes.io/hostname": hostname,
}, },
}, },
} }
@ -539,7 +539,8 @@ func (config *NetworkingTestConfig) createNetProxyPods(podName string, selector
createdPods := make([]*v1.Pod, 0, len(nodes)) createdPods := make([]*v1.Pod, 0, len(nodes))
for i, n := range nodes { for i, n := range nodes {
podName := fmt.Sprintf("%s-%d", podName, i) podName := fmt.Sprintf("%s-%d", podName, i)
pod := config.createNetShellPodSpec(podName, n.Name) hostname, _ := n.Labels["kubernetes.io/hostname"]
pod := config.createNetShellPodSpec(podName, hostname)
pod.ObjectMeta.Labels = selector pod.ObjectMeta.Labels = selector
createdPod := config.createPod(pod) createdPod := config.createPod(pod)
createdPods = append(createdPods, createdPod) createdPods = append(createdPods, createdPod)