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

Revert "chore: bump kube-vip to v0.8.0" (backport #5714) #5720

Merged
merged 1 commit into from
May 2, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 2, 2024

Reverts #5635

Related issue: #5688


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

@mergify mergify bot added the conflicts label May 2, 2024
Copy link
Author

mergify bot commented May 2, 2024

Cherry-pick of 026d49f has failed:

On branch mergify/bp/v1.2/pr-5714
Your branch is up to date with 'origin/v1.2'.

You are currently cherry-picking commit 026d49fa.
  (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:   deploy/charts/harvester/Chart.yaml
	new file:   deploy/charts/harvester/charts/kube-vip-0.4.2.tgz
	deleted:    deploy/charts/harvester/charts/kube-vip-0.5.0.tgz
	modified:   deploy/charts/harvester/values.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deploy/charts/harvester/Chart.lock

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

This reverts commit 8958ebe.

(cherry picked from commit 026d49f)
@bk201 bk201 force-pushed the mergify/bp/v1.2/pr-5714 branch from 7848428 to 3168f19 Compare May 2, 2024 02:42
@bk201 bk201 removed the conflicts label May 2, 2024
@bk201 bk201 merged commit c5b6dc6 into v1.2 May 2, 2024
4 checks passed
@mergify mergify bot deleted the mergify/bp/v1.2/pr-5714 branch May 2, 2024 03: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.

None yet

3 participants