github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44845 from zhangxiaoyu-zidif/fix-configmap-test

Browse Source 
Automatic merge from submit-queue

configmap.go: add one initialization symbol
This commit is contained in:
Kubernetes Submit Queue
2017-04-24 07:56:09 -07:00
committed by GitHub
parent 7e42d3848e b5c1aa5210
commit 260e213f26
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/configmap.go
View File

@@ -196,8 +196,7 @@ func handleConfigMapFromFileSources(configMap *api.ConfigMap, fileSources []stri
} }
} }
} else { } else {
err = addKeyFromFileToConfigMap(configMap, keyName, filePath) if err := addKeyFromFileToConfigMap(configMap, keyName, filePath); err != nil {
if err != nil {
return err return err
} }
} }