github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28736 from dims/fix-issue-28734

Browse Source 
Automatic merge from submit-queue

Allow empty value for env in kubectl run
This commit is contained in:
Kubernetes Submit Queue 2016-08-05 09:20:19 -07:00 committed by GitHub
commit 0ffac78807
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/run.go
View File

@ -934,7 +934,7 @@ func parseEnvs(envArray []string) ([]api.EnvVar, error) {
} }
name := env[:pos] name := env[:pos]
value := env[pos+1:] value := env[pos+1:]
if len(name) == 0 || len(value) == 0 { if len(name) == 0 {
return nil, fmt.Errorf("invalid env: %v", env) return nil, fmt.Errorf("invalid env: %v", env)
} }
if len(validation.IsCIdentifier(name)) != 0 { if len(validation.IsCIdentifier(name)) != 0 {
@ -955,7 +955,7 @@ func parseV1Envs(envArray []string) ([]v1.EnvVar, error) {
} }
name := env[:pos] name := env[:pos]
value := env[pos+1:] value := env[pos+1:]
if len(name) == 0 || len(validation.IsCIdentifier(name)) != 0 || len(value) == 0 { if len(name) == 0 || len(validation.IsCIdentifier(name)) != 0 {
return nil, fmt.Errorf("invalid env: %v", env) return nil, fmt.Errorf("invalid env: %v", env)
} }
envVar := v1.EnvVar{Name: name, Value: value} envVar := v1.EnvVar{Name: name, Value: value}

9
pkg/kubectl/run_test.go
View File

@ -858,8 +858,13 @@ func TestParseEnv(t *testing.T) {
envArray: []string{ envArray: []string{
"WITH_OUT_VALUES=", "WITH_OUT_VALUES=",
}, },
expected: []api.EnvVar{}, expected: []api.EnvVar{
expectErr: true, {
Name: "WITH_OUT_VALUES",
Value: "",
},
},
expectErr: false,
test: "test case 3", test: "test case 3",
}, },
{ {