github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Fix flake in pod IP as env var e2e

Browse Source
This commit is contained in:
Paul Morie
2016-03-07 15:24:08 -05:00
parent 09f00aeb32
commit 5194c12d9e
7 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/kubelet_test.go
View File

@@ -728,7 +728,7 @@ func TestMakeVolumeMounts(t *testing.T) {
},
}
mounts, _ := makeMounts(&pod, "/pod", &container, "fakepodname", "", podVolumes)
mounts, _ := makeMounts(&pod, "/pod", &container, "fakepodname", "", "", podVolumes)
expectedMounts := []kubecontainer.Mount{
{
@@ -1189,7 +1189,7 @@ func TestDNSConfigurationParams(t *testing.T) {
for i, pod := range pods {
var err error
kubelet.volumeManager.SetVolumes(pod.UID, make(kubecontainer.VolumeMap, 0))
options[i], err = kubelet.GenerateRunContainerOptions(pod, &api.Container{})
options[i], err = kubelet.GenerateRunContainerOptions(pod, &api.Container{}, "")
if err != nil {
t.Fatalf("failed to generate container options: %v", err)
}
@@ -1210,7 +1210,7 @@ func TestDNSConfigurationParams(t *testing.T) {
kubelet.resolverConfig = "/etc/resolv.conf"
for i, pod := range pods {
var err error
options[i], err = kubelet.GenerateRunContainerOptions(pod, &api.Container{})
options[i], err = kubelet.GenerateRunContainerOptions(pod, &api.Container{}, "")
if err != nil {
t.Fatalf("failed to generate container options: %v", err)
}
@@ -1715,9 +1715,9 @@ func TestMakeEnvironmentVariables(t *testing.T) {
Name: "dapi-test-pod-name",
},
}
testPod.Status.PodIP = "1.2.3.4"
podIP := "1.2.3.4"
result, err := kl.makeEnvironmentVariables(testPod, tc.container)
result, err := kl.makeEnvironmentVariables(testPod, tc.container, podIP)
if err != nil {
t.Errorf("[%v] Unexpected error: %v", tc.name, err)
}