github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #63083 from mgdevstack/master-make-verify

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fixed hack/verify-golint.sh reported errors 

**What this PR does / why we need it**:
Fixes errors reported by `hack/verify-golint.sh` while running `make verify`

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #63065 

**Special notes for your reviewer**:
Fixing `hack/verify-gofmt.sh` reported error for `k8s.io/code-generator/cmd/client-gen/generators/client_generator.go` mentioned in #63065 throws error. So didn't modify that file.

**Release note**:

```release-note
NONE
```
/sig-testing-bugs
This commit is contained in:
Kubernetes Submit Queue 2018-05-07 18:23:46 -07:00 committed by GitHub
commit af70337f8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/certificate/bootstrap/bootstrap.go
View File

@ -123,10 +123,7 @@ func LoadClientCert(kubeconfigPath string, bootstrapPath string, certDir string,
} }
// Marshal to disk // Marshal to disk
if err := clientcmd.WriteToFile(kubeconfigData, kubeconfigPath); err != nil { return clientcmd.WriteToFile(kubeconfigData, kubeconfigPath)
return err
}
return nil
} }
func loadRESTClientConfig(kubeconfig string) (*restclient.Config, error) { func loadRESTClientConfig(kubeconfig string) (*restclient.Config, error) {