feat(kaniko): Add CacheRunLayers into Kaniko config

Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>
GoogleContainerTools · Aug 29, 2024 · 3a9bd0e · 3a9bd0e
1 parent f68d017
commit 3a9bd0e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/docs-v2/content/en/schemas/v4beta12.json b/docs-v2/content/en/schemas/v4beta12.json
@@ -2934,6 +2934,11 @@
           "x-intellij-html-description": "enables caching of copy layers.",
           "default": "false"
         },
+        "cacheRunLayers": {
+          "type": "boolean",
+          "description": "enables caching of run layers (default=true).",
+          "x-intellij-html-description": "enables caching of run layers (default=true)."
+        },
         "hostPath": {
           "type": "string",
           "description": "specifies a path on the host that is mounted to each pod as read only cache volume containing base images. If set, must exist on each node and prepopulated with kaniko-warmer.",
@@ -2954,7 +2959,8 @@
         "repo",
         "hostPath",
         "ttl",
-        "cacheCopyLayers"
+        "cacheCopyLayers",
+        "cacheRunLayers"
       ],
       "additionalProperties": false,
       "type": "object",

diff --git a/pkg/skaffold/build/kaniko/args.go b/pkg/skaffold/build/kaniko/args.go
@@ -59,7 +59,7 @@ func Args(artifact *latest.KanikoArtifact, tag, context string) ([]string, error
 		if artifact.Cache.CacheCopyLayers {
 			args = append(args, CacheCopyLayersFlag)
 		}
-		if artifact.Cache.CacheRunLayers != nil{
+		if artifact.Cache.CacheRunLayers != nil {
 			args = append(args, fmt.Sprintf("%s=%t", CacheRunLayersFlag, *artifact.Cache.CacheRunLayers))
 		}
 	}

diff --git a/pkg/skaffold/schema/defaults/defaults.go b/pkg/skaffold/schema/defaults/defaults.go
@@ -362,7 +362,9 @@ func setKanikoArtifactDefaults(a *latest.KanikoArtifact) {
 	a.DockerfilePath = valueOrDefault(a.DockerfilePath, constants.DefaultDockerfilePath)
 	a.InitImage = valueOrDefault(a.InitImage, constants.DefaultBusyboxImage)
 	a.DigestFile = valueOrDefault(a.DigestFile, constants.DefaultKanikoDigestFile)
-	a.Cache.CacheRunLayers = valueOrDefaultBool(a.Cache.CacheRunLayers, true)
+	if a.Cache != nil {
+		a.Cache.CacheRunLayers = valueOrDefaultBool(a.Cache.CacheRunLayers, true)
+	}
 	a.CopyMaxRetries = valueOrDefaultInt(a.CopyMaxRetries, kaniko.DefaultCopyMaxRetries)
 	a.CopyTimeout = valueOrDefault(a.CopyTimeout, kaniko.DefaultCopyTimeout)
 }

diff --git a/pkg/skaffold/schema/latest/config.go b/pkg/skaffold/schema/latest/config.go
@@ -496,6 +496,8 @@ type KanikoCache struct {
 	TTL string `yaml:"ttl,omitempty"`
 	// CacheCopyLayers enables caching of copy layers.
 	CacheCopyLayers bool `yaml:"cacheCopyLayers,omitempty"`
+	// CacheRunLayers enables caching of run layers (default=true).
+	CacheRunLayers *bool `yaml:"cacheRunLayers,omitempty"`
 }
 
 // ClusterDetails *beta* describes how to do an on-cluster build.