github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-28 13:03:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #46688 from zhangxiaoyu-zidif/change-method-kubectl-configmap

Browse Source 
Automatic merge from submit-queue

Fix error message of isDir

**What this PR does / why we need it**:
Use IsRegular to replace isDir
Accoding to the code logic, using IsRegular is proper.
 
**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-06-23 01:58:14 -07:00 committed by GitHub
commit 4db120cc04
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/configmap.go
View File

@ -218,7 +218,7 @@ func handleConfigMapFromEnvFileSource(configMap *api.ConfigMap, envFileSource st
} }
} }
if info.IsDir() { if info.IsDir() {
return fmt.Errorf("must be a file") return fmt.Errorf("env config file cannot be a directory")
} }
return addFromEnvFile(envFileSource, func(key, value string) error { return addFromEnvFile(envFileSource, func(key, value string) error {