Skip to content

config/router/tcp_proxy/options: v2 API, boosting and --bootstrap-version CLI removal.#17724

Merged
alyssawilk merged 13 commits intoenvoyproxy:mainfrom
htuch:remove-boost
Aug 24, 2021
Merged

config/router/tcp_proxy/options: v2 API, boosting and --bootstrap-version CLI removal.#17724
alyssawilk merged 13 commits intoenvoyproxy:mainfrom
htuch:remove-boost

Conversation

@htuch
Copy link
Member

@htuch htuch commented Aug 16, 2021

This PR cleans up a bunch of v2 tech debt, including version conversion and API oracle
code:

  • Remove all non-trivial field references to hidden_envoy_deprecated_*. These were primarily
    in tcp_proxy, router and Node build_version.
  • Remove boosting, hidden type annotation and the API type oracle. We are now only v3 for
    both resource and transport API version.
  • Remove --bootstrap-version flag (all bootstraps already must be v3).

Risk level: High (It's possible there were some runtime guarded or not dependencies on
boosting).
Testing: Validated test functional coverage when removing hidden_envoy_deprecated_* field tests.
Releasing notes: TODO

Fixes #17706

Signed-off-by: Harvey Tuch htuch@google.com

…son CLI removal.

This PR cleans up a bunch of v2 tech debt, including version conversion and API oracle
code:
* Remove all non-trivial field references to hidden_envoy_deprecated_*. These were primarily
  in tcp_proxy and router.
* Remove boosting, hidden type annotation and the API type oracle. We are now only v3 for
  both resource and transport API version.
* Remove --boostrap-version flag (all boostraps already must be v3).

Risk level: High (It's possible there were some runtime guarded or not dependencies on
  boosting).
Testing: Validated test functional coverage when removing hidden_envoy_deprecated_* field tests.
Releasing notes: TODO

Fixes envoyproxy#17706

Signed-off-by: Harvey Tuch <htuch@google.com>
@htuch
Copy link
Member Author

htuch commented Aug 16, 2021

Still WiP (accidentally didn't create draft), but once I have tests passing, this will be the shape of the solution to #17706 and most of the remaining v2 references in code. CC @mattklein123 @tyxia @alyssawilk @phlax

@htuch htuch changed the title [WiP] config/router/tcp_proxy/options: v2 API, boosting and --boostrap-version CLI removal. [WiP] config/router/tcp_proxy/options: v2 API, boosting and --bootstrap-version CLI removal. Aug 16, 2021
@wrowe
Copy link
Contributor

wrowe commented Aug 17, 2021

Need to merge main, @htuch

@htuch htuch requested review from asraa, lizan and snowp as code owners August 23, 2021 01:11
htuch added 2 commits August 23, 2021 01:51
Signed-off-by: Harvey Tuch <htuch@google.com>
Signed-off-by: Harvey Tuch <htuch@google.com>
@repokitteh-read-only
Copy link

CC @envoyproxy/api-shepherds: Your approval is needed for changes made to api/envoy/.
envoyproxy/api-shepherds assignee is @lizan
CC @envoyproxy/api-watchers: FYI only for changes made to api/envoy/.

🐱

Caused by: #17724 was synchronize by htuch.

see: more, trace.

htuch added 2 commits August 23, 2021 02:22
Signed-off-by: Harvey Tuch <htuch@google.com>
Signed-off-by: Harvey Tuch <htuch@google.com>
@htuch htuch changed the title [WiP] config/router/tcp_proxy/options: v2 API, boosting and --bootstrap-version CLI removal. config/router/tcp_proxy/options: v2 API, boosting and --bootstrap-version CLI removal. Aug 23, 2021
htuch added 2 commits August 23, 2021 12:36
Signed-off-by: Harvey Tuch <htuch@google.com>
Signed-off-by: Harvey Tuch <htuch@google.com>
@htuch
Copy link
Member Author

htuch commented Aug 23, 2021

@mattklein123 this should be ready for review now (some small fixups on coverage possible but that's it).

Signed-off-by: Harvey Tuch <htuch@google.com>
Signed-off-by: Harvey Tuch <htuch@google.com>
mattklein123
mattklein123 previously approved these changes Aug 23, 2021
Copy link
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Amazing! So much red! Thank you so much for cleaning all of this up. 🎉

return drain_manager;
});

if (config.has_hidden_envoy_deprecated_deprecated_v1()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there may be a bunch of dead code left in tcp_proxy after this, but I can go through and clean it up in a later PR. Very happy to see this going away finally!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, please do, this PR is already huge :D

@htuch
Copy link
Member Author

htuch commented Aug 24, 2021

clang-tidy is timing out. @mattklein123 when you get a chance can you rubber stamp and force submit? Thanks.

@alyssawilk alyssawilk merged commit d142c9d into envoyproxy:main Aug 24, 2021
mpuncel added a commit to mpuncel/envoy that referenced this pull request Aug 25, 2021
* main: (32 commits)
  Stop processing pending H/2 frames if connection transitioned to the closed state
  http2: limit use of deferred resets in the http2 codec to server-side connections
  Abort filter chain iteration on local reply
  Reject or strip fragment from request URI
  ext-authz: merge duplicate headers from client request in check request
  common: introduce stable logger /w examples in DNS  (envoyproxy#17772)
  route: fast return when route matches failed (envoyproxy#17769)
  owners: add owners for dubbo proxy network filter (envoyproxy#17820)
  config/router/tcp_proxy/options: v2 API, boosting and --bootstrap-version CLI removal. (envoyproxy#17724)
  coverage: revert the limit http/cache to 92.6. (envoyproxy#17817)
  network: rename SocketAddressProvider as ConnectionInfoProvider (envoyproxy#17717)
  test: bumping coverage (envoyproxy#17757)
  conn_pool: Minor cleanups to ConnPoolBaseImpl (envoyproxy#17710)
  Split VaryHeader into VaryAllowList and VaryUtils to organize vary-related logic (envoyproxy#17728)
  ext_proc: Make tests more resilient to IPv6 support (envoyproxy#17784)
  Remove invlaid backquote from doc (envoyproxy#17797)
  rocketmq: move to contrib (envoyproxy#17796)
  kafka: upstream kafka facade in mesh-filter (envoyproxy#17783)
  ecds: create shared base class for DynamicFilterConfigProviderImpl (envoyproxy#17735)
  Change log level from debug to trace (envoyproxy#17774)
  ...

Signed-off-by: Michael Puncel <mpuncel@squareup.com>
mum4k added a commit to envoyproxy/nighthawk that referenced this pull request Aug 31, 2021
- renamed `Envoy::Network::SocketAddressProvider` to `Envoy::Network::ConnectionInfoProvider` as per
  envoyproxy/envoy#17717.
- removed a boolean argument in a call to `Envoy::MessageUtil::loadFromFile` as per envoyproxy/envoy#17724.
- removing reference to and presence of the unknown proto field `Envoy::ProtobufWellKnown::OriginalTypeFieldNumber` after Envoy deleted it in envoyproxy/envoy#17724.
- updated the command line in `README.md` to reflect Envoy's removal of flags related to bootstrap version.
- moving Envoy configurations used in integration tests off the deprecated field `envoy.config.bootstrap.v3.Admin.access_log_path`.
- no changes to `.bazelrc`, `.bazelversion`, `run_envoy_docker.sh`.

Signed-off-by: Jakub Sobon <mumak@google.com>
sergii-ssh added a commit to sergii-ssh/istio that referenced this pull request Sep 8, 2021
istio-testing pushed a commit to istio/istio that referenced this pull request Sep 9, 2021
* Drop --bootstrap-version flag envoyproxy/envoy#17724

* Update proxy version

* Decouple sha update
sergii-ssh added a commit to sergii-ssh/istio that referenced this pull request Sep 27, 2021
* Drop --bootstrap-version flag envoyproxy/envoy#17724

* Update proxy version

* Decouple sha update
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Not showing deprecation warnings for boosted protos

6 participants