From dc3674c8d05853426c318042ba54113eb503c20a Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <pskamruk@mirantis.com>
Date: Tue, 6 Sep 2016 09:58:22 +0200
Subject: [PATCH] Ensure that we are closing files.

---
 contrib/mesos/pkg/scheduler/service/service.go     | 1 +
 pkg/cloudprovider/providers/rackspace/rackspace.go | 1 +
 pkg/kubectl/cmd/apply_test.go                      | 1 +
 plugin/pkg/admission/imagepolicy/admission_test.go | 2 ++
 test/e2e/kubectl.go                                | 1 +
 5 files changed, 6 insertions(+)

diff --git a/contrib/mesos/pkg/scheduler/service/service.go b/contrib/mesos/pkg/scheduler/service/service.go
index a5b34bb6b42..97f517fb891 100644
--- a/contrib/mesos/pkg/scheduler/service/service.go
+++ b/contrib/mesos/pkg/scheduler/service/service.go
@@ -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 {
diff --git a/pkg/cloudprovider/providers/rackspace/rackspace.go b/pkg/cloudprovider/providers/rackspace/rackspace.go
index 9c1150dc4b8..0c274502543 100644
--- a/pkg/cloudprovider/providers/rackspace/rackspace.go
+++ b/pkg/cloudprovider/providers/rackspace/rackspace.go
@@ -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)
 }
diff --git a/pkg/kubectl/cmd/apply_test.go b/pkg/kubectl/cmd/apply_test.go
index 52bec329fda..714b6950465 100644
--- a/pkg/kubectl/cmd/apply_test.go
+++ b/pkg/kubectl/cmd/apply_test.go
@@ -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 {
diff --git a/plugin/pkg/admission/imagepolicy/admission_test.go b/plugin/pkg/admission/imagepolicy/admission_test.go
index 7c0af1b405f..950aceacf86 100644
--- a/plugin/pkg/admission/imagepolicy/admission_test.go
+++ b/plugin/pkg/admission/imagepolicy/admission_test.go
@@ -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
 }
diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go
index 8a807b6fdd4..ef673902fac 100644
--- a/test/e2e/kubectl.go
+++ b/test/e2e/kubectl.go
@@ -1528,6 +1528,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())