github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #16833 from hurf/agg_attach 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-11-05 22:23:35 -08:00
parent a5e4462003 a15998f46c
commit 0932755036
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubectl/cmd/attach.go
View File

@ -31,6 +31,7 @@ import (
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" "k8s.io/kubernetes/pkg/client/unversioned/remotecommand"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
) )
const ( const (
@ -137,16 +138,17 @@ func (p *AttachOptions) Complete(f *cmdutil.Factory, cmd *cobra.Command, argsIn
// Validate checks that the provided attach options are specified. // Validate checks that the provided attach options are specified.
func (p *AttachOptions) Validate() error { func (p *AttachOptions) Validate() error {
allErrs := []error{}
if len(p.PodName) == 0 { if len(p.PodName) == 0 {
return fmt.Errorf("pod name must be specified") allErrs = append(allErrs, fmt.Errorf("pod name must be specified"))
} }
if p.Out == nil || p.Err == nil { if p.Out == nil || p.Err == nil {
return fmt.Errorf("both output and error output must be provided") allErrs = append(allErrs, fmt.Errorf("both output and error output must be provided"))
} }
if p.Attach == nil || p.Client == nil || p.Config == nil { if p.Attach == nil || p.Client == nil || p.Config == nil {
return fmt.Errorf("client, client config, and attach must be provided") allErrs = append(allErrs, fmt.Errorf("client, client config, and attach must be provided"))
} }
return nil return utilerrors.NewAggregate(allErrs)
} }
// Run executes a validated remote execution against a pod. // Run executes a validated remote execution against a pod.