github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues 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
commit 260e213f26
1 changed files with 1 additions and 2 deletions
Show Stats 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 {
err = addKeyFromFileToConfigMap(configMap, keyName, filePath)
if err != nil {
if err := addKeyFromFileToConfigMap(configMap, keyName, filePath); err != nil {
return err
}
}