scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-01 18:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fetch hostIP at runtime since status manager didn't update it yet

Browse Source
This commit is contained in:
andrewsykim
2017-03-18 22:38:38 -04:00
parent 824d0b11cb
commit c001deed43
11 changed files with 64 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/kubelet_pods_test.go
View File

@@ -187,7 +187,7 @@ func TestGenerateRunContainerOptions_DNSConfigurationParams(t *testing.T) {
options := make([]*kubecontainer.RunContainerOptions, 4)
for i, pod := range pods {
var err error
options[i], _, err = kubelet.GenerateRunContainerOptions(pod, &v1.Container{}, "")
options[i], _, err = kubelet.GenerateRunContainerOptions(pod, &v1.Container{}, "", "")
if err != nil {
t.Fatalf("failed to generate container options: %v", err)
}
@@ -220,7 +220,7 @@ func TestGenerateRunContainerOptions_DNSConfigurationParams(t *testing.T) {
kubelet.resolverConfig = "/etc/resolv.conf"
for i, pod := range pods {
var err error
options[i], _, err = kubelet.GenerateRunContainerOptions(pod, &v1.Container{}, "")
options[i], _, err = kubelet.GenerateRunContainerOptions(pod, &v1.Container{}, "", "")
if err != nil {
t.Fatalf("failed to generate container options: %v", err)
}
@@ -1152,13 +1152,11 @@ func TestMakeEnvironmentVariables(t *testing.T) {
ServiceAccountName: "special",
NodeName: "node-name",
},
Status: v1.PodStatus{
HostIP: "5.6.7.8",
},
}
podIP := "1.2.3.4"
hostIP := "5.6.7.8"
result, err := kl.makeEnvironmentVariables(testPod, tc.container, podIP)
result, err := kl.makeEnvironmentVariables(testPod, tc.container, podIP, hostIP)
select {
case e := <-fakeRecorder.Events:
assert.Equal(t, tc.expectedEvent, e)