move kube -> kube-client and try to make a facade crate #652

clux · 2021-10-13T23:54:19Z

quick play around with #651

kind of just moves kube the entire crate and avoids the error nesting problem by re-exporting kube_client::Error as kube::Error, not sure if that's the best solution. kind of delays the error story out further, but that's also good that we don't have to tackle it here.

big changes are:

kube/cargo.toml -> kube-client/cargo.toml
new kube/cargo.toml has features but just defers to dependency set in kube-client
kube/src/lib.rs -> kube-client/src/lib.rs (diff but removes kube-derive re-export)
new kube/src/lib.rs is now exporting the same stuff but via modules from kube-client (and kube-derive)
runtime mod reexport from new kube
kube-derive points at kube_core for its trait definitions

clux · 2021-10-14T21:20:05Z

ok, everything is passing at least now so this is indeed viable.

a bit of a faff internally with re-exporting features yet another time from the facade into kube into kube-core (and if we're coming from examples ~~it's one extra step~~ <- examples simplified now as well), but generally pretty smooth.

kube-derive/src/custom_resource.rs

kube/src/lib.rs

kube-client/README.md

kube/src/lib.rs

clux · 2021-10-17T22:59:29Z

Few things left:

clean up import paths from examples
clean up readme in root of repo
clean up kube-derive to parse #[kube(kube=...)] as a path instead of ident Allow #[derive(CustomResource)] to take an arbitrary path to kube_core #658

Will try to finish the first 2 tomorrow. In the mean time, any quick look-overs of the new lib.rs examples and architecture.md would be appreciated.

kube-derive/src/lib.rs

examples/README.md

kube/src/lib.rs

architecture.md

Signed-off-by: clux <sszynrae@gmail.com>

also add a standalone readme Signed-off-by: clux <sszynrae@gmail.com>

Signed-off-by: clux <sszynrae@gmail.com>

Co-authored-by: kazk <kazk.dev@gmail.com> Signed-off-by: clux <sszynrae@gmail.com>

so that we can use same paths equally depending on where we require them Signed-off-by: clux <sszynrae@gmail.com>

defaults to kube and will append ::core if kube or kube_client but users can also use it with kube_core directly Signed-off-by: clux <sszynrae@gmail.com>

they need to look like they came from the facade crate Signed-off-by: clux <sszynrae@gmail.com>

Signed-off-by: clux <sszynrae@gmail.com>

…core` (#658) * Allow `#[derive(CustomResource)]` to take an arbitrary path to `kube_core` Signed-off-by: Teo Klestrup Röijezon <teo@nullable.se> * Update kube-derive/src/lib.rs Co-authored-by: Eirik A <sszynrae@gmail.com> Co-authored-by: Eirik A <sszynrae@gmail.com> Signed-off-by: clux <sszynrae@gmail.com>

Co-authored-by: kazk <kazk.dev@gmail.com> Signed-off-by: clux <sszynrae@gmail.com> minor doc improvements Signed-off-by: clux <sszynrae@gmail.com> Update architecture.md Co-authored-by: kazk <kazk.dev@gmail.com> Signed-off-by: clux <sszynrae@gmail.com> Update architecture.md Co-authored-by: kazk <kazk.dev@gmail.com> Signed-off-by: clux <sszynrae@gmail.com> Update architecture.md Co-authored-by: kazk <kazk.dev@gmail.com> Signed-off-by: clux <sszynrae@gmail.com> Update architecture.md Co-authored-by: kazk <kazk.dev@gmail.com> Signed-off-by: clux <sszynrae@gmail.com> Update architecture.md Co-authored-by: kazk <kazk.dev@gmail.com> Signed-off-by: clux <sszynrae@gmail.com> Update examples/README.md Co-authored-by: kazk <kazk.dev@gmail.com> Signed-off-by: clux <sszynrae@gmail.com> Update architecture.md Co-authored-by: kazk <kazk.dev@gmail.com> Update architecture.md Co-authored-by: kazk <kazk.dev@gmail.com> Update architecture.md Co-authored-by: kazk <kazk.dev@gmail.com> Update architecture.md Co-authored-by: kazk <kazk.dev@gmail.com>

nightkr · 2021-10-18T18:30:35Z

Lovely how even trivial docs changes get tripped up by the DCO bot :/

On a more practical note, the constant force-pushing that this leads to is really annoying when trying to follow links from email notifications.

clux · 2021-10-18T18:31:16Z

Yeah, it's almost easier to search and replace doc changes yourself on this scale. Thankfully, it was time to do a rebase anyway.

clux · 2021-10-18T18:33:36Z

On a more practical note, the constant force-pushing that this leads to is really annoying when trying to follow links from email notifications.

Ah, yeah, that is true. I tried to limit most the force pushing here to the very end, but maybe I should wait until PRs are complete ready to go / approved in the future (although then we have to deal with emails from failing DCO bot)..

* add conditions::is_accepted for crds - closes #655 Signed-off-by: clux <sszynrae@gmail.com> * rename to established based on new information + timout guard Signed-off-by: clux <sszynrae@gmail.com> * simplify a bit Signed-off-by: clux <sszynrae@gmail.com> * traitify condition Signed-off-by: clux <sszynrae@gmail.com> * docs for Condition fn trait Signed-off-by: clux <sszynrae@gmail.com> * add example for await_condition as well Signed-off-by: clux <sszynrae@gmail.com> * fix pedantic lints Signed-off-by: clux <sszynrae@gmail.com>

clux · 2021-10-20T21:16:16Z

I'm pretty happy with how documentation looks now all over. After the last cleanup in #662 is done, i'll probably want to merge both and do a release.

Are we otherwise happy with this PR? Happy to spend some more time on it if there's something.

kazk

Looks good to me.

Have you tried using this branch from outside? I remember #525 (comment) worked fine in this workspace, but didn't outside. Just wanted to make sure we don't have anything like that.

clux · 2021-10-20T22:27:32Z

Ah. That's a good point. I'll verify in controller-rs first.

clux · 2021-10-20T23:50:52Z

Ok. It does seem to work fine from controller-rs and version-rs, but going to hold off until tomorrow. Want to POC the EventRecorder in controller-rs and the api still has some awkwardness to it that I would like to iron out before making a release.

architecture.md

nightkr · 2021-10-21T16:46:06Z

kube-client/Cargo.toml

+ws = ["client", "tokio-tungstenite", "rand", "kube-core/ws"]
+oauth = ["client", "tame-oauth"]
+gzip = ["client", "tower-http/decompression-gzip"]
+client = ["config", "__non_core", "hyper", "http-body", "tower", "tower-http", "hyper-timeout", "pin-project", "chrono", "jsonpath_lib", "bytes", "futures", "tokio", "tokio-util", "either"]


What does it mean to build kube-client without client?

you can still get the config out of it. effectively it's similar to old kube, but could possibly strip the kube-client a bit more now.

kube-client/src/lib.rs

Signed-off-by: clux <sszynrae@gmail.com>

- simpler names for snappier docs - removes client side validation - see #654 - everything in one file in root (200 lines after all) - avoids clippy lint Signed-off-by: clux <sszynrae@gmail.com>

Co-authored-by: Teo Klestrup Röijezon <teo.roijezon@stackable.de> Update architecture.md Co-authored-by: Teo Klestrup Röijezon <teo.roijezon@stackable.de> Update architecture.md Co-authored-by: Teo Klestrup Röijezon <teo.roijezon@stackable.de> Signed-off-by: clux <sszynrae@gmail.com>

Signed-off-by: clux <sszynrae@gmail.com>

clux · 2021-10-21T19:01:36Z

Bah. DCO bot is not super reliable in its suggestions for how to fix missing signoffs across big prs... Doing a big force push again.

* add Resource::object_ref helper to simplify event recording Signed-off-by: clux <sszynrae@gmail.com> * a few more simplifications to events recorder Signed-off-by: clux <sszynrae@gmail.com> * fmt Signed-off-by: clux <sszynrae@gmail.com> * clippy + broken doc links Signed-off-by: clux <sszynrae@gmail.com> * one line clarification Signed-off-by: clux <sszynrae@gmail.com> * remove remnants of derive feature from kube-client Signed-off-by: clux <sszynrae@gmail.com> * only clone what is necessary Signed-off-by: clux <sszynrae@gmail.com> * code review doc comments Signed-off-by: clux <sszynrae@gmail.com> * 2021 edition (#664) Signed-off-by: clux <sszynrae@gmail.com>

clux · 2021-10-22T08:59:41Z

Ok. Last tweak to events api + rust 2021 upgrade is in here. Will add CHANGELOG entries and release tonight if all goes as planned :-)

clux linked an issue Oct 13, 2021 that may be closed by this pull request

kube super-crate #651

Closed

clux marked this pull request as ready for review October 14, 2021 21:19

kazk reviewed Oct 14, 2021

View reviewed changes

kube-derive/src/custom_resource.rs Outdated Show resolved Hide resolved

kazk reviewed Oct 14, 2021

View reviewed changes

kube/src/lib.rs Outdated Show resolved Hide resolved

kazk reviewed Oct 14, 2021

View reviewed changes

kube-client/README.md Outdated Show resolved Hide resolved

kazk reviewed Oct 16, 2021

View reviewed changes

kube/src/lib.rs Show resolved Hide resolved

clux linked an issue Oct 17, 2021 that may be closed by this pull request

write an architecture.md #416

Closed

clux mentioned this pull request Oct 17, 2021

write an architecture.md #416

Closed

clux force-pushed the super-crate branch 2 times, most recently from 1345143 to 34420ea Compare October 17, 2021 20:35

clux force-pushed the super-crate branch from 4332fc9 to 1d4e0d7 Compare October 18, 2021 09:46

nightkr mentioned this pull request Oct 18, 2021

Allow #[derive(CustomResource)] to take an arbitrary path to kube_core #658

Merged

clux force-pushed the super-crate branch from 2bf7010 to cd2494c Compare October 18, 2021 13:19

kazk reviewed Oct 18, 2021

View reviewed changes

kube-derive/src/lib.rs Outdated Show resolved Hide resolved

clux force-pushed the super-crate branch from f9e27f6 to 0ba7cc0 Compare October 18, 2021 17:36

kazk reviewed Oct 18, 2021

View reviewed changes

examples/README.md Outdated Show resolved Hide resolved

kazk reviewed Oct 18, 2021

View reviewed changes

clux and others added 11 commits October 18, 2021 19:26

move kube -> kube-client and try to make a facade crate

8755f52

Signed-off-by: clux <sszynrae@gmail.com>

move relative imports from kube-runtime -> kube-client

a54179f

Signed-off-by: clux <sszynrae@gmail.com>

client: fd -e rs | xargs sed -i 's/kube\:\:/kube_client\:\:/g'

4163e84

also add a standalone readme Signed-off-by: clux <sszynrae@gmail.com>

kube-derive path correcting (now always points at kube-core)

1188036

Signed-off-by: clux <sszynrae@gmail.com>

kube-derive to point dev-deps at kube-core as well

982f0eb

Signed-off-by: clux <sszynrae@gmail.com>

fix kube not re-exporting config when client feature set

6c045e4

Signed-off-by: clux <sszynrae@gmail.com>

Update kube/src/lib.rs

4634ac4

Co-authored-by: kazk <kazk.dev@gmail.com> Signed-off-by: clux <sszynrae@gmail.com>

Update kube-client/README.md

7755eb6

Co-authored-by: kazk <kazk.dev@gmail.com> Signed-off-by: clux <sszynrae@gmail.com>

ensure kube::core == kube-client::core == kube-core

7fa42fe

so that we can use same paths equally depending on where we require them Signed-off-by: clux <sszynrae@gmail.com>

add #[kube(kube_crate = "kube")] attr

1672c2e

defaults to kube and will append ::core if kube or kube_client but users can also use it with kube_core directly Signed-off-by: clux <sszynrae@gmail.com>

revert change to kube-dervive dev-dependencies

1ca0764

they need to look like they came from the facade crate Signed-off-by: clux <sszynrae@gmail.com>

clux and others added 3 commits October 18, 2021 19:26

maintain kube doc imports from kube-client

0129c35

Signed-off-by: clux <sszynrae@gmail.com>

use kube imports in examples

5133757

Signed-off-by: clux <sszynrae@gmail.com>

clux force-pushed the super-crate branch 2 times, most recently from fa1ee36 to 293a11c Compare October 18, 2021 18:27

clux force-pushed the super-crate branch from 8944444 to cec9035 Compare October 18, 2021 18:30

clux mentioned this pull request Oct 20, 2021

runtime::events: remove client validation + simplify recorder types/names #662

Merged

kazk approved these changes Oct 20, 2021

View reviewed changes

nightkr approved these changes Oct 21, 2021

View reviewed changes

clux force-pushed the super-crate branch from ab42263 to 4947f7b Compare October 21, 2021 17:48

clux and others added 4 commits October 21, 2021 19:59

add root docs for condition waiting and fill doc gaps in runtime

72a518c

Signed-off-by: clux <sszynrae@gmail.com>

runtime::events: remove client validation + simplify module (#662)

3f90262

- simpler names for snappier docs - removes client side validation - see #654 - everything in one file in root (200 lines after all) - avoids clippy lint Signed-off-by: clux <sszynrae@gmail.com>

change core example in kube-client root

82654c6

Signed-off-by: clux <sszynrae@gmail.com>

clux force-pushed the super-crate branch from 4541785 to adff03d Compare October 21, 2021 19:00

add overlaps and crate delineation at the end

9440df2

Signed-off-by: clux <sszynrae@gmail.com>

clux force-pushed the super-crate branch from adff03d to 9440df2 Compare October 21, 2021 19:00

clux merged commit 8effb4f into master Oct 22, 2021

clux deleted the super-crate branch October 22, 2021 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

move kube -> kube-client and try to make a facade crate #652

move kube -> kube-client and try to make a facade crate #652

clux commented Oct 13, 2021 •

edited

clux commented Oct 14, 2021 •

edited

clux commented Oct 17, 2021 •

edited

nightkr commented Oct 18, 2021 •

edited

clux commented Oct 18, 2021

clux commented Oct 18, 2021

clux commented Oct 20, 2021

kazk left a comment

clux commented Oct 20, 2021

clux commented Oct 20, 2021 •

edited

nightkr Oct 21, 2021

clux Oct 21, 2021

clux commented Oct 21, 2021

clux commented Oct 22, 2021

move kube -> kube-client and try to make a facade crate #652

move kube -> kube-client and try to make a facade crate #652

Conversation

clux commented Oct 13, 2021 • edited

clux commented Oct 14, 2021 • edited

clux commented Oct 17, 2021 • edited

nightkr commented Oct 18, 2021 • edited

clux commented Oct 18, 2021

clux commented Oct 18, 2021

clux commented Oct 20, 2021

kazk left a comment

Choose a reason for hiding this comment

clux commented Oct 20, 2021

clux commented Oct 20, 2021 • edited

nightkr Oct 21, 2021

Choose a reason for hiding this comment

clux Oct 21, 2021

Choose a reason for hiding this comment

clux commented Oct 21, 2021

clux commented Oct 22, 2021

clux commented Oct 13, 2021 •

edited

clux commented Oct 14, 2021 •

edited

clux commented Oct 17, 2021 •

edited

nightkr commented Oct 18, 2021 •

edited

clux commented Oct 20, 2021 •

edited