Label selector support #1539

Danil-Grigorev · 2024-07-17T12:27:35Z

Motivation

Allow to perform client side resource selection logic based on label selectors, compatible with upstream LabelSelector resource.

Solution

Continued implementation for #1482
Outstanding tasks:

SelectorExt to filter resources in an iteration
Examples of raw uses outside of ListParams

Fixes #1538

straight copy + factor out 2 std imports Signed-off-by: clux <sszynrae@gmail.com>

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

Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>

codecov · 2024-07-17T12:39:04Z

Codecov Report

Attention: Patch coverage is 89.79592% with 25 lines in your changes missing coverage. Please review.

Project coverage is 75.7%. Comparing base (e57b060) to head (32089f1).

Additional details and impacted files

@@           Coverage Diff           @@
##            main   #1539     +/-   ##
=======================================
+ Coverage   75.2%   75.7%   +0.5%     
=======================================
  Files         78      79      +1     
  Lines       6989    7234    +245     
=======================================
+ Hits        5249    5469    +220     
- Misses      1740    1765     +25

Files	Coverage Δ
kube-core/src/params.rs	`85.6% <100.0%> (+1.1%)`	⬆️
kube/src/lib.rs	`88.5% <ø> (ø)`
kube-runtime/src/watcher.rs	`42.1% <0.0%> (-0.5%)`	⬇️
kube-core/src/labels.rs	`90.3% <90.3%> (ø)`

clux

thanks for doing this!
couple of quick initial comments, will think some more about it tomorrow

kube-core/src/labels.rs

clux

quick doc suggestions if it works

kube-core/src/labels.rs

- Add SelectorExt to the prelude - Remove Map in favor of more explicit BTreeMap<String, String> - Add exmples of usage Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>

clux

q on error handling

gone through most of this now, looks really good!

kube-runtime/src/watcher.rs

kube-core/src/labels.rs

clux

comments on exposed interfaces

kube-core/src/labels.rs

Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>

- fmt fixes Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>

kube-core/src/labels.rs

clux

thought on the trait now that it's reduced a bit

kube-core/src/labels.rs

kube-core/src/params.rs

- Implemented for Selector and Expression for now Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>

clux and others added 3 commits July 17, 2024 14:26

Import labels module from linkerd

71fc04b

straight copy + factor out 2 std imports Signed-off-by: clux <sszynrae@gmail.com>

some initial interface thoughts

4e710df

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

Implement Selector to match on resource labels

e056a77

Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>

Danil-Grigorev force-pushed the label-selector-support branch from f21af26 to e056a77 Compare July 17, 2024 12:29

Danil-Grigorev force-pushed the label-selector-support branch 8 times, most recently from c2c5a95 to 5ab3b6f Compare July 17, 2024 16:36

clux reviewed Jul 17, 2024

View reviewed changes

kube-core/src/labels.rs Outdated Show resolved Hide resolved

kube-core/src/labels.rs Outdated Show resolved Hide resolved

clux added the changelog-add changelog added category for prs label Jul 17, 2024

Danil-Grigorev mentioned this pull request Jul 18, 2024

Label selector based import setting rancher-sandbox/cluster-api-addon-provider-fleet#68

Merged

Danil-Grigorev force-pushed the label-selector-support branch 3 times, most recently from 7bfb50d to 7266049 Compare July 18, 2024 11:07

Danil-Grigorev mentioned this pull request Jul 18, 2024

Improve logging and refactor labels matcher on upstream implementation crust-gather/crust-gather#81

Merged

Danil-Grigorev force-pushed the label-selector-support branch 2 times, most recently from 48bdf98 to 6b9e01b Compare July 18, 2024 20:33

clux reviewed Jul 18, 2024

View reviewed changes

kube-core/src/labels.rs Outdated Show resolved Hide resolved

kube-core/src/labels.rs Outdated Show resolved Hide resolved

clux linked an issue Jul 18, 2024 that may be closed by this pull request

More ergonomic ListParams::labels #1386

Closed

Implement SelectorExt and a Matcher trait

4fe0ab5

- Add SelectorExt to the prelude - Remove Map in favor of more explicit BTreeMap<String, String> - Add exmples of usage Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>

Danil-Grigorev force-pushed the label-selector-support branch from 6b9e01b to 4fe0ab5 Compare July 18, 2024 20:52

clux reviewed Jul 18, 2024

View reviewed changes

kube-runtime/src/watcher.rs Show resolved Hide resolved

kube-core/src/labels.rs Outdated Show resolved Hide resolved

kube-core/src/labels.rs Show resolved Hide resolved

SOF3 reviewed Jul 19, 2024

View reviewed changes

kube-core/src/labels.rs Outdated Show resolved Hide resolved

SOF3 reviewed Jul 19, 2024

View reviewed changes

kube-core/src/labels.rs Show resolved Hide resolved

SOF3 reviewed Jul 19, 2024

View reviewed changes

kube-core/src/labels.rs Show resolved Hide resolved

clux added this to the 0.93.0 milestone Jul 19, 2024

Danil-Grigorev force-pushed the label-selector-support branch from cf91e40 to fa7b856 Compare July 19, 2024 09:58

clux reviewed Jul 19, 2024

View reviewed changes

kube-core/src/labels.rs Outdated Show resolved Hide resolved

kube-core/src/labels.rs Outdated Show resolved Hide resolved

kube-core/src/labels.rs Outdated Show resolved Hide resolved

Use TryFrom for LabelSelector conversion, drop Expression::Invalid

5c52593

Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>

clux mentioned this pull request Jul 19, 2024

Experimenting with adapting the linkerd labels module for general use #1482

Closed

7 tasks

Danil-Grigorev force-pushed the label-selector-support branch 2 times, most recently from 2818144 to 3f83904 Compare July 19, 2024 10:52

Sealing the SelectorExt trait

a676a86

- fmt fixes Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>

Danil-Grigorev force-pushed the label-selector-support branch 2 times, most recently from 11634fb to 5ee5933 Compare July 19, 2024 12:29

clux reviewed Jul 19, 2024

View reviewed changes

kube-core/src/labels.rs Outdated Show resolved Hide resolved

Danil-Grigorev force-pushed the label-selector-support branch 2 times, most recently from 212f730 to 2050c42 Compare July 19, 2024 12:49

clux reviewed Jul 19, 2024

View reviewed changes

kube-core/src/labels.rs Outdated Show resolved Hide resolved

Danil-Grigorev force-pushed the label-selector-support branch 2 times, most recently from 8e4d9ad to 1c37514 Compare July 19, 2024 15:54

clux approved these changes Jul 19, 2024

View reviewed changes

clux reviewed Jul 19, 2024

View reviewed changes

kube-core/src/params.rs Show resolved Hide resolved

Rename Matcher to SelectorExt and seal

32089f1

- Implemented for Selector and Expression for now Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>

Danil-Grigorev force-pushed the label-selector-support branch from 1c37514 to 32089f1 Compare July 20, 2024 11:16

clux merged commit 1816fd8 into kube-rs:main Jul 20, 2024
17 checks passed

Danil-Grigorev mentioned this pull request Jul 21, 2024

WIP: Add expression macro for the selector type #1544

Closed

1 task

clux mentioned this pull request Jul 22, 2024

preparing 0.93 #1545

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Label selector support #1539

Label selector support #1539

Danil-Grigorev commented Jul 17, 2024 •

edited

Loading

codecov bot commented Jul 17, 2024 •

edited

Loading

clux left a comment

clux left a comment

clux left a comment

clux left a comment

clux left a comment

Label selector support #1539

Label selector support #1539

Conversation

Danil-Grigorev commented Jul 17, 2024 • edited Loading

Motivation

Solution

codecov bot commented Jul 17, 2024 • edited Loading

Codecov Report

clux left a comment

Choose a reason for hiding this comment

clux left a comment

Choose a reason for hiding this comment

clux left a comment

Choose a reason for hiding this comment

clux left a comment

Choose a reason for hiding this comment

clux left a comment

Choose a reason for hiding this comment

Danil-Grigorev commented Jul 17, 2024 •

edited

Loading

codecov bot commented Jul 17, 2024 •

edited

Loading