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

fix(kuma-cp) Switch leader election to leader-for-life (backport #3023) #3138

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 10, 2021

This is an automatic backport of pull request #3023 done by Mergify.
Cherry-pick of f5b2b27 has failed:

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

You are currently cherry-picking commit f5b2b27e.
  (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:
	modified:   app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
	modified:   app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
	modified:   app/kumactl/cmd/install/testdata/install-control-plane.global.golden.yaml
	modified:   app/kumactl/cmd/install/testdata/install-control-plane.override-env-vars.golden.yaml
	modified:   app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml
	modified:   app/kumactl/cmd/install/testdata/install-control-plane.with-ingress.golden.yaml
	modified:   app/kumactl/cmd/install/testdata/install-control-plane.zone.golden.yaml
	modified:   deployments/charts/kuma/templates/cp-deployment.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   pkg/plugins/bootstrap/k8s/plugin.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

* fix(kuma-cp) Switch leader election to leader-for-life

Signed-off-by: Paul Parkanzky <paul.parkanzky@konghq.com>

* tests(kuma-cp) Make check

Signed-off-by: Paul Parkanzky <paul.parkanzky@konghq.com>

* fix(kuma-cp) Add pod name to install env for leader election

Signed-off-by: Paul Parkanzky <paul.parkanzky@konghq.com>

* fix(kuma-cp) Force acquire deprecated locks

Signed-off-by: Paul Parkanzky <paul.parkanzky@konghq.com>

* fix(kuma-cp) PR comments - minor style changes

Signed-off-by: Paul Parkanzky <paul.parkanzky@konghq.com>
(cherry picked from commit f5b2b27)

# Conflicts:
#	go.mod
#	go.sum
#	pkg/plugins/bootstrap/k8s/plugin.go
@mergify mergify bot requested a review from a team as a code owner November 10, 2021 18:50
@mergify mergify bot added the conflicts label Nov 10, 2021
@parkanzky
Copy link
Contributor

Closing, this should go in to 1.4

@parkanzky parkanzky closed this Nov 11, 2021
@mergify mergify bot deleted the mergify/bp/release-1.3/pr-3023 branch November 11, 2021 22:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant