Merge pull request #49476 from CaoShuFeng/image-name

Automatic merge from submit-queue (batch tested with PRs 47357, 49514, 49271, 49572, 49476) enhance kubectl run error message Before this change: $ kubectl run nginx error: Invalid image name "": invalid reference format After this change: $ kubectl run nginx error: --image is required **Release note**: ``` NONE ```

Merge pull request #49476 from CaoShuFeng/image-name
001ded68 · Kubernetes Submit Queue · GitHub · 112c401b · 292b18db · 001ded68
Commit 001ded68 authored Jul 26, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 26, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

run.go pkg/kubectl/cmd/run.go +3 -0

run_test.go pkg/kubectl/cmd/run_test.go +7 -0

No files found.
--- a/pkg/kubectl/cmd/run.go
+++ b/pkg/kubectl/cmd/run.go
@@ -156,6 +156,9 @@ func RunRun(f cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer, cmd *c

 	// validate image name
 	imageName := cmdutil.GetFlagString(cmd, "image")
+	if imageName == "" {
+		return fmt.Errorf("--image is required")
+	}
 	validImageRef := reference.ReferenceRegexp.MatchString(imageName)
 	if !validImageRef {
 		return fmt.Errorf("Invalid image name %q: %v", imageName, reference.ErrReferenceInvalidFormat)

--- a/pkg/kubectl/cmd/run_test.go
+++ b/pkg/kubectl/cmd/run_test.go
@@ -361,6 +361,13 @@ func TestRunValidations(t *testing.T) {
 		},
 		{
 			args:        []string{"test"},
+			expectedErr: "--image is required",
+		},
+		{
+			args: []string{"test"},
+			flags: map[string]string{
+				"image": "#",
+			},
 			expectedErr: "Invalid image name",
 		},
 		{