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

Tokio 1.0 #363

Merged
merged 7 commits into from Jan 4, 2021
Merged

Tokio 1.0 #363

merged 7 commits into from Jan 4, 2021

Conversation

nightkr
Copy link
Member

@nightkr nightkr commented Jan 1, 2021

Fixes #339

Currently uses an unreleased reqwest, since this requires seanmonstar/reqwest#1076

This only concerns core kube, expect kube-runtime to be broken for now
@nightkr nightkr requested a review from clux January 1, 2021 21:09
@clux
Copy link
Member

clux commented Jan 1, 2021

Nice work. Looks all fine to me.

Though; since we can't release it until reqwest is released properly, maybe we wait with merging this until #360 is in before merging? @kazk already has a ton of Cargo.toml modifications there, and don't want to make that pr any harder than it already is.

@kazk
Copy link
Member

kazk commented Jan 2, 2021

I tried rebasing #360 on top of this. It's doable, but I had to resolve merge conflicts multiple times for Cargo.toml, so merging that first will be cleaner.

To make #360 compile, I had to

  • update versions of TLS crates
  • update async-tungstenite to v0.11.0
  • replace tokio::io::reader_stream() with tokio_util::io::ReaderStream::new() after adding tokio-util = { version = "0.6.0", features = ["io"], optional = true } and including that in ws feature

I'll do a follow-up PR after these two are merged to clean up some things (e.g., using re-exported native-tls and finish rustls support).

@clux clux mentioned this pull request Jan 4, 2021
@clux
Copy link
Member

clux commented Jan 4, 2021

There's still files marked as conflicting here, I can merge if you want to fix them up.

@nightkr
Copy link
Member Author

nightkr commented Jan 4, 2021

Merged latest master now. Something still seems to be borked around tungstenite+rustls though.

@clux
Copy link
Member

clux commented Jan 4, 2021

Well, there were a few follow-up things on that. Tests are at the very least green. I'll merge this one to let people use this as a patch branch.

@clux clux merged commit 2752071 into kube-rs:master Jan 4, 2021
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.

tokio 1.0
3 participants