feat(tests): add cleanup target for e2e.ocp test artifacts closes #1164 by rafaelvzago · Pull Request #1203 · istio-ecosystem/sail-operator

rafaelvzago · 2025-09-05T14:06:41Z

What type of PR is this?

What this PR does / why we need it:

This PR adds a new Makefile target test.e2e.ocp.cleanup to clean up leftover artifacts from e2e.ocp tests. The cleanup script removes cluster-level resources that may remain after running e2e tests against an OpenShift cluster, including:

metrics-reader-rolebinding ClusterRoleBinding
metrics-reader ClusterRole
Istio CRDs (*.istio)
Sail Operator CRDs (*.sail)

The cleanup script handles missing resources gracefully and follows the same patterns used by other cleanup operations in the project. This addresses the need for a systematic way to clean up test artifacts that could interfere with subsequent test runs or cluster operations.

Which issue(s) this PR fixes:

Fixes #1164

Additional information:

The cleanup script is placed in tests/e2e/ following the established folder structure
Uses kubectl commands with --ignore-not-found and || true flags for safe cleanup operations
The Makefile target depends on verify-kubeconfig to ensure cluster connectivity
Script includes proper error handling and follows the project's shell scripting patterns

This template accurately reflects the testing infrastructure enhancement that was implemented.

linux-foundation-easycla · 2025-09-05T14:06:52Z

The committers listed above are authorized under a signed CLA.

✅ login: rafaelvzago / name: Rafael Zago (1429ea4, 220dede, 008ec82, a15585e)

istio-testing · 2025-09-05T14:06:59Z

Hi @rafaelvzago. Thanks for your PR.

I'm waiting for a istio-ecosystem or istio 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.

Details

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.

cam-garrison · 2025-09-05T17:44:45Z

/ok-to-test

tests/e2e/cleanup-ocp.sh

…io-ecosystem#1164 Signed-off-by: Rafael Zago <rafaelvzago@gmail.com>

closes istio-ecosystem#1164 Signed-off-by: Rafael Zago <rafaelvzago@gmail.com>

sridhargaddam

Thanks @rafaelvzago, some minor comments.

tests/e2e/cleanup-ocp.sh

closes istio-ecosystem#1164 Signed-off-by: Rafael Zago <rafaelvzago@gmail.com>

tests/e2e/cleanup-ocp.sh

Closes istio-ecosystem#1164 Signed-off-by: Rafael Zago <rafaelvzago@gmail.com>

sridhargaddam

Thank you @rafaelvzago

* upstream/main: feat(tests): add cleanup target for e2e.ocp test artifacts closes istio-ecosystem#1164 (istio-ecosystem#1203) Add OCP-specific flag to CreateRemoteSecret (istio-ecosystem#1213) Allow set multicluster flag with env (istio-ecosystem#1212) Fix macOS compatibility for update_deps.sh and update macOS specific dev docs (istio-ecosystem#1137) Add commit validation GH action (istio-ecosystem#1188) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1208)

* upstream/main: Remove explicit labelling for multicluster network (istio-ecosystem#1216) feat(tests): add cleanup target for e2e.ocp test artifacts closes istio-ecosystem#1164 (istio-ecosystem#1203) Add OCP-specific flag to CreateRemoteSecret (istio-ecosystem#1213) Allow set multicluster flag with env (istio-ecosystem#1212) Fix macOS compatibility for update_deps.sh and update macOS specific dev docs (istio-ecosystem#1137) Add commit validation GH action (istio-ecosystem#1188) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1208)

* upstream/main: Fix junit report generation (istio-ecosystem#1218) Remove explicit labelling for multicluster network (istio-ecosystem#1216) feat(tests): add cleanup target for e2e.ocp test artifacts closes istio-ecosystem#1164 (istio-ecosystem#1203) Add OCP-specific flag to CreateRemoteSecret (istio-ecosystem#1213) Allow set multicluster flag with env (istio-ecosystem#1212) Fix macOS compatibility for update_deps.sh and update macOS specific dev docs (istio-ecosystem#1137) Add commit validation GH action (istio-ecosystem#1188) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1208)

FilipB · 2025-11-27T13:29:36Z

/cherrypick release-1.27

istio-testing · 2025-11-27T13:30:16Z

@FilipB: new pull request created: #1398

Details

In response to this:

/cherrypick release-1.27

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.

FilipB · 2025-11-27T13:30:57Z

/cherrypick release-1.26

istio-testing · 2025-11-27T13:31:35Z

@FilipB: new pull request created: #1399

Details

In response to this:

/cherrypick release-1.26

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.

FilipB · 2025-11-27T13:31:59Z

/cherrypick release-1.28

istio-testing · 2025-11-27T13:32:35Z

@FilipB: #1203 failed to apply on top of branch "release-1.28":

Applying: feat(tests): add cleanup target for e2e.ocp test artifacts closes #1164
Using index info to reconstruct a base tree...
M	Makefile.core.mk
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in tests/e2e/cleanup-ocp.sh
Auto-merging tests/e2e/cleanup-ocp.sh
Auto-merging Makefile.core.mk
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 feat(tests): add cleanup target for e2e.ocp test artifacts closes #1164

Details

In response to this:

/cherrypick release-1.28

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.

istio-testing · 2025-11-27T13:32:36Z

@FilipB: new issue created for failed cherrypick: #1400

Details

In response to this:

/cherrypick release-1.28

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.

FilipB · 2025-11-27T13:35:10Z

/cherrypick release-1.0

istio-testing · 2025-11-27T13:35:48Z

@FilipB: new pull request created: #1401

Details

In response to this:

/cherrypick release-1.0

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.

…io-ecosystem#1164 (istio-ecosystem#1203) * feat(tests): add cleanup target for e2e.ocp test artifacts closes istio-ecosystem#1164 Signed-off-by: Rafael Zago <rafaelvzago@gmail.com> * feat(tests): enhance cleanup script to follow official undeploy process closes istio-ecosystem#1164 Signed-off-by: Rafael Zago <rafaelvzago@gmail.com> * feat(tests): enhance cleanup script to follow official undeploy process closes istio-ecosystem#1164 Signed-off-by: Rafael Zago <rafaelvzago@gmail.com> * feat(e2e): add OLM uninstallation support to cleanup script Closes istio-ecosystem#1164 Signed-off-by: Rafael Zago <rafaelvzago@gmail.com> --------- Signed-off-by: Rafael Zago <rafaelvzago@gmail.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com>

istio-testing added do-not-merge/work-in-progress size/M labels Sep 5, 2025

istio-testing added the needs-ok-to-test label Sep 5, 2025

rafaelvzago marked this pull request as ready for review September 5, 2025 14:27

rafaelvzago requested a review from a team as a code owner September 5, 2025 14:27

istio-testing removed the do-not-merge/work-in-progress label Sep 5, 2025

cam-garrison removed the needs-ok-to-test label Sep 5, 2025

istio-testing added the ok-to-test label Sep 5, 2025

cam-garrison approved these changes Sep 5, 2025

View reviewed changes

rafaelvzago force-pushed the OSSM-10637 branch from 9c65870 to 2a5804e Compare September 6, 2025 04:20

sridhargaddam reviewed Sep 8, 2025

View reviewed changes

tests/e2e/cleanup-ocp.sh Outdated Show resolved Hide resolved

istio-testing added size/L and removed size/M labels Sep 8, 2025

rafaelvzago requested a review from sridhargaddam September 8, 2025 14:18

rafaelvzago added 2 commits September 8, 2025 11:36

feat(tests): add cleanup target for e2e.ocp test artifacts closes ist…

220dede

…io-ecosystem#1164 Signed-off-by: Rafael Zago <rafaelvzago@gmail.com>

feat(tests): enhance cleanup script to follow official undeploy process

1429ea4

closes istio-ecosystem#1164 Signed-off-by: Rafael Zago <rafaelvzago@gmail.com>

rafaelvzago force-pushed the OSSM-10637 branch from 8880abb to 1429ea4 Compare September 8, 2025 14:36

sridhargaddam reviewed Sep 8, 2025

View reviewed changes

tests/e2e/cleanup-ocp.sh Outdated Show resolved Hide resolved

tests/e2e/cleanup-ocp.sh Outdated Show resolved Hide resolved

tests/e2e/cleanup-ocp.sh Show resolved Hide resolved

tests/e2e/cleanup-ocp.sh Show resolved Hide resolved

feat(tests): enhance cleanup script to follow official undeploy process

008ec82

closes istio-ecosystem#1164 Signed-off-by: Rafael Zago <rafaelvzago@gmail.com>

rafaelvzago force-pushed the OSSM-10637 branch from 711e0c2 to 008ec82 Compare September 8, 2025 20:30

rafaelvzago requested a review from sridhargaddam September 8, 2025 20:31

sridhargaddam reviewed Sep 9, 2025

View reviewed changes

tests/e2e/cleanup-ocp.sh Outdated Show resolved Hide resolved

feat(e2e): add OLM uninstallation support to cleanup script

a15585e

Closes istio-ecosystem#1164 Signed-off-by: Rafael Zago <rafaelvzago@gmail.com>

rafaelvzago requested a review from sridhargaddam September 10, 2025 12:43

sridhargaddam approved these changes Sep 10, 2025

View reviewed changes

istio-testing merged commit a38460c into istio-ecosystem:main Sep 10, 2025
12 checks passed

FilipB added cherrypick/release-1.28 cherrypick/release-1.27 cherrypick/release-1.26 cherrypick/release-1.0 labels Nov 27, 2025

istio-testing mentioned this pull request Nov 27, 2025

[release-1.27] feat(tests): add cleanup target for e2e.ocp test artifacts closes #1164 #1398

Merged

istio-testing mentioned this pull request Nov 27, 2025

[release-1.26] feat(tests): add cleanup target for e2e.ocp test artifacts closes #1164 #1399

Merged

istio-testing mentioned this pull request Nov 27, 2025

[release-1.28] feat(tests): add cleanup target for e2e.ocp test artifacts closes #1164 #1400

Closed

istio-testing mentioned this pull request Nov 27, 2025

[release-1.0] feat(tests): add cleanup target for e2e.ocp test artifacts closes #1164 #1401

Merged

FilipB removed the cherrypick/release-1.28 label Nov 27, 2025

Conversation

rafaelvzago commented Sep 5, 2025

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Additional information:

Uh oh!

linux-foundation-easycla bot commented Sep 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

istio-testing commented Sep 5, 2025

Uh oh!

cam-garrison commented Sep 5, 2025

Uh oh!

Uh oh!

sridhargaddam left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sridhargaddam left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

FilipB commented Nov 27, 2025

Uh oh!

istio-testing commented Nov 27, 2025

Uh oh!

FilipB commented Nov 27, 2025

Uh oh!

istio-testing commented Nov 27, 2025

Uh oh!

FilipB commented Nov 27, 2025

Uh oh!

istio-testing commented Nov 27, 2025

Uh oh!

istio-testing commented Nov 27, 2025

Uh oh!

FilipB commented Nov 27, 2025

Uh oh!

istio-testing commented Nov 27, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

linux-foundation-easycla bot commented Sep 5, 2025 •

edited

Loading