Merge pull request #392 from miaojiuchen/master

解决k8s configmap生成的 ..data 软链接目录被识别成文件的问题
pull/393/head
Tony 5 years ago committed by GitHub
commit 693e7d3aea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      pkg/conf/paladin/file.go

@ -167,7 +167,7 @@ func loadValues(base string) (map[string]*Value, error) {
return nil, fmt.Errorf("paladin: read dir %s error: %s", base, err) return nil, fmt.Errorf("paladin: read dir %s error: %s", base, err)
} }
for _, file := range files { for _, file := range files {
if !file.IsDir() { if !file.IsDir() && (file.Mode()&os.ModeSymlink) != os.ModeSymlink {
paths = append(paths, path.Join(base, file.Name())) paths = append(paths, path.Join(base, file.Name()))
} }
} }

Loading…
Cancel
Save