Skip to content

K
k3s
Commit 5d2be22d authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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.
parents 0baef890 50d3909d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
pkg/kubectl/secret.go
View file @ 5d2be22d
...@@ -154,8 +154,7 @@ func handleFromLiteralSources(secret *api.Secret, literalSources []string) error ...@@ -154,8 +154,7 @@ func handleFromLiteralSources(secret *api.Secret, literalSources []string) error
if err != nil { if err != nil {
return err return err
} }
err = addKeyFromLiteralToSecret(secret, keyName, []byte(value)) if err = addKeyFromLiteralToSecret(secret, keyName, []byte(value)); err != nil {
if err != nil {
return err return err
} }
} }
...@@ -190,15 +189,13 @@ func handleFromFileSources(secret *api.Secret, fileSources []string) error { ...@@ -190,15 +189,13 @@ func handleFromFileSources(secret *api.Secret, fileSources []string) error {
itemPath := path.Join(filePath, item.Name()) itemPath := path.Join(filePath, item.Name())
if item.Mode().IsRegular() { if item.Mode().IsRegular() {
keyName = item.Name() keyName = item.Name()
err = addKeyFromFileToSecret(secret, keyName, itemPath) if err = addKeyFromFileToSecret(secret, keyName, itemPath); err != nil {
if err != nil {
return err return err
} }
} }
} }
} else { } else {
err = addKeyFromFileToSecret(secret, keyName, filePath) if err := addKeyFromFileToSecret(secret, keyName, filePath); err != nil {
if err != nil {
return err return err
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment