github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Update kubelet package on latest go-dockerclient package.

Browse Source
This commit is contained in:
Dawn Chen 2014-12-18 11:15:35 -08:00
parent 95e3efdad8
commit 608c3d5046
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/dockertools/docker.go
View File

@ -182,7 +182,7 @@ func (d *dockerContainerCommandRunner) RunInContainer(containerID string, cmd []
} }
errChan := make(chan error, 1) errChan := make(chan error, 1)
go func() { go func() {
errChan <- d.client.StartExec(execObj.Id, startOpts) errChan <- d.client.StartExec(execObj.ID, startOpts)
}() }()
wrBuf.Flush() wrBuf.Flush()
return buf.Bytes(), <-errChan return buf.Bytes(), <-errChan

4
pkg/kubelet/kubelet.go
View File

@ -358,7 +358,7 @@ func makePortsAndBindings(container *api.Container) (map[docker.Port]struct{}, m
portBindings[dockerPort] = []docker.PortBinding{ portBindings[dockerPort] = []docker.PortBinding{
{ {
HostPort: strconv.Itoa(exteriorPort), HostPort: strconv.Itoa(exteriorPort),
HostIp: port.HostIP, HostIP: port.HostIP,
}, },
} }
} }
@ -501,7 +501,7 @@ func (kl *Kubelet) runContainer(pod *api.BoundPod, container *api.Container, pod
Hostname: pod.Name, Hostname: pod.Name,
Image: container.Image, Image: container.Image,
Memory: int64(container.Memory), Memory: int64(container.Memory),
CpuShares: int64(milliCPUToShares(container.CPU)), CPUShares: int64(milliCPUToShares(container.CPU)),
WorkingDir: container.WorkingDir, WorkingDir: container.WorkingDir,
}, },
} }

16
pkg/kubelet/kubelet_test.go
View File

@ -895,29 +895,29 @@ func TestMakePortsAndBindings(t *testing.T) {
if !reflect.DeepEqual(docker.Port("80/tcp"), key) { if !reflect.DeepEqual(docker.Port("80/tcp"), key) {
t.Errorf("Unexpected docker port: %#v", key) t.Errorf("Unexpected docker port: %#v", key)
} }
if value[0].HostIp != "127.0.0.1" { if value[0].HostIP != "127.0.0.1" {
t.Errorf("Unexpected host IP: %s", value[0].HostIp) t.Errorf("Unexpected host IP: %s", value[0].HostIP)
} }
case "443": case "443":
if !reflect.DeepEqual(docker.Port("443/tcp"), key) { if !reflect.DeepEqual(docker.Port("443/tcp"), key) {
t.Errorf("Unexpected docker port: %#v", key) t.Errorf("Unexpected docker port: %#v", key)
} }
if value[0].HostIp != "" { if value[0].HostIP != "" {
t.Errorf("Unexpected host IP: %s", value[0].HostIp) t.Errorf("Unexpected host IP: %s", value[0].HostIP)
} }
case "444": case "444":
if !reflect.DeepEqual(docker.Port("444/udp"), key) { if !reflect.DeepEqual(docker.Port("444/udp"), key) {
t.Errorf("Unexpected docker port: %#v", key) t.Errorf("Unexpected docker port: %#v", key)
} }
if value[0].HostIp != "" { if value[0].HostIP != "" {
t.Errorf("Unexpected host IP: %s", value[0].HostIp) t.Errorf("Unexpected host IP: %s", value[0].HostIP)
} }
case "445": case "445":
if !reflect.DeepEqual(docker.Port("445/tcp"), key) { if !reflect.DeepEqual(docker.Port("445/tcp"), key) {
t.Errorf("Unexpected docker port: %#v", key) t.Errorf("Unexpected docker port: %#v", key)
} }
if value[0].HostIp != "" { if value[0].HostIP != "" {
t.Errorf("Unexpected host IP: %s", value[0].HostIp) t.Errorf("Unexpected host IP: %s", value[0].HostIP)
} }
} }
} }