github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #44893 from zhangxiaoyu-zidif/fix-configmap-format 

Automatic merge from submit-queue (batch tested with PRs 44601, 44842, 44893, 44491, 44588)

secret.go: add initial symbol and format err

secret.go: add initial symbol and format err
line 198： add initialization symbol 
other lines: format err.
pull/6/head
Kubernetes Submit Queue 2017-04-25 12:51:37 -07:00 committed by GitHub
parent 0baef890ee 50d3909dd5
commit 5d2be22d3e
1 changed files with 3 additions and 6 deletions
Show Stats 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
}
}