Merge pull request #1387 from priyawadhwa/kaniko-flags

Add additional flags to kaniko builder
GoogleContainerTools · Dec 11, 2018 · cf1578a · cf1578a
2 parents 19097cf + 7bc16cf
commit cf1578a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/integration/examples/annotated-skaffold.yaml b/integration/examples/annotated-skaffold.yaml
@@ -124,12 +124,17 @@ build:
   # A cache repo can be specified to store cached layers, otherwise one will be inferred
   # from the image name. See https://github.com/GoogleContainerTools/kaniko#caching 
   #
+  # Additional flags can be specified as a list. To see all additional flags, visit:
+  # https://github.com/GoogleContainerTools/kaniko#additional-flags
+  # 
   # kaniko:
   #   buildContext:
   #     gcsBucket: k8s-skaffold
   #     localDir: {}
   #   cache:
   #     repo: gcr.io/my-project/skaffold/cache
+  #   flags:
+  #     - --aditional-flag
   #   pullSecret: /a/secret/path/serviceaccount.json
   #   pullSecretName: kaniko-secret
   #   namespace: default

diff --git a/integration/examples/kaniko-local/skaffold.yaml b/integration/examples/kaniko-local/skaffold.yaml
@@ -9,6 +9,8 @@ build:
     pullSecretName: e2esecret
     namespace: default
     cache: {}
+    flags: 
+      - --single-snapshot
 deploy:
   kubectl:
     manifests:

diff --git a/pkg/skaffold/build/kaniko/run.go b/pkg/skaffold/build/kaniko/run.go
@@ -51,8 +51,8 @@ func (b *Builder) run(ctx context.Context, out io.Writer, artifact *latest.Artif
 		fmt.Sprintf("--dockerfile=%s", artifact.DockerArtifact.DockerfilePath),
 		fmt.Sprintf("--context=%s", context),
 		fmt.Sprintf("--destination=%s", imageDst),
-		fmt.Sprintf("-v=%s", logLevel().String()),
-	}
+		fmt.Sprintf("-v=%s", logLevel().String())}
+	args = append(args, cfg.AdditionalFlags...)
 	args = append(args, docker.GetBuildArgs(artifact.DockerArtifact)...)
 
 	if cfg.Cache != nil {

diff --git a/pkg/skaffold/schema/latest/config.go b/pkg/skaffold/schema/latest/config.go
@@ -118,13 +118,14 @@ type KanikoCache struct {
 // KanikoBuild contains the fields needed to do a on-cluster build using
 // the kaniko image
 type KanikoBuild struct {
-	BuildContext   *KanikoBuildContext `yaml:"buildContext,omitempty"`
-	Cache          *KanikoCache        `yaml:"cache,omitempty"`
-	PullSecret     string              `yaml:"pullSecret,omitempty"`
-	PullSecretName string              `yaml:"pullSecretName,omitempty"`
-	Namespace      string              `yaml:"namespace,omitempty"`
-	Timeout        string              `yaml:"timeout,omitempty"`
-	Image          string              `yaml:"image,omitempty"`
+	BuildContext    *KanikoBuildContext `yaml:"buildContext,omitempty"`
+	Cache           *KanikoCache        `yaml:"cache,omitempty"`
+	AdditionalFlags []string            `yaml:"flags,omitempty"`
+	PullSecret      string              `yaml:"pullSecret,omitempty"`
+	PullSecretName  string              `yaml:"pullSecretName,omitempty"`
+	Namespace       string              `yaml:"namespace,omitempty"`
+	Timeout         string              `yaml:"timeout,omitempty"`
+	Image           string              `yaml:"image,omitempty"`
 }
 
 type TestConfig []*TestCase