Add indexer to fakeCilent when bumping k8s.io deps to v0.26.1 #588

kerthcet · 2023-02-20T11:14:05Z

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #586

Special notes for your reviewer:

The test error was introduced in kubernetes-sigs/controller-runtime#2025, for fakeClient will check the indexes but we didn't register any in unit tests.

But we can register these indexes when building the client.

netlify · 2023-02-20T11:14:10Z

✅ Deploy Preview for kubernetes-sigs-kueue canceled.

Name	Link
🔨 Latest commit	`644cbee`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-kueue/deploys/63f644ab20823e00083e21cd

tenzen-y

/lgtm

alculquicondor · 2023-02-21T13:11:09Z

can you bump all the k8s libraries together?

kerthcet · 2023-02-21T16:07:40Z

/retest

kerthcet · 2023-02-21T16:07:58Z

Failed test: https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_kueue/588/pull-kueue-test-unit-main/1628060447326343168

Signed-off-by: Kante Yin <kerthcet@gmail.com>

kerthcet · 2023-02-22T08:45:37Z

The test error was introduced in kubernetes-sigs/controller-runtime#2025, for fakeClient will check the indexes but we didn't register any in unit tests.

kerthcet · 2023-02-22T08:46:18Z

But we can register these indexes when building the client.

Signed-off-by: Kante Yin <kerthcet@gmail.com>

pkg/util/testing/client.go

kerthcet · 2023-02-22T10:45:49Z

pkg/util/indexer/indexer.go

+)
+
+var (
+	IndexQueueClusterQueue = func(obj client.Object) []string {


These index functions both used in package cache and queue, so moved to util/indexer.

Maybe we should just have a single SetupIndexes function for the kueue APIs.

Do you mean have only one setupIndexes() in main.go? Not separated into different packages like queue, cache, job.

probably not in main.go, because the tests need it. But yes, a single place.

Let me make this cleanup tomorrow. We can leave this a follow up if that's ok with you.

kerthcet · 2023-02-22T10:58:32Z

Yes, the test error fixed.

pkg/util/testing/client.go

pkg/util/indexer/indexer.go

pkg/util/testing/client.go

pkg/util/indexer/indexer.go

pkg/constants/constants.go

pkg/util/testing/client.go

alculquicondor · 2023-02-22T16:10:55Z

pkg/util/indexer/indexer.go

+)
+
+var (
+	IndexQueueClusterQueue = func(obj client.Object) []string {


Maybe we should just have a single SetupIndexes function for the kueue APIs.

pkg/util/testing/client.go

Signed-off-by: Kante Yin <kerthcet@gmail.com>

kerthcet · 2023-02-22T16:39:20Z

All addressed except #588 (comment).

tenzen-y

Thanks!
LGTM from my side.

alculquicondor · 2023-02-22T16:48:20Z

pkg/util/indexer/indexer.go

+		return []string{string(q.Spec.ClusterQueue)}
+	}
+
+	IndexWorkloadQueue = func(obj client.Object) []string {


Suggested change

IndexWorkloadQueue = func(obj client.Object) []string {

func IndexWorkloadQueue(obj client.Object) []string {

why overcomplicate things :)

I agree.
@kerthcet Can you follow up with another PR?

The follow up PR will just move the entire SetupIndexes functions here.

alculquicondor

/approve

k8s-ci-robot · 2023-02-22T16:49:35Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alculquicondor, kerthcet

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [alculquicondor]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

alculquicondor · 2023-02-22T16:49:38Z

/lgtm

alculquicondor · 2023-02-22T19:27:05Z

@kerthcet we can also get rid of checks like this:

kueue/pkg/queue/manager.go

Line 172 in c45d3dd

// Checking queue name again because the field index is not available in tests.

k8s-ci-robot added the kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. label Feb 20, 2023

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 20, 2023

k8s-ci-robot requested review from ahg-g and tenzen-y February 20, 2023 11:14

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 20, 2023

kerthcet mentioned this pull request Feb 20, 2023

Bump github.com/open-policy-agent/cert-controller from 0.6.0 to 0.7.0 #586

Merged

tenzen-y reviewed Feb 20, 2023

View reviewed changes

k8s-ci-robot assigned tenzen-y Feb 20, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 20, 2023

kerthcet force-pushed the bump/kube-api branch from 74d8f24 to cfb0e88 Compare February 21, 2023 15:49

kerthcet force-pushed the bump/kube-api branch from cfb0e88 to 7983193 Compare February 21, 2023 15:53

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 21, 2023

kerthcet force-pushed the bump/kube-api branch from 7983193 to 54196b1 Compare February 22, 2023 03:25

Bump k8s libraries to v0.26.1

70195ca

Signed-off-by: Kante Yin <kerthcet@gmail.com>

kerthcet changed the title ~~Bump k8s.io/api to v0.26.1~~ Bump k8s.io deps to v0.26.1 Feb 22, 2023

kerthcet force-pushed the bump/kube-api branch from 479cb82 to a3f8127 Compare February 22, 2023 08:55

kerthcet changed the title ~~Bump k8s.io deps to v0.26.1~~ Add indexer when building fakeClient after bumping k8s.io deps to v0.26.1 Feb 22, 2023

kerthcet changed the title ~~Add indexer when building fakeClient after bumping k8s.io deps to v0.26.1~~ Add indexer when building fakeClient Feb 22, 2023

kerthcet changed the title ~~Add indexer when building fakeClient~~ Add indexer to fakeCilent when bumping k8s.io deps to v0.26.1 Feb 22, 2023

Add indexer when building fakeClient

774c656

Signed-off-by: Kante Yin <kerthcet@gmail.com>

kerthcet force-pushed the bump/kube-api branch from a3f8127 to 774c656 Compare February 22, 2023 10:39

fix test error

4dc95c2

Signed-off-by: Kante Yin <kerthcet@gmail.com>

kerthcet commented Feb 22, 2023

View reviewed changes

tenzen-y reviewed Feb 22, 2023

View reviewed changes

pkg/util/testing/client.go Outdated Show resolved Hide resolved

pkg/util/indexer/indexer.go Outdated Show resolved Hide resolved

pkg/util/testing/client.go Outdated Show resolved Hide resolved

pkg/util/indexer/indexer.go Outdated Show resolved Hide resolved

alculquicondor reviewed Feb 22, 2023

View reviewed changes

address comments

644cbee

Signed-off-by: Kante Yin <kerthcet@gmail.com>

tenzen-y reviewed Feb 22, 2023

View reviewed changes

alculquicondor reviewed Feb 22, 2023

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 22, 2023

k8s-ci-robot assigned alculquicondor Feb 22, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 22, 2023

k8s-ci-robot merged commit 58fc339 into kubernetes-sigs:main Feb 22, 2023

kerthcet deleted the bump/kube-api branch February 23, 2023 05:04

kerthcet mentioned this pull request Feb 23, 2023

Consolidate indexes in a single package #592

Merged

alculquicondor mentioned this pull request Mar 2, 2023

New controller-runtime broke support for FieldOwner in status updates #601

Closed

tenzen-y mentioned this pull request Apr 26, 2023

Remove redundant checks in the cache #727

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add indexer to fakeCilent when bumping k8s.io deps to v0.26.1 #588

Add indexer to fakeCilent when bumping k8s.io deps to v0.26.1 #588

kerthcet commented Feb 20, 2023 •

edited

netlify bot commented Feb 20, 2023 •

edited

tenzen-y left a comment

alculquicondor commented Feb 21, 2023

kerthcet commented Feb 21, 2023

kerthcet commented Feb 21, 2023

kerthcet commented Feb 22, 2023

kerthcet commented Feb 22, 2023

kerthcet Feb 22, 2023

alculquicondor Feb 22, 2023

kerthcet Feb 22, 2023

alculquicondor Feb 22, 2023

kerthcet Feb 22, 2023

alculquicondor Feb 22, 2023

kerthcet commented Feb 22, 2023

alculquicondor Feb 22, 2023

kerthcet commented Feb 22, 2023

tenzen-y left a comment

alculquicondor Feb 22, 2023

tenzen-y Feb 22, 2023 •

edited

alculquicondor Feb 22, 2023

tenzen-y Feb 22, 2023

alculquicondor left a comment

k8s-ci-robot commented Feb 22, 2023

alculquicondor commented Feb 22, 2023

alculquicondor commented Feb 22, 2023

	IndexWorkloadQueue = func(obj client.Object) []string {
	func IndexWorkloadQueue(obj client.Object) []string {

Add indexer to fakeCilent when bumping k8s.io deps to v0.26.1 #588

Add indexer to fakeCilent when bumping k8s.io deps to v0.26.1 #588

Conversation

kerthcet commented Feb 20, 2023 • edited

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

netlify bot commented Feb 20, 2023 • edited

✅ Deploy Preview for kubernetes-sigs-kueue canceled.

tenzen-y left a comment

Choose a reason for hiding this comment

alculquicondor commented Feb 21, 2023

kerthcet commented Feb 21, 2023

kerthcet commented Feb 21, 2023

kerthcet commented Feb 22, 2023

kerthcet commented Feb 22, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kerthcet commented Feb 22, 2023

Choose a reason for hiding this comment

kerthcet commented Feb 22, 2023

tenzen-y left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tenzen-y Feb 22, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alculquicondor left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Feb 22, 2023

alculquicondor commented Feb 22, 2023

alculquicondor commented Feb 22, 2023

kerthcet commented Feb 20, 2023 •

edited

netlify bot commented Feb 20, 2023 •

edited

tenzen-y Feb 22, 2023 •

edited