chore(defaultevictor): add MatchExpressions compatibility to the namespaceselector#1853
Conversation
|
Welcome @Fankhauserli! |
|
Hi @Fankhauserli. Thanks for your PR. I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with Regular contributors should join the org to skip this step. Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
/ok-to-test |
|
/lgtm |
| }) | ||
|
|
||
| fakeClient := fake.NewClientset(node, nsProd, nsBackend, nsTest, podInProd, podInBackend, podInTest) | ||
| fakeClient := fake.NewSimpleClientset(node, nsProd, nsBackend, nsTest, podInProd, podInBackend, podInTest) |
There was a problem hiding this comment.
Is this intentional? The newly written tests use NewSimpleClientset.
|
|
||
| fakeClient := fake.NewClientset(node, nsProd, nsTest, podInProd, podInTest) | ||
| sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0) | ||
| getPodAssignedToNode, _ := podutil.BuildGetPodsAssignedToNodeFunc(sharedInformerFactory.Core().V1().Pods().Informer()) |
There was a problem hiding this comment.
Probably rare to fail here but still good practice to check the error
| testCases := []struct { | ||
| name string | ||
| args *DefaultEvictorArgs | ||
| results map[string]bool // pod name -> should pass PreEvictionFilter |
There was a problem hiding this comment.
What about to create a list of pointers to pods to pass and not pass to make the selection more explicit instead of constructing it at the end? To make the test easier to read.
| nsNoLabels.Labels = map[string]string{} | ||
|
|
||
| podInProd := test.BuildTestPod("pod-in-prod", 100, 100, node.Name, func(pod *v1.Pod) { | ||
| pod.Namespace = "ns-prod" |
There was a problem hiding this comment.
pod.Namespace = nsProd.Name to avoid duplicating the string literal. The same for other occurences.
| nsNoLabels := test.BuildTestNamespace("ns-nolabels") | ||
| nsNoLabels.Labels = map[string]string{} | ||
|
|
||
| podInProd := test.BuildTestPod("pod-in-prod", 100, 100, node.Name, func(pod *v1.Pod) { |
There was a problem hiding this comment.
s/podInProd/podInProdFrontend to make it explicit. The same for other occurences.
| defer cancel() | ||
| node := test.BuildTestNode("node1", 1000, 2000, 10, nil) | ||
|
|
||
| podProd := test.BuildTestPod("pod-prod", 100, 100, node.Name, func(pod *v1.Pod) { |
There was a problem hiding this comment.
ditto. s/podProd/podProdFrontend and other occurences
| testCases := []struct { | ||
| name string | ||
| args *DefaultEvictorArgs | ||
| results map[string]bool // pod name -> should pass Filter |
|
The first commit introduces a lot of test code that is then removed/updated in the second commit. Can you please either squash the commits or make the new tests part of a single commit? |
|
@Fankhauserli thank you for the code changes and welcome as a contributor |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ingvagabund The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
…escheduler (0.35.1 ➔ 0.36.0) (#586) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [ghcr.io/home-operations/charts-mirror/descheduler](https://github.com/kubernetes-sigs/descheduler) | minor | `0.35.1` → `0.36.0` | --- ### Release Notes <details> <summary>kubernetes-sigs/descheduler (ghcr.io/home-operations/charts-mirror/descheduler)</summary> ### [`v0.36.0`](https://github.com/kubernetes-sigs/descheduler/releases/tag/v0.36.0): Descheduler v0.36.0 [Compare Source](kubernetes-sigs/descheduler@v0.35.1...v0.36.0) #### What's Changed - fix(ci): pin helm-unittest plugin version and bump chart-testing-action by [@​a7i](https://github.com/a7i) in [#​1834](kubernetes-sigs/descheduler#1834) - Update helm RBAC to account for pvc failure on 0.35.0 by [@​cayla](https://github.com/cayla) in [#​1836](kubernetes-sigs/descheduler#1836) - Add init containers support to Helm chart by [@​kamleshjoshi8102](https://github.com/kamleshjoshi8102) in [#​1826](kubernetes-sigs/descheduler#1826) - Change icon URL in Chart.yaml by [@​a7i](https://github.com/a7i) in [#​1838](kubernetes-sigs/descheduler#1838) - fix: resolve detected data races by [@​ingvagabund](https://github.com/ingvagabund) in [#​1842](kubernetes-sigs/descheduler#1842) - fix(ci): upgrade codeql-action to v4 and clean up security workflow by [@​a7i](https://github.com/a7i) in [#​1847](kubernetes-sigs/descheduler#1847) - update golang semconv dependencies by [@​sammedsingalkar09](https://github.com/sammedsingalkar09) in [#​1848](kubernetes-sigs/descheduler#1848) - Extend PodLifeTime with condition, exit code, owner kind, and transition time filters by [@​a7i](https://github.com/a7i) in [#​1844](kubernetes-sigs/descheduler#1844) - security: Update trivy-action to use sha for v0.35.0 by [@​Priyankasaggu11929](https://github.com/Priyankasaggu11929) in [#​1854](kubernetes-sigs/descheduler#1854) - security: upgrade grpc and otel sdk dependencies by [@​sammedsingalkar09](https://github.com/sammedsingalkar09) in [#​1859](kubernetes-sigs/descheduler#1859) - evictions: fix missing observability for background evictions by [@​tiraboschi](https://github.com/tiraboschi) in [#​1856](kubernetes-sigs/descheduler#1856) - fix(descheduler): reset prometheus usage client at each extension point by [@​tiraboschi](https://github.com/tiraboschi) in [#​1862](kubernetes-sigs/descheduler#1862) - fix(.github/workflows/manifests.yaml): pin actions to a sha by [@​ingvagabund](https://github.com/ingvagabund) in [#​1868](kubernetes-sigs/descheduler#1868) - cloudbuild: pin gcb-docker-gcloud image by digest by [@​Paramesh324](https://github.com/Paramesh324) in [#​1871](kubernetes-sigs/descheduler#1871) - chart: allow overriding ServiceMonitor apiVersion by [@​a7i](https://github.com/a7i) in [#​1837](kubernetes-sigs/descheduler#1837) - ci: pin GitHub Actions to immutable SHAs by [@​a7i](https://github.com/a7i) in [#​1875](kubernetes-sigs/descheduler#1875) - evictions: fix assumePod silently dropping success metric on informer race by [@​tiraboschi](https://github.com/tiraboschi) in [#​1873](kubernetes-sigs/descheduler#1873) - chore(defaultevictor): add MatchExpressions compatibility to the namespaceselector by [@​Fankhauserli](https://github.com/Fankhauserli) in [#​1853](kubernetes-sigs/descheduler#1853) - fix(test/setupTestSandbox): wait until initial objects are propagated to informers by [@​ingvagabund](https://github.com/ingvagabund) in [#​1878](kubernetes-sigs/descheduler#1878) - \[v0.36.0] release prep: bump k8s/go deps, manifests, docs, and CI matrix by [@​a7i](https://github.com/a7i) in [#​1874](kubernetes-sigs/descheduler#1874) #### New Contributors - [@​kamleshjoshi8102](https://github.com/kamleshjoshi8102) made their first contribution in [#​1826](kubernetes-sigs/descheduler#1826) - [@​Priyankasaggu11929](https://github.com/Priyankasaggu11929) made their first contribution in [#​1854](kubernetes-sigs/descheduler#1854) - [@​Paramesh324](https://github.com/Paramesh324) made their first contribution in [#​1871](kubernetes-sigs/descheduler#1871) - [@​Fankhauserli](https://github.com/Fankhauserli) made their first contribution in [#​1853](kubernetes-sigs/descheduler#1853) **Full Changelog**: <kubernetes-sigs/descheduler@v0.35.0...v0.36.0> </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4xMDEuMSIsInVwZGF0ZWRJblZlciI6IjQzLjEwMS4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZS9jb250YWluZXIiLCJ0eXBlL21pbm9yIl19--> Reviewed-on: https://git.erwanleboucher.dev/eleboucher/homelab/pulls/586
…uler ( 0.35.1 ➔ 0.36.0 ) (#85) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [ghcr.io/home-operations/charts-mirror/descheduler](https://github.com/kubernetes-sigs/descheduler) | minor | `0.35.1` → `0.36.0` | --- >⚠️ **Warning** > > Some dependencies could not be looked up. Check the [Dependency Dashboard](issues/34) for more information. --- ### Release Notes <details> <summary>kubernetes-sigs/descheduler (ghcr.io/home-operations/charts-mirror/descheduler)</summary> ### [`v0.36.0`](https://github.com/kubernetes-sigs/descheduler/releases/tag/v0.36.0): Descheduler v0.36.0 [Compare Source](kubernetes-sigs/descheduler@v0.35.1...v0.36.0) #### What's Changed - fix(ci): pin helm-unittest plugin version and bump chart-testing-action by [@​a7i](https://github.com/a7i) in [#​1834](kubernetes-sigs/descheduler#1834) - Update helm RBAC to account for pvc failure on 0.35.0 by [@​cayla](https://github.com/cayla) in [#​1836](kubernetes-sigs/descheduler#1836) - Add init containers support to Helm chart by [@​kamleshjoshi8102](https://github.com/kamleshjoshi8102) in [#​1826](kubernetes-sigs/descheduler#1826) - Change icon URL in Chart.yaml by [@​a7i](https://github.com/a7i) in [#​1838](kubernetes-sigs/descheduler#1838) - fix: resolve detected data races by [@​ingvagabund](https://github.com/ingvagabund) in [#​1842](kubernetes-sigs/descheduler#1842) - fix(ci): upgrade codeql-action to v4 and clean up security workflow by [@​a7i](https://github.com/a7i) in [#​1847](kubernetes-sigs/descheduler#1847) - update golang semconv dependencies by [@​sammedsingalkar09](https://github.com/sammedsingalkar09) in [#​1848](kubernetes-sigs/descheduler#1848) - Extend PodLifeTime with condition, exit code, owner kind, and transition time filters by [@​a7i](https://github.com/a7i) in [#​1844](kubernetes-sigs/descheduler#1844) - security: Update trivy-action to use sha for v0.35.0 by [@​Priyankasaggu11929](https://github.com/Priyankasaggu11929) in [#​1854](kubernetes-sigs/descheduler#1854) - security: upgrade grpc and otel sdk dependencies by [@​sammedsingalkar09](https://github.com/sammedsingalkar09) in [#​1859](kubernetes-sigs/descheduler#1859) - evictions: fix missing observability for background evictions by [@​tiraboschi](https://github.com/tiraboschi) in [#​1856](kubernetes-sigs/descheduler#1856) - fix(descheduler): reset prometheus usage client at each extension point by [@​tiraboschi](https://github.com/tiraboschi) in [#​1862](kubernetes-sigs/descheduler#1862) - fix(.github/workflows/manifests.yaml): pin actions to a sha by [@​ingvagabund](https://github.com/ingvagabund) in [#​1868](kubernetes-sigs/descheduler#1868) - cloudbuild: pin gcb-docker-gcloud image by digest by [@​Paramesh324](https://github.com/Paramesh324) in [#​1871](kubernetes-sigs/descheduler#1871) - chart: allow overriding ServiceMonitor apiVersion by [@​a7i](https://github.com/a7i) in [#​1837](kubernetes-sigs/descheduler#1837) - ci: pin GitHub Actions to immutable SHAs by [@​a7i](https://github.com/a7i) in [#​1875](kubernetes-sigs/descheduler#1875) - evictions: fix assumePod silently dropping success metric on informer race by [@​tiraboschi](https://github.com/tiraboschi) in [#​1873](kubernetes-sigs/descheduler#1873) - chore(defaultevictor): add MatchExpressions compatibility to the namespaceselector by [@​Fankhauserli](https://github.com/Fankhauserli) in [#​1853](kubernetes-sigs/descheduler#1853) - fix(test/setupTestSandbox): wait until initial objects are propagated to informers by [@​ingvagabund](https://github.com/ingvagabund) in [#​1878](kubernetes-sigs/descheduler#1878) - \[v0.36.0] release prep: bump k8s/go deps, manifests, docs, and CI matrix by [@​a7i](https://github.com/a7i) in [#​1874](kubernetes-sigs/descheduler#1874) #### New Contributors - [@​kamleshjoshi8102](https://github.com/kamleshjoshi8102) made their first contribution in [#​1826](kubernetes-sigs/descheduler#1826) - [@​Priyankasaggu11929](https://github.com/Priyankasaggu11929) made their first contribution in [#​1854](kubernetes-sigs/descheduler#1854) - [@​Paramesh324](https://github.com/Paramesh324) made their first contribution in [#​1871](kubernetes-sigs/descheduler#1871) - [@​Fankhauserli](https://github.com/Fankhauserli) made their first contribution in [#​1853](kubernetes-sigs/descheduler#1853) **Full Changelog**: <kubernetes-sigs/descheduler@v0.35.0...v0.36.0> </details> --- ### Configuration 📅 **Schedule**: (in timezone America/New_York) - Branch creation - At any time (no schedule defined) - Automerge - At any time (no schedule defined) 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4xODIuMiIsInVwZGF0ZWRJblZlciI6IjQzLjE4Mi4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZS9jb250YWluZXIiLCJ0eXBlL21pbm9yIl19--> Reviewed-on: https://git.greyrock.io/greyrock-labs/home-ops/pulls/85
Description
We noticed that the new
NamespaceLabelSelectordoes not implement the MatchExpressions selector. This is vital for our workflow, as we need to use an exclusion label with aMatchExpression.Our target configuration looks something like this:
Currently, the descheduler only checks for MatchLabels:
This Pull Request updates the condition to account for MatchExpressions as well, and adds the corresponding tests to ensure the new behavior works as expected.
Checklist
Please ensure your pull request meets the following criteria before submitting
for review, these items will be used by reviewers to assess the quality and
completeness of your changes: