Support Cluster config with path to docker config

Fix GoogleContainerTools#2330 Signed-off-by: David Gageot <david@gageot.net>
dgageot · Jun 28, 2019 · 99b331c · 99b331c
1 parent 0b5c6d7
commit 99b331c
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/pkg/skaffold/schema/defaults/defaults.go b/pkg/skaffold/schema/defaults/defaults.go
@@ -29,7 +29,6 @@ import (
 
 // Set makes sure default values are set on a SkaffoldConfig.
 func Set(c *latest.SkaffoldConfig) error {
-
 	defaultToLocalBuild(c)
 	defaultToKubectlDeploy(c)
 	setDefaultTagger(c)
@@ -207,8 +206,6 @@ func setDefaultClusterDockerConfigSecret(cluster *latest.ClusterDetails) error {
 		return nil
 	}
 
-	cluster.DockerConfig.SecretName = valueOrDefault(cluster.DockerConfig.SecretName, constants.DefaultKanikoDockerConfigSecretName)
-
 	if cluster.DockerConfig.Path != "" {
 		absPath, err := homedir.Expand(cluster.DockerConfig.Path)
 		if err != nil {
@@ -219,6 +216,8 @@ func setDefaultClusterDockerConfigSecret(cluster *latest.ClusterDetails) error {
 		return nil
 	}
 
+	cluster.DockerConfig.SecretName = valueOrDefault(cluster.DockerConfig.SecretName, constants.DefaultKanikoDockerConfigSecretName)
+
 	return nil
 }
 

diff --git a/pkg/skaffold/schema/defaults/defaults_test.go b/pkg/skaffold/schema/defaults/defaults_test.go
@@ -61,33 +61,57 @@ func TestSetDefaults(t *testing.T) {
 }
 
 func TestSetDefaultsOnCluster(t *testing.T) {
-	testutil.Run(t, "", func(t *testutil.T) {
+	testutil.Run(t, "no docker config", func(t *testutil.T) {
 		t.SetupFakeKubernetesContext(api.Config{
 			CurrentContext: "cluster1",
 			Contexts: map[string]*api.Context{
 				"cluster1": {Namespace: "ns"},
 			},
 		})
 
+		// no docker config
 		cfg := &latest.SkaffoldConfig{
 			Pipeline: latest.Pipeline{
 				Build: latest.BuildConfig{
-					Artifacts: []*latest.Artifact{
-						{ImageName: "image"},
-					},
 					BuildType: latest.BuildType{
 						Cluster: &latest.ClusterDetails{},
 					},
 				},
 			},
 		}
-
 		err := Set(cfg)
 
 		t.CheckNoError(err)
 		t.CheckDeepEqual("ns", cfg.Build.Cluster.Namespace)
 		t.CheckDeepEqual(constants.DefaultKanikoTimeout, cfg.Build.Cluster.Timeout)
 		t.CheckDeepEqual(constants.DefaultKanikoSecretName, cfg.Build.Cluster.PullSecretName)
+
+		// default docker config
+		cfg.Pipeline.Build.BuildType.Cluster.DockerConfig = &latest.DockerConfig{}
+		err = Set(cfg)
+
+		t.CheckNoError(err)
+		t.CheckDeepEqual(constants.DefaultKanikoDockerConfigSecretName, cfg.Build.Cluster.DockerConfig.SecretName)
+
+		// docker config with path
+		cfg.Pipeline.Build.BuildType.Cluster.DockerConfig = &latest.DockerConfig{
+			Path: "/path",
+		}
+		err = Set(cfg)
+
+		t.CheckNoError(err)
+		t.CheckDeepEqual("", cfg.Build.Cluster.DockerConfig.SecretName)
+		t.CheckDeepEqual("/path", cfg.Build.Cluster.DockerConfig.Path)
+
+		// docker config with secret name
+		cfg.Pipeline.Build.BuildType.Cluster.DockerConfig = &latest.DockerConfig{
+			SecretName: "secret",
+		}
+		err = Set(cfg)
+
+		t.CheckNoError(err)
+		t.CheckDeepEqual("secret", cfg.Build.Cluster.DockerConfig.SecretName)
+		t.CheckDeepEqual("", cfg.Build.Cluster.DockerConfig.Path)
 	})
 }