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): cancel OnTick when watchdog stopped (backport of #7221) #7240

Merged
merged 1 commit into from Jul 13, 2023

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Jul 13, 2023

Automatic cherry-pick of #7221 for branch release-2.1

Generated by action

cherry-picked commit 8be55a5
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.1
Your branch is up to date with 'origin/release-2.1'.

You are currently cherry-picking commit 8be55a569.
  (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:   pkg/hds/tracker/callbacks.go
	modified:   pkg/hds/tracker/healthcheck_generator.go
	modified:   pkg/hds/tracker/healthcheck_generator_test.go
	modified:   pkg/hds/tracker/reconciler.go
	modified:   pkg/kds/server/components.go
	modified:   pkg/mads/v1/service/components.go
	modified:   pkg/util/watchdog/watchdog.go
	modified:   pkg/util/watchdog/watchdog_test.go
	modified:   pkg/xds/sync/dataplane_watchdog_factory.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   pkg/kds/v2/server/components.go

* fix(kuma-cp): stop OnTick when watchdog stopped
* fix: contextcheck error
* test: update for signature change
* fix: check if stopped before ticking

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
@michaelbeaumont michaelbeaumont force-pushed the chore/backport-release-2.1-7221 branch from 81dd31f to b2d5a83 Compare July 13, 2023 22:04
@michaelbeaumont michaelbeaumont added ci/run-full-matrix PR: Runs all possible e2e test combination (expensive use carefully) and removed conflict labels Jul 13, 2023
@michaelbeaumont michaelbeaumont enabled auto-merge (squash) July 13, 2023 23:13
@michaelbeaumont michaelbeaumont merged commit a7416ec into release-2.1 Jul 13, 2023
5 checks passed
@michaelbeaumont michaelbeaumont deleted the chore/backport-release-2.1-7221 branch July 13, 2023 23:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci/run-full-matrix PR: Runs all possible e2e test combination (expensive use carefully) release-2.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant