public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1241 from tejal29/revert_optimization 

Revert optimization added.
This commit is contained in:
Tejal Desai 2020-05-06 14:15:47 -07:00 committed by GitHub
parent a9e78a778f d9a6bbe956
commit 0bcafd40fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/util/fs_util.go
View File

@ -161,15 +161,18 @@ func GetFSFromLayers(root string, layers []v1.Layer, opts ...FSOpt) ([]string, e
dir := filepath.Dir(path)
if strings.HasPrefix(base, ".wh.") {
if !cfg.includeWhiteout {
logrus.Debug("not including whiteout files")
continue
}
logrus.Debugf("Whiting out %s", path)
name := strings.TrimPrefix(base, ".wh.")
if err := os.RemoveAll(filepath.Join(dir, name)); err != nil {
return nil, errors.Wrapf(err, "removing whiteout %s", hdr.Name)
}
if !cfg.includeWhiteout {
logrus.Debug("not including whiteout files")
continue
}
}
if err := cfg.extractFunc(root, hdr, tr); err != nil {

28
pkg/util/fs_util_test.go
View File

@ -1024,6 +1024,12 @@ func Test_GetFSFromLayers_with_whiteouts_include_whiteout_enabled(t *testing.T)
if err != nil {
t.Fatal(err)
}
// Write a whiteout path
d1 := []byte("Hello World\n")
if err := ioutil.WriteFile(filepath.Join(root, "foobar"), d1, 0644); err != nil {
t.Fatal(err)
}
defer os.Remove(root)
opts := []FSOpt{
@ -1105,6 +1111,11 @@ func Test_GetFSFromLayers_with_whiteouts_include_whiteout_enabled(t *testing.T)
err,
expectErr,
)
// Make sure whiteout files are removed form the root.
_, err = os.Lstat(filepath.Join(root, "foobar"))
if err == nil || !os.IsNotExist(err) {
t.Errorf("expected whiteout foobar file to be deleted. However found it.")
}
}
func Test_GetFSFromLayers_with_whiteouts_include_whiteout_disabled(t *testing.T) {
@ -1114,6 +1125,11 @@ func Test_GetFSFromLayers_with_whiteouts_include_whiteout_disabled(t *testing.T)
if err != nil {
t.Fatal(err)
}
// Write a whiteout path
d1 := []byte("Hello World\n")
if err := ioutil.WriteFile(filepath.Join(root, "foobar"), d1, 0644); err != nil {
t.Fatal(err)
}
defer os.Remove(root)
opts := []FSOpt{
@ -1159,6 +1175,13 @@ func Test_GetFSFromLayers_with_whiteouts_include_whiteout_disabled(t *testing.T)
mockLayer := mockv1.NewMockLayer(ctrl)
mockLayer.EXPECT().MediaType().Return(types.OCILayer, nil)
layerFiles := []string{
filepath.Join(root, "foobar"),
}
buf = new(bytes.Buffer)
tw = tar.NewWriter(buf)
f(layerFiles, tw)
rc := ioutil.NopCloser(buf)
mockLayer.EXPECT().Uncompressed().Return(rc, nil)
@ -1192,6 +1215,11 @@ func Test_GetFSFromLayers_with_whiteouts_include_whiteout_disabled(t *testing.T)
err,
expectErr,
)
// Make sure whiteout files are removed form the root.
_, err = os.Lstat(filepath.Join(root, "foobar"))
if err == nil || !os.IsNotExist(err) {
t.Errorf("expected whiteout foobar file to be deleted. However found it.")
}
}
func Test_GetFSFromLayers(t *testing.T) {