Address refactoring TODOs in the test/utils module #133236

bxrne · 2025-07-26T15:00:43Z

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

I grepped for TODOs and chose to address three in ./test/utils.

create_resources.go

Encapsulated the per object behaviour into the createWithRetries using a generic type to reduce the amount of code

delete_resources.go

Refactored common parts for generic object kinds by adding an interface ResourceDeleter to allow deleter to be common

update_resources.go

Moved retry/wait to exponential backoff as per TODO for scale.Scale()

Which issue(s) this PR is related to:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

…ions for generic objects

…n up

k8s-ci-robot · 2025-07-26T15:00:53Z

Hi @bxrne. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions 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.

k8s-ci-robot · 2025-07-26T15:01:07Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: bxrne
Once this PR has been reviewed and has the lgtm label, please assign smarterclayton for approval. For more information see the Code Review Process.

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

Needs approval from an approver in each of these files:

test/OWNERS

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

ylink-lfs · 2025-07-26T16:13:59Z

/priority backlog
/sig apps

k8s-ci-robot · 2025-07-26T16:14:03Z

@ylink-lfs: The label(s) sig/app cannot be applied, because the repository doesn't have them.

In response to this:

/priority backlog
/sig app

Instructions 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.

ylink-lfs · 2025-07-29T15:04:35Z

test/utils/update_resources.go

 	updateRetryInterval = 5 * time.Second
-	updateRetryTimeout  = 1 * time.Minute


I suggest adding a method doing exponential backoff retry and keeping the original updateRetryTimeout and corresponding method untouched. Also, define these factors related to exponential backoff implementation inside the newly added utility func like ScaleResourceWithExponentialRetries.

Ok i tried adding a opt-in way of doing it.

ylink-lfs · 2025-07-29T15:10:08Z

test/utils/delete_resources.go

 func DeleteResource(c clientset.Interface, kind schema.GroupKind, namespace, name string, options metav1.DeleteOptions) error {
+	ctx := context.TODO()


We should pass down the ctx from top to bottom (in this case, the caller testutils.DeleteResource(c, kind, ns, name, metav1.DeleteOptions{PropagationPolicy: &background}). Change the function signature of caller to allow it passing down). Your initialization break the context chain.

understood 🫡
have adjusted and fixed references

ylink-lfs · 2025-07-29T15:17:44Z

test/utils/create_resources.go

+
+func CreatePodWithRetries(c clientset.Interface, ns string, pod *v1.Pod) error {
+	return createWithRetries(func() (*v1.Pod, error) {
+		return c.CoreV1().Pods(ns).Create(context.TODO(), pod, metav1.CreateOptions{})


The same context chain break issue as I pointed out in delete_resources.go

ylink-lfs · 2025-07-29T15:18:46Z

/triage accepted
/ok-to-test

…allers adjusted to follow suit

…th no breaking change

k8s-ci-robot · 2025-07-29T17:55:36Z

@bxrne: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-kubernetes-e2e-kind-nftables	`0d906e9`	link	false	`/test pull-kubernetes-e2e-kind-nftables`
pull-kubernetes-linter-hints	`0d906e9`	link	false	`/test pull-kubernetes-linter-hints`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions 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. I understand the commands that are listed here.

bxrne added 3 commits July 26, 2025 15:58

refactor: encapsulated common functionality in create_resources funct…

cf53ba0

…ions for generic objects

refactor: encapsulated delete via options in delete_resources to clea…

d0864c1

…n up

refactor: shifted update_resources scaling to use exponential backoff

cd73f10

k8s-ci-robot added needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/test sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jul 26, 2025

k8s-ci-robot requested review from aojea and wojtek-t July 26, 2025 15:01

k8s-ci-robot added the priority/backlog Higher priority than priority/awaiting-more-evidence. label Jul 26, 2025

k8s-ci-robot added sig/apps Categorizes an issue or PR as relevant to SIG Apps. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jul 26, 2025

github-project-automation bot moved this to Needs Triage in SIG Apps Jul 26, 2025

github-project-automation bot added this to SIG Apps Jul 26, 2025

ylink-lfs suggested changes Jul 29, 2025

View reviewed changes

github-project-automation bot moved this from Needs Triage to In Progress in SIG Apps Jul 29, 2025

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. triage/accepted Indicates an issue or PR is ready to be actively worked on. labels Jul 29, 2025

k8s-ci-robot removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jul 29, 2025

bxrne added 3 commits July 29, 2025 18:29

fix: test/utils resource create and update maintains context chain, c…

737872c

…allers adjusted to follow suit

fix: test/utils update resource has opt-in for exponential backoff wi…

bae963f

…th no breaking change

chore: remove TODO comment

0d906e9

k8s-ci-robot added area/e2e-test-framework Issues or PRs related to refactoring the kubernetes e2e test framework sig/network Categorizes an issue or PR as relevant to SIG Network. labels Jul 29, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Address refactoring TODOs in the test/utils module #133236

Address refactoring TODOs in the test/utils module #133236

bxrne commented Jul 26, 2025

Uh oh!

k8s-ci-robot commented Jul 26, 2025

Uh oh!

k8s-ci-robot commented Jul 26, 2025

Uh oh!

ylink-lfs commented Jul 26, 2025 •

edited

Loading

Uh oh!

k8s-ci-robot commented Jul 26, 2025

Uh oh!

ylink-lfs Jul 29, 2025

Uh oh!

bxrne Jul 29, 2025

Uh oh!

ylink-lfs Jul 29, 2025

Uh oh!

bxrne Jul 29, 2025

Uh oh!

ylink-lfs Jul 29, 2025

Uh oh!

ylink-lfs commented Jul 29, 2025

Uh oh!

k8s-ci-robot commented Jul 29, 2025 •

edited

Loading

Uh oh!

Uh oh!

		updateRetryInterval = 5 * time.Second
		updateRetryTimeout = 1 * time.Minute

		func DeleteResource(c clientset.Interface, kind schema.GroupKind, namespace, name string, options metav1.DeleteOptions) error {
		ctx := context.TODO()

Address refactoring TODOs in the test/utils module #133236

Are you sure you want to change the base?

Address refactoring TODOs in the test/utils module #133236

Conversation

bxrne commented Jul 26, 2025

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR is related to:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

Uh oh!

k8s-ci-robot commented Jul 26, 2025

Uh oh!

k8s-ci-robot commented Jul 26, 2025

Uh oh!

ylink-lfs commented Jul 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented Jul 26, 2025

Uh oh!

ylink-lfs Jul 29, 2025

Choose a reason for hiding this comment

Uh oh!

bxrne Jul 29, 2025

Choose a reason for hiding this comment

Uh oh!

ylink-lfs Jul 29, 2025

Choose a reason for hiding this comment

Uh oh!

bxrne Jul 29, 2025

Choose a reason for hiding this comment

Uh oh!

ylink-lfs Jul 29, 2025

Choose a reason for hiding this comment

Uh oh!

ylink-lfs commented Jul 29, 2025

Uh oh!

k8s-ci-robot commented Jul 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

ylink-lfs commented Jul 26, 2025 •

edited

Loading

k8s-ci-robot commented Jul 29, 2025 •

edited

Loading