pkg/archive: getWhiteoutConverter: don't error with userns enabled

thaJeztah · thaJeztah · commit af85e4734344 · 2024-06-28T12:05:13.000+02:00
Since 838047a, the overlayWhiteoutConverter is supported with userns enabled, so we no longer need this check. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go
@@ -871,11 +871,6 @@ func NewTarballer(srcPath string, options *TarOptions) (*Tarballer, error) {
 		return nil, err
 	}
 
-	whiteoutConverter, err := getWhiteoutConverter(options.WhiteoutFormat, options.InUserNS)
-	if err != nil {
-		return nil, err
-	}
-
 	return &Tarballer{
 		// Fix the source path to work with long path names. This is a no-op
 		// on platforms other than Windows.
@@ -885,7 +880,7 @@ func NewTarballer(srcPath string, options *TarOptions) (*Tarballer, error) {
 		pipeReader:        pipeReader,
 		pipeWriter:        pipeWriter,
 		compressWriter:    compressWriter,
-		whiteoutConverter: whiteoutConverter,
+		whiteoutConverter: getWhiteoutConverter(options.WhiteoutFormat),
 	}, nil
 }
 
@@ -1080,10 +1075,7 @@ func Unpack(decompressedArchive io.Reader, dest string, options *TarOptions) err
 	defer pools.BufioReader32KPool.Put(trBuf)
 
 	var dirs []*tar.Header
-	whiteoutConverter, err := getWhiteoutConverter(options.WhiteoutFormat, options.InUserNS)
-	if err != nil {
-		return err
-	}
+	whiteoutConverter := getWhiteoutConverter(options.WhiteoutFormat)
 
 	// Iterate through the files in the archive.
 loop:
diff --git a/pkg/archive/archive_linux.go b/pkg/archive/archive_linux.go
@@ -12,14 +12,11 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-func getWhiteoutConverter(format WhiteoutFormat, inUserNS bool) (tarWhiteoutConverter, error) {
+func getWhiteoutConverter(format WhiteoutFormat) tarWhiteoutConverter {
 	if format == OverlayWhiteoutFormat {
-		if inUserNS {
-			return nil, errors.New("specifying OverlayWhiteoutFormat is not allowed in userns")
-		}
-		return overlayWhiteoutConverter{}, nil
+		return overlayWhiteoutConverter{}
 	}
-	return nil, nil
+	return nil
 }
 
 type overlayWhiteoutConverter struct{}
diff --git a/pkg/archive/archive_other.go b/pkg/archive/archive_other.go
@@ -2,6 +2,6 @@
 
 package archive // import "github.com/docker/docker/pkg/archive"
 
-func getWhiteoutConverter(format WhiteoutFormat, inUserNS bool) (tarWhiteoutConverter, error) {
-	return nil, nil
+func getWhiteoutConverter(format WhiteoutFormat) tarWhiteoutConverter {
+	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -12,14 +12,11 @@ import (`
`12`	`12`	`"golang.org/x/sys/unix"`
`13`	`13`	`)`
`14`	`14`
`15`		`-func getWhiteoutConverter(format WhiteoutFormat, inUserNS bool) (tarWhiteoutConverter, error) {`
	`15`	`+func getWhiteoutConverter(format WhiteoutFormat) tarWhiteoutConverter {`
`16`	`16`	`if format == OverlayWhiteoutFormat {`
`17`		`- if inUserNS {`
`18`		`- return nil, errors.New("specifying OverlayWhiteoutFormat is not allowed in userns")`
`19`		`- }`
`20`		`- return overlayWhiteoutConverter{}, nil`
	`17`	`+ return overlayWhiteoutConverter{}`
`21`	`18`	`}`
`22`		`- return nil, nil`
	`19`	`+ return nil`
`23`	`20`	`}`
`24`	`21`
`25`	`22`	`type overlayWhiteoutConverter struct{}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`
`3`	`3`	`package archive // import "github.com/docker/docker/pkg/archive"`
`4`	`4`
`5`		`-func getWhiteoutConverter(format WhiteoutFormat, inUserNS bool) (tarWhiteoutConverter, error) {`
`6`		`- return nil, nil`
	`5`	`+func getWhiteoutConverter(format WhiteoutFormat) tarWhiteoutConverter {`
	`6`	`+ return nil`
`7`	`7`	`}`