Skip to content

Commit

Permalink
Add support for configurable compression algorithm (gzip, zstd) and c…
Browse files Browse the repository at this point in the history
…ompression level

We want to make the layer compression in kaniko configurable, so we have added two optional command line arguments “--compression” and “--compression-level”. The former allows the user to specify a compression algorithm (zstd, gzip) and the latter can be used to specify the compression level.

Depending on the selected compression algorithm and level we modify the set of layerOptions that are used to create tarball layers in `push.go` and `build.go`.

The actual implementation of the zstd support can be found in our fork of the go-containerregistry package for which we have filed this PR: google/go-containerregistry#1487

The changes should be fully backwards compatible.
  • Loading branch information
LFrobeen committed Jan 26, 2023
1 parent 3e7b55c commit dbc0ffa
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmd/executor/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ func addKanikoOptionsFlags() {
RootCmd.PersistentFlags().StringVarP(&opts.ImageNameDigestFile, "image-name-with-digest-file", "", "", "Specify a file to save the image name w/ digest of the built image to.")
RootCmd.PersistentFlags().StringVarP(&opts.ImageNameTagDigestFile, "image-name-tag-with-digest-file", "", "", "Specify a file to save the image name w/ image tag w/ digest of the built image to.")
RootCmd.PersistentFlags().StringVarP(&opts.OCILayoutPath, "oci-layout-path", "", "", "Path to save the OCI image layout of the built image.")
RootCmd.PersistentFlags().StringVarP(&opts.Compression, "compression", "", "", "Compression algorithm")
RootCmd.PersistentFlags().StringVarP(&opts.Compression, "compression", "", "", "Compression algorithm (gzip, zstd)")
RootCmd.PersistentFlags().IntVarP(&opts.CompressionLevel, "compression-level", "", -1, "Compression level")
RootCmd.PersistentFlags().BoolVarP(&opts.Cache, "cache", "", false, "Use cache when building image")
RootCmd.PersistentFlags().BoolVarP(&opts.CompressedCaching, "compressed-caching", "", true, "Compress the cached layers. Decreases build time, but increases memory usage.")
Expand Down
4 changes: 3 additions & 1 deletion pkg/config/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import (
"strconv"
"strings"
"time"

"github.com/google/go-containerregistry/pkg/compression"
)

// CacheOptions are base image cache options that are set by command line arguments
Expand Down Expand Up @@ -68,7 +70,7 @@ type KanikoOptions struct {
ImageNameDigestFile string
ImageNameTagDigestFile string
OCILayoutPath string
Compression string
Compression compression.Compression
CompressionLevel int
ImageFSExtractRetry int
SingleSnapshot bool
Expand Down
2 changes: 0 additions & 2 deletions pkg/executor/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -528,8 +528,6 @@ func (s *stageBuilder) saveSnapshotToLayer(tarPath string) (v1.Layer, error) {
switch s.opts.Compression {
case "zstd":
layerOpts = append(layerOpts, tarball.WithCompression("zstd"))
case "none":
layerOpts = append(layerOpts, tarball.WithCompression("none"))
default:
// layer already gzipped by default
}
Expand Down

0 comments on commit dbc0ffa

Please sign in to comment.