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

Automatically evict replicas while draining (backport #2138) #2449

Merged
merged 3 commits into from
Jan 19, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 11, 2024

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

On branch mergify/bp/v1.5.x/pr-2138
Your branch is up to date with 'origin/v1.5.x'.

You are currently cherry-picking commit dd663887.
  (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:   api/model.go
	modified:   client/generated_node.go
	modified:   constant/events.go
	modified:   controller/controller_test.go
	modified:   controller/instance_manager_controller.go
	modified:   controller/node_controller.go
	modified:   controller/replica_controller.go
	modified:   controller/utils.go
	modified:   controller/volume_controller.go
	modified:   datastore/longhorn.go
	modified:   k8s/crds.yaml
	modified:   k8s/pkg/apis/longhorn/v1beta2/node.go
	modified:   k8s/pkg/apis/longhorn/v1beta2/replica.go
	modified:   manager/volume.go
	modified:   types/setting.go
	modified:   types/types.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   scheduler/replica_scheduler.go
	both modified:   scheduler/replica_scheduler_test.go
	both modified:   upgrade/v151to152/upgrade.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

@mergify mergify bot requested a review from a team as a code owner January 11, 2024 18:42
@mergify mergify bot added the conflicts label Jan 11, 2024
@ejweber
Copy link
Contributor

ejweber commented Jan 11, 2024

Please hold for testing.

Longhorn 7421

Co-authored-by: David Ko <dko@suse.com>
Signed-off-by: Eric Weber <eric.weber@suse.com>
(cherry picked from commit dd66388)
Longhorn 7538

Signed-off-by: Eric Weber <eric.weber@suse.com>
(cherry picked from commit 3fda063)
Longhorn 7538

Signed-off-by: Eric Weber <eric.weber@suse.com>
(cherry-picked from commit fe3ba61)
@ejweber ejweber marked this pull request as ready for review January 18, 2024 23:06
@innobead innobead merged commit d2d0e2a into v1.5.x Jan 19, 2024
5 checks passed
@innobead innobead deleted the mergify/bp/v1.5.x/pr-2138 branch January 19, 2024 02:32
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