github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10361 from mikedanese/shadow

Browse Source 
fix variable shadowing bug where provided RootCA would always be a nil byte slice
This commit is contained in:
Maxwell Forbes 2015-06-25 11:58:22 -07:00
commit 9fa8ef2a31
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-controller-manager/app/controllermanager.go
View File

@ -250,7 +250,7 @@ func (s *CMServer) Run(_ []string) error {
var rootCA []byte var rootCA []byte
if s.RootCAFile != "" { if s.RootCAFile != "" {
rootCA, err := ioutil.ReadFile(s.RootCAFile) rootCA, err = ioutil.ReadFile(s.RootCAFile)
if err != nil { if err != nil {
return fmt.Errorf("error reading root-ca-file at %s: %v", s.RootCAFile, err) return fmt.Errorf("error reading root-ca-file at %s: %v", s.RootCAFile, err)
} }