Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initialize Artifact.Workspace to "." by default in plugin case too #1804

Merged
merged 1 commit into from
Mar 15, 2019
Merged

Initialize Artifact.Workspace to "." by default in plugin case too #1804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pkg/skaffold/schema/defaults/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,17 @@ func Set(c *latest.SkaffoldPipeline) error {
return err
}

for _, a := range c.Build.Artifacts {
setDefaultWorkspace(a)
}

if pluginsDefined(c) {
return nil
}
// Only set defaults on artifacts if not using plugin builders
for _, a := range c.Build.Artifacts {
defaultToDockerArtifact(a)
setDefaultDockerfile(a)
setDefaultWorkspace(a)
}

return nil
Expand Down
3 changes: 3 additions & 0 deletions pkg/skaffold/schema/defaults/defaults_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,8 @@ func TestDetDefaults(t *testing.T) {

err := Set(pipeline)

for _, a := range pipeline.Build.Artifacts {
testutil.CheckDeepEqual(t, ".", a.Workspace)
}
testutil.CheckError(t, false, err)
}