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.

Merge pull request #44893 from zhangxiaoyu-zidif/fix-configmap-format
5d2be22d · Kubernetes Submit Queue · GitHub · 0baef890 · 50d3909d · 5d2be22d
Commit 5d2be22d authored Apr 25, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

secret.go pkg/kubectl/secret.go +3 -6

No files found.
--- a/pkg/kubectl/secret.go
+++ b/pkg/kubectl/secret.go
@@ -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
 			}
 		}