mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
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.
This commit is contained in:
commit
5d2be22d3e
@ -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 {
|
|||||||
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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user