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

feat(kuma-dp) add coredns server to kuma-dp (backport #1811) #1815

Merged
merged 1 commit into from
Apr 15, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 14, 2021

This is an automatic backport of pull request #1811 done by Mergify.

Cherry-pick of 49c85ea has failed:

On branch mergify/bp/release-1.1/pr-1811
Your branch is up to date with 'origin/release-1.1'.

You are currently cherry-picking commit 49c85eaf8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   app/kuma-dp/pkg/dataplane/dnsserver/config_file.go
	new file:   app/kuma-dp/pkg/dataplane/dnsserver/config_file_test.go
	new file:   app/kuma-dp/pkg/dataplane/dnsserver/dnsserver.go
	new file:   app/kuma-dp/pkg/dataplane/dnsserver/dnsserver_suite_test.go
	new file:   app/kuma-dp/pkg/dataplane/dnsserver/dnsserver_test.go
	new file:   app/kuma-dp/pkg/dataplane/dnsserver/testdata/binary-mock.exit-0.sh
	new file:   app/kuma-dp/pkg/dataplane/dnsserver/testdata/binary-mock.exit-1.sh
	modified:   mk/build.mk
	modified:   mk/docker.mk
	new file:   tools/builds/coredns/templates/plugin.cfg
	modified:   tools/releases/distros.sh
	modified:   tools/releases/dockerfiles/Dockerfile.kuma-dp
	modified:   tools/releases/dockerfiles/Dockerfile.kuma-dp.dockerignore

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   app/kuma-dp/cmd/run.go
	both modified:   pkg/config/app/kuma-dp/config.go
	both modified:   pkg/config/app/kuma-dp/config_test.go
	both modified:   pkg/config/app/kuma-dp/testdata/default-config.golden.yaml

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot requested a review from a team as a code owner April 14, 2021 13:45
@mergify mergify bot added the conflicts label Apr 14, 2021
@nickolaev
Copy link
Contributor

@Mergifyio update

@mergify
Copy link
Contributor Author

mergify bot commented Apr 15, 2021

Command update: failure

Base branch update has failed
merge conflict between base and head
err-code: E764B

* feat(kuma-dp) add functionality to run dns server

Signed-off-by: Bart Smykla <bartek@smykla.com>

* feat(*) add building coredns to workflow

Signed-off-by: Bart Smykla <bartek@smykla.com>
@nickolaev nickolaev force-pushed the mergify/bp/release-1.1/pr-1811 branch from aa2515c to fe0ea9b Compare April 15, 2021 08:22
@nickolaev nickolaev merged commit 2eb46e3 into release-1.1 Apr 15, 2021
@nickolaev nickolaev deleted the mergify/bp/release-1.1/pr-1811 branch April 15, 2021 10:19
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.

2 participants