Merge pull request #50303 from zouyee/newb

Automatic merge from submit-queue delete ineffectual assginment **What this PR does / why we need it**: delete ineffectual assignment **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**:

Merge pull request #50303 from zouyee/newb
2c6cb24e · Kubernetes Submit Queue · GitHub · e472a758 · 847aa640 · 2c6cb24e
Commit 2c6cb24e authored Aug 18, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 18, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

certificate_store.go pkg/kubelet/certificate/certificate_store.go +2 -2

No files found.
--- a/pkg/kubelet/certificate/certificate_store.go
+++ b/pkg/kubelet/certificate/certificate_store.go
@@ -101,7 +101,7 @@ func (s *fileStore) recover() error {
 		}
 		return err
 	} 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'.
@@ -184,7 +184,7 @@ func loadCertKeyBlocks(pairFile string) (cert *pem.Block, key *pem.Block, err er
 	if certBlock == nil {
 		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 {
 		return nil, nil, fmt.Errorf("could not decode the second block from %q from expected PEM format", pairFile)
 	}