Merge pull request #10763 from bprashanth/timer_leak

pkg/kubelet/dockertools/exec.go

@@ -123,7 +123,8 @@ func (*NativeExecHandler) ExecInContainer(client DockerInterface, container *doc
 	if err != nil {
 		return err
 	}
-	tick := time.Tick(2 * time.Second)
+	ticker := time.NewTicker(2 * time.Second)
+	defer ticker.Stop()
 	count := 0
 	for {
 		inspect, err2 := client.InspectExec(execObj.ID)
@@ -143,7 +144,7 @@ func (*NativeExecHandler) ExecInContainer(client DockerInterface, container *doc
 			break
 		}
 
-		<-tick
+		<-ticker.C
 	}
 
 	return err

pkg/kubelet/dockertools/manager.go

@@ -945,7 +945,8 @@ func (dm *DockerManager) RunInContainer(containerID string, cmd []string) ([]byt
 		glog.V(2).Infof("StartExec With error: %v", err)
 		return nil, err
 	}
-	tick := time.Tick(2 * time.Second)
+	ticker := time.NewTicker(2 * time.Second)
+	defer ticker.Stop()
 	for {
 		inspect, err2 := dm.client.InspectExec(execObj.ID)
 		if err2 != nil {
@@ -959,7 +960,7 @@ func (dm *DockerManager) RunInContainer(containerID string, cmd []string) ([]byt
 			}
 			break
 		}
-		<-tick
+		<-ticker.C
 	}
 
 	return buf.Bytes(), err