Merge pull request #455 from dgageot/kaniko-home

Support ~ in secret path for Kaniko
GoogleContainerTools · May 16, 2018 · 762c3ad · 762c3ad
2 parents 64b44b3 + 313b3b5
commit 762c3ad
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/examples/kaniko/skaffold.yaml b/examples/kaniko/skaffold.yaml
@@ -5,7 +5,7 @@ build:
   - imageName: gcr.io/k8s-skaffold/skaffold-example
   kaniko:
     gcsBucket: k8s-skaffold
-    pullSecret: /a/secret/path/kaniko.json
+    pullSecret: ~/secrets/kaniko/kaniko.json
 deploy:
   kubectl:
     manifests:

diff --git a/pkg/skaffold/schema/v1alpha2/config.go b/pkg/skaffold/schema/v1alpha2/config.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
+	homedir "github.com/mitchellh/go-homedir"
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -163,18 +164,21 @@ func (c *SkaffoldConfig) Parse(contents []byte, useDefaults bool) error {
 	}
 
 	if useDefaults {
-		c.setDefaultValues()
+		if err := c.setDefaultValues(); err != nil {
+			return errors.Wrap(err, "applying default values")
+		}
 	}
 
 	return nil
 }
 
-func (c *SkaffoldConfig) setDefaultValues() {
+func (c *SkaffoldConfig) setDefaultValues() error {
 	c.defaultToLocalBuild()
 	c.defaultToDockerArtifacts()
 	c.setDefaultTagger()
 	c.setDefaultDockerfiles()
 	c.setDefaultWorkspaces()
+	return c.expandKanikoSecretPath()
 }
 
 func (c *SkaffoldConfig) defaultToLocalBuild() {
@@ -222,6 +226,20 @@ func (c *SkaffoldConfig) setDefaultWorkspaces() {
 	}
 }
 
+func (c *SkaffoldConfig) expandKanikoSecretPath() error {
+	if c.Build.KanikoBuild == nil || c.Build.KanikoBuild.PullSecret == "" {
+		return nil
+	}
+
+	absPath, err := homedir.Expand(c.Build.KanikoBuild.PullSecret)
+	if err != nil {
+		return fmt.Errorf("unable to expand pullSecret %s", c.Build.KanikoBuild.PullSecret)
+	}
+
+	c.Build.KanikoBuild.PullSecret = absPath
+	return nil
+}
+
 // ApplyProfiles returns configuration modified by the application
 // of a list of profiles.
 func (c *SkaffoldConfig) ApplyProfiles(profiles []string) error {
@@ -240,8 +258,10 @@ func (c *SkaffoldConfig) ApplyProfiles(profiles []string) error {
 		}
 	}
 
-	c.setDefaultValues()
 	c.Profiles = nil
+	if err := c.setDefaultValues(); err != nil {
+		return errors.Wrap(err, "applying default values")
+	}
 
 	return nil
 }