scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 02:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

secret.go: add initial symbol and format err

Browse Source
This commit is contained in:
zhangxiaoyu-zidif
2017-04-25 10:47:50 +08:00
parent ed539fb76f
commit 50d3909dd5
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubectl/secret.go
View File

@@ -154,8 +154,7 @@ func handleFromLiteralSources(secret *api.Secret, literalSources []string) error
if err != nil {
return err
}
err = addKeyFromLiteralToSecret(secret, keyName, []byte(value))
if err != nil {
if err = addKeyFromLiteralToSecret(secret, keyName, []byte(value)); err != nil {
return err
}
}
@@ -190,15 +189,13 @@ func handleFromFileSources(secret *api.Secret, fileSources []string) error {
itemPath := path.Join(filePath, item.Name())
if item.Mode().IsRegular() {
keyName = item.Name()
err = addKeyFromFileToSecret(secret, keyName, itemPath)
if err != nil {
if err = addKeyFromFileToSecret(secret, keyName, itemPath); err != nil {
return err
}
}
}
} else {
err = addKeyFromFileToSecret(secret, keyName, filePath)
if err != nil {
if err := addKeyFromFileToSecret(secret, keyName, filePath); err != nil {
return err
}
}