Skip to content

OCPBUGS-98586: Don't wait on oc delete in konnectivity_cleanup#10682

Open
bfournie wants to merge 1 commit into
openshift:mainfrom
bfournie:konnectivity-delete
Open

OCPBUGS-98586: Don't wait on oc delete in konnectivity_cleanup#10682
bfournie wants to merge 1 commit into
openshift:mainfrom
bfournie:konnectivity-delete

Conversation

@bfournie

@bfournie bfournie commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

Remove the wait on the oc delete namespace command in konnectivity_cleanup. The namespace deletion request will be submitted but oc delete won't block waiting for finalization to complete. bootkube.sh proceeds immediately to touch /opt/openshift/.bootkube.done, unblocking report-progress.sh and the rest of the bootstrap chain.

The namespace will eventually be cleaned up by the namespace controller once the conversion webhook becomes available (or the CRDs are removed). There's no functional reason to wait for it synchronously — the bootstrap konnectivity resources just need to be requested for deletion, not fully finalized, before bootkube can move on.

Summary by CodeRabbit

  • Bug Fixes
    • Improved bootstrap cleanup reliability by allowing namespace deletion to proceed without blocking.
    • Preserved safe handling when the namespace is already absent.

Remove the wait on the 'oc delete namespace' command in konnectivity_cleanup.
The namespace deletion request will be submitted but oc delete won't
block waiting for finalization to complete. bootkube.sh proceeds
immediately to touch /opt/openshift/.bootkube.done,
unblocking report-progress.sh and the rest of the bootstrap chain.

The namespace will eventually be cleaned up by the namespace
controller once the conversion webhook becomes available (or
the CRDs are removed). There's no functional reason to wait for
it synchronously — the bootstrap konnectivity resources just
need to be requested for deletion, not fully finalized, before
bootkube can move on.
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jul 13, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@bfournie: This pull request references Jira Issue OCPBUGS-98586, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Remove the wait on the 'oc delete namespace' command in konnectivity_cleanup. The namespace deletion request will be submitted but oc delete won't block waiting for finalization to complete. bootkube.sh proceeds immediately to touch /opt/openshift/.bootkube.done, unblocking report-progress.sh and the rest of the bootstrap chain.

The namespace will eventually be cleaned up by the namespace controller once the conversion webhook becomes available (or the CRDs are removed). There's no functional reason to wait for it synchronously — the bootstrap konnectivity resources just need to be requested for deletion, not fully finalized, before bootkube can move on.

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 openshift-eng/jira-lifecycle-plugin repository.

@bfournie

Copy link
Copy Markdown
Contributor Author

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 13, 2026
@coderabbitai

coderabbitai Bot commented Jul 13, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

The Konnectivity cleanup script now deletes the bootstrap namespace without waiting for completion, while retaining --ignore-not-found=true. Other cleanup steps are unchanged.

Changes

Konnectivity cleanup

Layer / File(s) Summary
Non-blocking namespace deletion
data/data/bootstrap/files/usr/local/bin/konnectivity.sh.template
The namespace deletion command adds --wait=false and retains --ignore-not-found=true.

Estimated code review effort: 1 (Trivial) | ~2 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed Only a bootstrap shell template changed; no Ginkgo tests or titles were added or modified, so there are no unstable test names to flag.
Test Structure And Quality ✅ Passed PR only changes konnectivity.sh.template; no Ginkgo test code was added or modified, so the test-structure checklist is not applicable.
Microshift Test Compatibility ✅ Passed Only konnectivity.sh.template changed; no new Ginkgo e2e tests or MicroShift-relevant APIs/features were added.
Single Node Openshift (Sno) Test Compatibility ✅ Passed Only konnectivity.sh.template changed; no new Ginkgo e2e tests or SNO-sensitive test logic were added.
Topology-Aware Scheduling Compatibility ✅ Passed Only change is adding --wait=false to an oc delete in bootstrap cleanup; no manifests, controllers, or scheduling constraints were added.
Ote Binary Stdout Contract ✅ Passed PR only changes an oc delete flag in a sourced shell template; it adds no process-level binary stdout writes.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Only a bootstrap shell template changed; no Ginkgo/e2e tests were added, so IPv4/external-connectivity test compatibility is not implicated.
No-Weak-Crypto ✅ Passed Only change is oc delete --wait=false in konnectivity_cleanup; no crypto algorithms, secret comparisons, or custom crypto code were added.
Container-Privileges ✅ Passed Only a shell-template line changed; no privileged/root/network flags appear, and the new flag is just oc --wait=false.
No-Sensitive-Data-In-Logs ✅ Passed The only change is adding --wait=false to oc delete; no new logging or sensitive values were introduced.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely describes the main change: making oc delete non-blocking in konnectivity_cleanup.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@bfournie

Copy link
Copy Markdown
Contributor Author

/test ?

@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@bfournie: This pull request references Jira Issue OCPBUGS-98586, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
Details

In response to this:

Remove the wait on the 'oc delete namespace' command in konnectivity_cleanup. The namespace deletion request will be submitted but oc delete won't block waiting for finalization to complete. bootkube.sh proceeds immediately to touch /opt/openshift/.bootkube.done, unblocking report-progress.sh and the rest of the bootstrap chain.

The namespace will eventually be cleaned up by the namespace controller once the conversion webhook becomes available (or the CRDs are removed). There's no functional reason to wait for it synchronously — the bootstrap konnectivity resources just need to be requested for deletion, not fully finalized, before bootkube can move on.

Summary by CodeRabbit

  • Bug Fixes
  • Improved bootstrap cleanup reliability by allowing namespace deletion to proceed without blocking.
  • Preserved safe handling when the namespace is already absent.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci

openshift-ci Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

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

Details Needs approval from an approver in each of these files:

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

@bfournie

Copy link
Copy Markdown
Contributor Author

/test e2e-agent-compact-ipv4-iso-no-registry

@tthvo

tthvo commented Jul 13, 2026

Copy link
Copy Markdown
Member

/test e2e-aws-ovn-techpreview

@openshift-ci

openshift-ci Bot commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

@bfournie: 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
ci/prow/e2e-agent-compact-ipv4-iso-no-registry fdba1ad link false /test e2e-agent-compact-ipv4-iso-no-registry
ci/prow/images fdba1ad link true /test images
ci/prow/e2e-aws-ovn-techpreview fdba1ad link false /test e2e-aws-ovn-techpreview

Full PR test history. Your PR dashboard.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants