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.

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

no error in skaffold init if pre-existing skaffold.yaml is different from target file #3575

Merged
merged 5 commits into from
Jan 24, 2020

Conversation

balopat
Copy link
Contributor

@balopat balopat commented Jan 24, 2020

Fixes #3554.

Should come after #3573 (it is based off of that branch).

Currently

  1. If a skaffold.yaml is found anywhere in the directory, an error is thrown:
    pre-existing skaffold.yaml found (you may continue with --force)
  2. This happens even when --analyze is passed in.

After this PR

If a skaffold.yaml is found anywhere in the directory, there is no error if --analyze is passed in, or the file is not the same file as the target config file for init (-f)

@balopat balopat added !! blocked !! this issue/PR is blocked by another issue needs-rebase pr/blocked and removed !! blocked !! this issue/PR is blocked by another issue labels Jan 24, 2020
@codecov
Copy link

codecov bot commented Jan 24, 2020

Codecov Report

Merging #3575 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted Files Coverage Δ
...affold/kubernetes/portforward/kubectl_forwarder.go 65.85% <0%> (-2.44%) ⬇️

@dgageot dgageot merged commit 5e7db83 into GoogleContainerTools:master Jan 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

skaffold init should not fail on existing skaffold.yaml if it's pointing to another skaffold.yaml
3 participants