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(clustering): restore json websocket protocol (#9921) #10067

Merged
merged 3 commits into from
Jan 6, 2023

Conversation

chronolaw
Copy link
Contributor

@chronolaw chronolaw commented Jan 5, 2023

Summary

Try to restore WebSocket protocol and keep wRPC protocol.

Revert PR #9740, update to PR #9823 #9769 , #9616 #9671 #9774.

This is the cherry-pick of #9921, and didn't remove wRPC protocol.

See KAG-371.

Related PRs: #8926 #8357

Checklist

  • The Pull Request has tests
  • There's an entry in the CHANGELOG

Full changelog

@chronolaw chronolaw marked this pull request as ready for review January 5, 2023 07:02
@chronolaw chronolaw changed the title cherry-pick(clustering): restore json websocket protocol (#9470) cherry-pick(clustering): restore json websocket protocol (#9921) Jan 5, 2023
@chronolaw chronolaw added this to the 3.1.1 milestone Jan 5, 2023
@chronolaw chronolaw force-pushed the cherry-pick/restore-json-websocket-protocol branch from 8ba08af to 957cc36 Compare January 5, 2023 23:36
restore json_handler

restore templates

remove serve_wrpc_listener

clean cp

helpers.lua

old update_compatible_payload

fix compat.check_version_compa

fix 09-config-compat_spec.lua

fix sync blocked test

fix sync allowed test

08-lazy_export

remove wrpc related code

remove wrpc related proto

changelog

remove wrpc code&test

restore kong.model

use compat.*

change update_compatible_payload

compat clean

fix compat test

restore proto

restore wrpc lua

restore wrpc test

restore wrpc clustering

restore wrpc rockspec

enable clustering wrpc

restore wrpc template

wrpc_update_compatible_payload

restore serve_wrpc_listener

flag wrpc_hybrid_protocol

test clustering_client_wrpc

08-lazy_export_spec.lua

03-pki_spec.lua

05-ocsp_spec.lua

02-start_stop_spec.lua

01-sync_spec.lua

check_kong_version_compatibility

force fallback

remove fields

test fix

style fix

KONG_VERSION

changelog
@chronolaw chronolaw force-pushed the cherry-pick/restore-json-websocket-protocol branch from 957cc36 to 61389eb Compare January 6, 2023 08:16
@chronolaw chronolaw changed the title cherry-pick(clustering): restore json websocket protocol (#9921) fix(clustering): restore json websocket protocol (#9921) Jan 6, 2023
@flrgh flrgh merged commit 7c057cd into release/3.1.x Jan 6, 2023
@flrgh flrgh deleted the cherry-pick/restore-json-websocket-protocol branch January 6, 2023 17:48
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.

2 participants