Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into renovate/master-min…
Browse files Browse the repository at this point in the history
…or-dependencies

The origin/master branch has already moved beyond k8s.io/kubernetes v1.29.3 to
v1.30.0. Make the required updates to the go.mod file and remove an undesired
replace directive for k8s.io/kubernetes currently in origin/master so that
dependency issues are largely resolved.

Signed-off-by: Eric Weber <eric.weber@suse.com>
  • Loading branch information
ejweber committed May 1, 2024
2 parents bcb3718 + 4dbba5b commit 9d5cba8
Show file tree
Hide file tree
Showing 818 changed files with 87,730 additions and 67,500 deletions.
275 changes: 0 additions & 275 deletions .drone.yml

This file was deleted.

23 changes: 19 additions & 4 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,30 @@
pull_request_rules:
- name: automatic merge after review
- name: Automatically merge PRs
conditions:
- check-success=continuous-integration/drone/pr
- check-success=DCO
- check-success="Build binaries"
- "#approved-reviews-by>=2"
- approved-reviews-by=@longhorn/maintainer
actions:
merge:
method: rebase

- name: ask to resolve conflict
- name: Automatically merge Renovate PRs
conditions:
- check-success="Build binaries"
- author = renovate[bot]
actions:
merge:
method: rebase

- name: Automatically approve Renovate PRs
conditions:
- check-success="Build binaries"
- author = renovate[bot]
actions:
review:
type: APPROVE

- name: Ask to resolve conflict
conditions:
- conflict
actions:
Expand Down

0 comments on commit 9d5cba8

Please sign in to comment.