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(xds): don't read metadata in ProxyBuilders (backport #5414) #5416

Merged
merged 2 commits into from Dec 2, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 2, 2022

This is an automatic backport of pull request #5414 done by Mergify.
Cherry-pick of 39ba902 has failed:

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

You are currently cherry-picking commit 39ba902fa.
  (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/plugins/runtime/gateway/suite_test.go
	modified:   pkg/xds/server/v3/snapshot_generator_test.go
	modified:   pkg/xds/sync/dataplane_proxy_builder.go
	modified:   pkg/xds/sync/dataplane_watchdog.go
	modified:   pkg/xds/sync/dataplane_watchdog_test.go
	modified:   pkg/xds/sync/proxy_builder_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/api-server/inspect_endpoints.go
	both modified:   pkg/xds/sync/components.go
	both modified:   pkg/xds/sync/egress_proxy_builder.go
	both modified:   pkg/xds/sync/ingress_proxy_builder.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

We were using a `DataplaneMetadataTracker` in all proxy builders.
This was causing issues as the proxy may disconnect while reconciliation is in progress.

We now set the proxy metadata in the DataplaneWatchdog so that it's read once only and nil checked.
We therefore protect ourselves against this race

Signed-off-by: Charly Molter <charly.molter@konghq.com>
(cherry picked from commit 39ba902)

# Conflicts:
#	pkg/api-server/inspect_endpoints.go
#	pkg/xds/sync/components.go
#	pkg/xds/sync/egress_proxy_builder.go
#	pkg/xds/sync/ingress_proxy_builder.go
@mergify mergify bot requested a review from a team as a code owner December 2, 2022 15:51
@mergify mergify bot added the conflicts label Dec 2, 2022
Signed-off-by: Charly Molter <charly.molter@konghq.com>
@lahabana lahabana enabled auto-merge (squash) December 2, 2022 17:30
@lahabana lahabana merged commit 8ac3a2f into release-2.0 Dec 2, 2022
@lahabana lahabana deleted the mergify/bp/release-2.0/pr-5414 branch December 2, 2022 17:46
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

2 participants