Add support for Kaniko flag --image-fs-extract-retry (#6380)

GoogleContainerTools · Aug 10, 2021 · c9714c5 · c9714c5
1 parent 638bec4
commit c9714c5
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 0 deletions.
diff --git a/docs/content/en/schemas/v2beta21.json b/docs/content/en/schemas/v2beta21.json
@@ -2156,6 +2156,11 @@
           "description": "Docker image used by the Kaniko pod. Defaults to the latest released version of `gcr.io/kaniko-project/executor`.",
           "x-intellij-html-description": "Docker image used by the Kaniko pod. Defaults to the latest released version of <code>gcr.io/kaniko-project/executor</code>."
         },
+        "imageFSExtractRetry": {
+          "type": "string",
+          "description": "number of retries that should happen for extracting an image filesystem.",
+          "x-intellij-html-description": "number of retries that should happen for extracting an image filesystem."
+        },
         "imageNameWithDigestFile": {
           "type": "string",
           "description": "specify a file to save the image name with digest of the built image to.",
@@ -2335,6 +2340,7 @@
         "initImage",
         "image",
         "digestFile",
+        "imageFSExtractRetry",
         "imageNameWithDigestFile",
         "logFormat",
         "ociLayoutPath",

diff --git a/pkg/skaffold/build/gcb/kaniko_test.go b/pkg/skaffold/build/gcb/kaniko_test.go
@@ -107,6 +107,16 @@ func TestKanikoBuildSpec(t *testing.T) {
 				kaniko.ForceFlag,
 			},
 		},
+		{
+			description: "with ImageFSExtractRetry",
+			artifact: &latestV1.KanikoArtifact{
+				DockerfilePath:      "Dockerfile",
+				ImageFSExtractRetry: "5",
+			},
+			expectedArgs: []string{
+				"--image-fs-extract-retry", "5",
+			},
+		},
 		{
 			description: "with ImageNameWithDigestFile",
 			artifact: &latestV1.KanikoArtifact{

diff --git a/pkg/skaffold/build/kaniko/args.go b/pkg/skaffold/build/kaniko/args.go
@@ -73,6 +73,10 @@ func Args(artifact *latestV1.KanikoArtifact, tag, context string) ([]string, err
 		args = append(args, ForceFlag)
 	}
 
+	if artifact.ImageFSExtractRetry != "" {
+		args = append(args, ImageFSExtractRetryFlag, artifact.ImageFSExtractRetry)
+	}
+
 	if artifact.ImageNameWithDigestFile != "" {
 		args = append(args, ImageNameWithDigestFileFlag, artifact.ImageNameWithDigestFile)
 	}

diff --git a/pkg/skaffold/build/kaniko/types.go b/pkg/skaffold/build/kaniko/types.go
@@ -35,6 +35,8 @@ const (
 	DigestFileFlag = "--digest-file"
 	// ForceFlag additional flag
 	ForceFlag = "--force"
+	// ImageFSExtractRetry additional flag
+	ImageFSExtractRetryFlag = "--image-fs-extract-retry"
 	// ImageNameWithDigestFileFlag  additional flag
 	ImageNameWithDigestFileFlag = "--image-name-with-digest-file"
 	// InsecureFlag additional flag

diff --git a/pkg/skaffold/schema/latest/v1/config.go b/pkg/skaffold/schema/latest/v1/config.go
@@ -1197,6 +1197,9 @@ type KanikoArtifact struct {
 	// This can be used to automatically track the exact image built by kaniko.
 	DigestFile string `yaml:"digestFile,omitempty"`
 
+	// ImageFSExtractRetry is the number of retries that should happen for extracting an image filesystem.
+	ImageFSExtractRetry string `yaml:"imageFSExtractRetry,omitempty"`
+
 	// ImageNameWithDigestFile specify a file to save the image name with digest of the built image to.
 	ImageNameWithDigestFile string `yaml:"imageNameWithDigestFile,omitempty"`