Fix default Kaniko secret name

Fix GoogleContainerTools#753 Signed-off-by: David Gageot <[email protected]>
dgageot · Jun 27, 2018 · 0e4b73f · 0e4b73f
1 parent 24d52b2
commit 0e4b73f
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 7 deletions.
diff --git a/pkg/skaffold/config/config_test.go b/pkg/skaffold/config/config_test.go
@@ -59,6 +59,13 @@ build:
     projectId: ID
 deploy:
   kubectl: {}
+`
+	minimalKanikoConfig = `
+apiVersion: skaffold/v1alpha2
+kind: Config
+build:
+  kaniko:
+    gcsBucket: demo
 `
 	badConfig = "bad config"
 )
@@ -103,6 +110,15 @@ func TestParseConfig(t *testing.T) {
 				withKubectlDeploy(),
 			),
 		},
+		{
+			description: "Minimal Kaniko config",
+			config:      minimalKanikoConfig,
+			expected: config(
+				withKanikoBuild("demo", "kaniko-secret",
+					withTagPolicy(v1alpha2.TagPolicy{GitTagger: &v1alpha2.GitTagger{}}),
+				),
+			),
+		},
 		{
 			description: "Bad config",
 			config:      badConfig,
@@ -146,6 +162,19 @@ func withGCBBuild(id string, ops ...func(*v1alpha2.BuildConfig)) func(*SkaffoldC
 	}
 }
 
+func withKanikoBuild(bucket, secretName string, ops ...func(*v1alpha2.BuildConfig)) func(*SkaffoldConfig) {
+	return func(cfg *SkaffoldConfig) {
+		b := v1alpha2.BuildConfig{BuildType: v1alpha2.BuildType{KanikoBuild: &v1alpha2.KanikoBuild{
+			GCSBucket:      bucket,
+			PullSecretName: secretName,
+		}}}
+		for _, op := range ops {
+			op(&b)
+		}
+		cfg.Build = b
+	}
+}
+
 func withKubectlDeploy() func(*SkaffoldConfig) {
 	return func(cfg *SkaffoldConfig) {
 		cfg.Deploy = v1alpha2.DeployConfig{

diff --git a/pkg/skaffold/schema/v1alpha2/config.go b/pkg/skaffold/schema/v1alpha2/config.go
@@ -280,21 +280,25 @@ func (c *SkaffoldConfig) setDefaultKanikoNamespace() error {
 }
 
 func (c *SkaffoldConfig) setDefaultKanikoSecret() error {
+	kaniko := c.Build.KanikoBuild
 	if c.Build.KanikoBuild == nil {
 		return nil
 	}
-	if c.Build.KanikoBuild.PullSecret != "" {
-		absPath, err := homedir.Expand(c.Build.KanikoBuild.PullSecret)
+
+	if kaniko.PullSecretName == "" {
+		kaniko.PullSecretName = constants.DefaultKanikoSecretName
+	}
+
+	if kaniko.PullSecret != "" {
+		absPath, err := homedir.Expand(kaniko.PullSecret)
 		if err != nil {
-			return fmt.Errorf("unable to expand pullSecret %s", c.Build.KanikoBuild.PullSecret)
+			return fmt.Errorf("unable to expand pullSecret %s", kaniko.PullSecret)
 		}
 
-		c.Build.KanikoBuild.PullSecret = absPath
+		kaniko.PullSecret = absPath
 		return nil
 	}
-	if c.Build.KanikoBuild.PullSecretName == "" {
-		c.Build.KanikoBuild.PullSecret = constants.DefaultKanikoSecretName
-	}
+
 	return nil
 }