Skip to content

Add support for skaffold.yml as a default config file fixes #225 #665

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.

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

Conversation

gtseres
Copy link
Contributor

@gtseres gtseres commented Jun 9, 2018

No description provided.

@gtseres gtseres changed the title Add support for skaffold.yml as a default config file Add support for skaffold.yml as a default config file fixes #225 Jun 9, 2018
contents, err := ioutil.ReadFile(filename)
if err != nil {
// Try reading the skaffold.yml file instead
return ioutil.ReadFile(filepath.Join(directory, "skaffold.yml"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! one nit: can you add a logrus.Infof() here that outputs the error from trying to read the skaffold.yaml and maybe another that says that we're trying to fall back to skaffold.yml? Otherwise the error will just say that it couldn't find "skaffold.yml"

@r2d4 r2d4 added the kokoro:run runs the kokoro jobs on a PR label Jun 9, 2018
@kokoro-team kokoro-team removed the kokoro:run runs the kokoro jobs on a PR label Jun 9, 2018
@@ -108,3 +108,28 @@ func TestExpandPathsGlob(t *testing.T) {
})
}
}

func TestDefaultConfigFilenameAlternate(t *testing.T) {
// Setup a few files in a tempdir. We can't use afero here because it doesn't support symlinks.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can remove this comment. We don't use aero anywhere, now

@r2d4 r2d4 added the kokoro:run runs the kokoro jobs on a PR label Jun 10, 2018
@kokoro-team kokoro-team removed the kokoro:run runs the kokoro jobs on a PR label Jun 10, 2018
Copy link
Contributor

@r2d4 r2d4 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@r2d4 r2d4 merged commit 48756d8 into GoogleContainerTools:master Jun 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants