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

Address comments, and fix some bugs in kubectl.

Browse Source
This commit is contained in:
Brendan Burns
2015-09-01 20:54:10 -07:00
parent 7f4bca80ba
commit 682c68c2fb
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/kubectl/cmd/run.go
View File

@@ -239,14 +239,15 @@ func Run(f *cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer, cmd *cob
return nil
}
func waitForPodRunning(c *client.Client, pod *api.Pod, out io.Writer) error {
func waitForPodRunning(c *client.Client, pod *api.Pod, out io.Writer) (status api.PodPhase, err error) {
for {
pod, err := c.Pods(pod.Namespace).Get(pod.Name)
if err != nil {
return err
return api.PodUnknown, err
}
ready := false
if pod.Status.Phase == api.PodRunning {
ready := true
ready = true
for _, status := range pod.Status.ContainerStatuses {
if !status.Ready {
ready = false
@@ -254,10 +255,13 @@ func waitForPodRunning(c *client.Client, pod *api.Pod, out io.Writer) error {
}
}
if ready {
return nil
return api.PodRunning, nil
}
}
fmt.Fprintf(out, "Waiting for pod %s/%s to be running\n", pod.Namespace, pod.Name)
if pod.Status.Phase == api.PodSucceeded || pod.Status.Phase == api.PodFailed {
return pod.Status.Phase, nil
}
fmt.Fprintf(out, "Waiting for pod %s/%s to be running, status is %s, pod ready: %v\n", pod.Namespace, pod.Name, pod.Status.Phase, ready)
time.Sleep(2 * time.Second)
continue
}
@@ -280,9 +284,13 @@ func handleAttachReplicationController(c *client.Client, controller *api.Replica
}
func handleAttachPod(c *client.Client, pod *api.Pod, opts *AttachOptions) error {
if err := waitForPodRunning(c, pod, opts.Out); err != nil {
status, err := waitForPodRunning(c, pod, opts.Out)
if err != nil {
return err
}
if status == api.PodSucceeded || status == api.PodFailed {
return handleLog(c, pod.Namespace, pod.Name, pod.Spec.Containers[0].Name, false, false, opts.Out)
}
opts.Client = c
opts.PodName = pod.Name
opts.Namespace = pod.Namespace