github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix dump

Browse Source
This commit is contained in:
zouyee
2017-08-09 09:10:19 +08:00
parent c75d3028dd
commit 847aa640b4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/certificate/certificate_store.go
View File

@@ -101,7 +101,7 @@ func (s *fileStore) recover() error {
} }
return err return err
} else if fi.Mode()&os.ModeSymlink != os.ModeSymlink { } else if fi.Mode()&os.ModeSymlink != os.ModeSymlink {
return fmt.Errorf("expected %q to be a symlink but it is a file.", updatedPath) return fmt.Errorf("expected %q to be a symlink but it is a file", updatedPath)
} }
// Move the 'updated' symlink to 'current'. // Move the 'updated' symlink to 'current'.
@@ -184,7 +184,7 @@ func loadCertKeyBlocks(pairFile string) (cert *pem.Block, key *pem.Block, err er
if certBlock == nil { if certBlock == nil {
return nil, nil, fmt.Errorf("could not decode the first block from %q from expected PEM format", pairFile) return nil, nil, fmt.Errorf("could not decode the first block from %q from expected PEM format", pairFile)
} }
keyBlock, rest := pem.Decode(rest) keyBlock, _ := pem.Decode(rest)
if keyBlock == nil { if keyBlock == nil {
return nil, nil, fmt.Errorf("could not decode the second block from %q from expected PEM format", pairFile) return nil, nil, fmt.Errorf("could not decode the second block from %q from expected PEM format", pairFile)
} }