Merge pull request #9877 from johngmyers/fspath-notexist

Map ENOENT to ErrNotExist in FSPath
kubernetes · Sep 6, 2020 · d90c90c · d90c90c
2 parents d7fbc2f + 1e92c77
commit d90c90c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/util/pkg/vfs/fs.go b/util/pkg/vfs/fs.go
@@ -23,6 +23,7 @@ import (
 	"os"
 	"path"
 	"sync"
+	"syscall"
 
 	"k8s.io/klog/v2"
 	"k8s.io/kops/pkg/try"
@@ -112,7 +113,11 @@ func (p *FSPath) CreateFile(data io.ReadSeeker, acl ACL) error {
 
 // ReadFile implements Path::ReadFile
 func (p *FSPath) ReadFile() ([]byte, error) {
-	return ioutil.ReadFile(p.location)
+	file, err := ioutil.ReadFile(p.location)
+	if err == syscall.ENOENT {
+		err = os.ErrNotExist
+	}
+	return file, err
 }
 
 // WriteTo implements io.WriterTo