Merge pull request #32106 from jellonek/fd_leaks

Automatic merge from submit-queue

Ensure that we are closing files.

**What this PR does / why we need it**: In several places we are leaking file descriptors. This could be problematic on systems with low ulimits for them.

**Release note**:
```release-note
```
This commit is contained in:
Kubernetes Submit Queue 2016-09-12 23:43:38 -07:00 committed by GitHub
commit 8f2f836e4e
5 changed files with 6 additions and 0 deletions

View File

@ -612,6 +612,7 @@ func (s *SchedulerServer) Run(hks hyperkube.Interface, _ []string) error {
if err != nil {
log.Fatalf("Cannot open scheduler config file: %v", err)
}
defer f.Close()
err = sc.Read(bufio.NewReader(f))
if err != nil {

View File

@ -156,6 +156,7 @@ func readInstanceID() (string, error) {
if err != nil {
return "", fmt.Errorf("Cannot open %s: %v", metaDataPath, err)
}
defer file.Close()
return parseMetaData(file)
}

View File

@ -66,6 +66,7 @@ func readBytesFromFile(t *testing.T, filename string) []byte {
if err != nil {
t.Fatal(err)
}
defer file.Close()
data, err := ioutil.ReadAll(file)
if err != nil {

View File

@ -242,6 +242,7 @@ current-context: default
if err != nil {
return fmt.Errorf("failed to read test config: %v", err)
}
defer configFile.Close()
_, err = NewImagePolicyWebhook(fake.NewSimpleClientset(), configFile)
return err
@ -402,6 +403,7 @@ func newImagePolicyWebhook(callbackURL string, clientCert, clientKey, ca []byte,
if err != nil {
return nil, fmt.Errorf("failed to read test config: %v", err)
}
defer configFile.Close()
wh, err := NewImagePolicyWebhook(fake.NewSimpleClientset(), configFile)
return wh.(*imagePolicyWebhook), err
}

View File

@ -1529,6 +1529,7 @@ func readBytesFromFile(filename string) []byte {
framework.Failf(err.Error())
}
defer file.Close()
data, err := ioutil.ReadAll(file)
if err != nil {
framework.Failf(err.Error())