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

Merge global and context-specific array settings in Skaffold config #2590

Merged

Conversation

corneliusweig
Copy link
Contributor

See #2554 for details and discussion.

Depends on #2555

@nkubala
Copy link
Contributor

nkubala commented Aug 14, 2019

@corneliusweig #2555 has been merged, can you rebase this one and then make it ready for review?

Close GoogleContainerTools#2554

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
@corneliusweig corneliusweig force-pushed the w/global-config-merge branch from 28427cf to 587f388 Compare August 14, 2019 22:23
@corneliusweig corneliusweig marked this pull request as ready for review August 14, 2019 22:24
@corneliusweig
Copy link
Contributor Author

@nkubala Rebase is done, now let's wait for the CI.

@nkubala nkubala added the kokoro:run runs the kokoro jobs on a PR label Aug 15, 2019
@kokoro-team kokoro-team removed the kokoro:run runs the kokoro jobs on a PR label Aug 15, 2019
@nkubala nkubala closed this Aug 15, 2019
@nkubala nkubala reopened this Aug 15, 2019
@codecov
Copy link

codecov bot commented Aug 15, 2019

Codecov Report

Merging #2590 into master will increase coverage by 0.28%.
The diff coverage is 0%.

Impacted Files Coverage Δ
pkg/skaffold/config/util.go 63.29% <0%> (ø) ⬆️
pkg/skaffold/kubernetes/client.go 40% <0%> (-18.83%) ⬇️
pkg/skaffold/test/test.go 94.28% <0%> (-5.72%) ⬇️
...g/skaffold/kubernetes/portforward/pod_forwarder.go 85.48% <0%> (-1.48%) ⬇️
pkg/skaffold/kubernetes/context/context.go 100% <0%> (ø) ⬆️
pkg/skaffold/test/structure/types.go 100% <0%> (ø) ⬆️
...ffold/kubernetes/portforward/port_forward_entry.go 100% <0%> (ø) ⬆️
cmd/skaffold/app/cmd/flags.go 100% <0%> (ø) ⬆️
...kubernetes/portforward/port_forward_integration.go 0% <0%> (ø) ⬆️
pkg/skaffold/config/options.go 100% <0%> (ø) ⬆️
... and 3 more

@nkubala
Copy link
Contributor

nkubala commented Aug 15, 2019

@corneliusweig ignore the failing travis build, we switched to a different travis host while this PR was open so that one will always fail, this one is good to go!

@nkubala nkubala merged commit 4e5d426 into GoogleContainerTools:master Aug 15, 2019
@corneliusweig corneliusweig deleted the w/global-config-merge branch August 15, 2019 20:33
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.

4 participants