Merge pull request GoogleContainerTools#1139 from priyawadhwa/kanikobug

Fix kaniko default behaviour
beastpu · Oct 12, 2018 · 1af9b55 · 1af9b55
2 parents 78e4439 + 71622f2
commit 1af9b55
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/pkg/skaffold/schema/latest/config.go b/pkg/skaffold/schema/latest/config.go
@@ -115,12 +115,12 @@ type KanikoBuildContext struct {
 // KanikoBuild contains the fields needed to do a on-cluster build using
 // the kaniko image
 type KanikoBuild struct {
-	BuildContext   KanikoBuildContext `yaml:"buildContext,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"`
+	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"`
 }
 
 // TestCase is a struct containing all the specified test

diff --git a/pkg/skaffold/schema/latest/defaults.go b/pkg/skaffold/schema/latest/defaults.go
@@ -41,6 +41,7 @@ func (c *SkaffoldPipeline) SetDefaultValues() error {
 		setDefaultKanikoImage,
 		setDefaultKanikoNamespace,
 		setDefaultKanikoSecret,
+		setDefaultKanikoBuildContext,
 	); err != nil {
 		return err
 	}
@@ -173,6 +174,15 @@ func setDefaultKanikoSecret(kaniko *KanikoBuild) error {
 	return nil
 }
 
+func setDefaultKanikoBuildContext(kaniko *KanikoBuild) error {
+	if kaniko.BuildContext == nil {
+		kaniko.BuildContext = &KanikoBuildContext{
+			LocalDir: &LocalDir{},
+		}
+	}
+	return nil
+}
+
 func valueOrDefault(v, def string) string {
 	if v != "" {
 		return v

diff --git a/pkg/skaffold/schema/versions_test.go b/pkg/skaffold/schema/versions_test.go
@@ -217,7 +217,7 @@ func withGoogleCloudBuild(id string, ops ...func(*latest.BuildConfig)) func(*lat
 func withKanikoBuild(bucket, secretName, namespace, secret string, timeout string, ops ...func(*latest.BuildConfig)) func(*latest.SkaffoldPipeline) {
 	return func(cfg *latest.SkaffoldPipeline) {
 		b := latest.BuildConfig{BuildType: latest.BuildType{KanikoBuild: &latest.KanikoBuild{
-			BuildContext: latest.KanikoBuildContext{
+			BuildContext: &latest.KanikoBuildContext{
 				GCSBucket: bucket,
 			},
 			PullSecretName: secretName,