github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-16 15:20:17 +00:00
Code Issues Projects Releases Wiki Activity

add more error logs in kubectl run

Browse Source
This commit is contained in:
zhengjiajin 2018-02-05 19:50:54 +08:00
parent b9361192b8
commit 6dfe3cb04f
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ import (
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
@ -277,13 +278,14 @@ func RunRun(f cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer, cmd *c
params["env"] = cmdutil.GetFlagStringArray(cmd, "env") params["env"] = cmdutil.GetFlagStringArray(cmd, "env")
allErrs := []error{}
var runObjectMap = map[string]*RunObject{} var runObjectMap = map[string]*RunObject{}
runObject, err := createGeneratedObject(f, cmd, generator, names, params, cmdutil.GetFlagString(cmd, "overrides"), namespace) runObject, err := createGeneratedObject(f, cmd, generator, names, params, cmdutil.GetFlagString(cmd, "overrides"), namespace)
if err != nil { if err != nil {
return err allErrs = append(allErrs, err)
} } else {
runObjectMap[generatorName] = runObject runObjectMap[generatorName] = runObject
}
if cmdutil.GetFlagBool(cmd, "expose") { if cmdutil.GetFlagBool(cmd, "expose") {
serviceGenerator := cmdutil.GetFlagString(cmd, "service-generator") serviceGenerator := cmdutil.GetFlagString(cmd, "service-generator")
if len(serviceGenerator) == 0 { if len(serviceGenerator) == 0 {
@ -291,10 +293,11 @@ func RunRun(f cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer, cmd *c
} }
serviceRunObject, err := generateService(f, cmd, args, serviceGenerator, params, namespace, cmdOut) serviceRunObject, err := generateService(f, cmd, args, serviceGenerator, params, namespace, cmdOut)
if err != nil { if err != nil {
return err allErrs = append(allErrs, err)
} } else {
runObjectMap[generatorName] = serviceRunObject runObjectMap[generatorName] = serviceRunObject
} }
}
if attach { if attach {
quiet := cmdutil.GetFlagBool(cmd, "quiet") quiet := cmdutil.GetFlagBool(cmd, "quiet")
@ -401,13 +404,15 @@ func RunRun(f cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer, cmd *c
} }
} }
if runObject != nil {
outputFormat := cmdutil.GetFlagString(cmd, "output") outputFormat := cmdutil.GetFlagString(cmd, "output")
if outputFormat != "" || cmdutil.GetDryRunFlag(cmd) { if outputFormat != "" || cmdutil.GetDryRunFlag(cmd) {
return f.PrintObject(cmd, false, runObject.Mapper, runObject.Object, cmdOut) return f.PrintObject(cmd, false, runObject.Mapper, runObject.Object, cmdOut)
} }
f.PrintSuccess(false, cmdOut, runObject.Mapping.Resource, args[0], cmdutil.GetDryRunFlag(cmd), "created") f.PrintSuccess(false, cmdOut, runObject.Mapping.Resource, args[0], cmdutil.GetDryRunFlag(cmd), "created")
return nil }
return utilerrors.NewAggregate(allErrs)
} }
// waitForPod watches the given pod until the exitCondition is true // waitForPod watches the given pod until the exitCondition is true