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

test(kuma-cp): fix wait for goroutine to be done (backport #5638) #5646

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 11, 2023

This is an automatic backport of pull request #5638 done by Mergify.
Cherry-pick of 31ae2bd has failed:

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

You are currently cherry-picking commit 31ae2bdde.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/core/resources/manager/cache_test.go

no changes added to commit (use "git add" and/or "git commit -a")

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, 2023 12:41
@mergify mergify bot added the conflicts label Jan 11, 2023
@lukidzi lukidzi changed the base branch from release-1.7 to mergify/bp/release-1.7/pr-5574 January 11, 2023 13:12
lukidzi and others added 5 commits January 11, 2023 08:17
Signed-off-by: Lukasz Dziedziak <[email protected]>
(cherry picked from commit 31ae2bd)

# Conflicts:
#	pkg/core/resources/manager/cache_test.go
Signed-off-by: Lukasz Dziedziak <[email protected]>
Signed-off-by: Lukasz Dziedziak <[email protected]>
Signed-off-by: Lukasz Dziedziak <[email protected]>
… (#5599)

* chore(deps): bump helm.sh/helm/v3 from 3.8.1 to 3.10.3 (#5592)

Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.8.1 to 3.10.3.
- [Release notes](https://github.com/helm/helm/releases)
- [Commits](helm/helm@v3.8.1...v3.10.3)

---
updated-dependencies:
- dependency-name: helm.sh/helm/v3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit f50be15)

# Conflicts:
#	go.mod
#	go.sumx

Signed-off-by: Lukasz Dziedziak <[email protected]>
Signed-off-by: Charly Molter <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Łukasz Dziedziak <[email protected]>
Co-authored-by: Charly Molter <[email protected]>
Signed-off-by: Lukasz Dziedziak <[email protected]>
@lukidzi lukidzi force-pushed the mergify/bp/release-1.7/pr-5638 branch from 3f2f241 to 0d10019 Compare January 11, 2023 13:18
@lukidzi lukidzi merged commit 62c4c54 into mergify/bp/release-1.7/pr-5574 Jan 11, 2023
@lukidzi lukidzi deleted the mergify/bp/release-1.7/pr-5638 branch January 11, 2023 13:21
mergify bot added a commit that referenced this pull request Jan 11, 2023
* fix(kuma-cp): don't cache filtered data (#5574)

Signed-off-by: Lukasz Dziedziak <[email protected]>
(cherry picked from commit f5b8d76)
Signed-off-by: Lukasz Dziedziak <[email protected]>

* fix(kuma-cp): fixed parameters

Signed-off-by: Lukasz Dziedziak <[email protected]>

* fix(kuma-cp): fix conflict

Signed-off-by: Lukasz Dziedziak <[email protected]>

* test(kuma-cp): fix wait for goroutine to be done (backport #5638) (#5646)

Signed-off-by: Lukasz Dziedziak <[email protected]>

Signed-off-by: Lukasz Dziedziak <[email protected]>
Co-authored-by: Łukasz Dziedziak <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
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