github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26693 from AdoHe/init_containers

Browse Source 
Automatic merge from submit-queue

exec support init containers

Partially fixes #25818 
@smarterclayton ptal.
This commit is contained in:
k8s-merge-robot 2016-06-03 10:13:49 -07:00
commit 525140a278
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/user-guide/kubectl/kubectl_exec.md
View File

@ -100,7 +100,7 @@ kubectl exec 123456-7890 -c ruby-container -i -t -- bash -il
* [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager
###### Auto generated by spf13/cobra on 5-Apr-2016 ###### Auto generated by spf13/cobra on 3-Jun-2016
<!-- BEGIN MUNGE: GENERATED_ANALYTICS --> <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_exec.md?pixel)]() [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_exec.md?pixel)]()

4
pkg/kubectl/cmd/exec.go
View File

@ -174,10 +174,6 @@ func (p *ExecOptions) Run() error {
return err return err
} }
if pod.Status.Phase != api.PodRunning {
return fmt.Errorf("pod %s is not running and cannot execute commands; current phase is %s", p.PodName, pod.Status.Phase)
}
containerName := p.ContainerName containerName := p.ContainerName
if len(containerName) == 0 { if len(containerName) == 0 {
glog.V(4).Infof("defaulting container name to %s", pod.Spec.Containers[0].Name) glog.V(4).Infof("defaulting container name to %s", pod.Spec.Containers[0].Name)

5
pkg/registry/pod/strategy.go
View File

@ -332,6 +332,11 @@ func podHasContainerWithName(pod *api.Pod, containerName string) bool {
return true return true
} }
} }
for _, c := range pod.Spec.InitContainers {
if c.Name == containerName {
return true
}
}
return false return false
} }