Skip to content

DO NOT MERGE: Tests#3010

Closed
machine424 wants to merge 2 commits into
openshift:masterfrom
machine424:tests
Closed

DO NOT MERGE: Tests#3010
machine424 wants to merge 2 commits into
openshift:masterfrom
machine424:tests

Conversation

@machine424
Copy link
Copy Markdown

@machine424 machine424 commented May 18, 2026

Summary by CodeRabbit

  • New Features

    • Added proxy environment variable support (HTTP_PROXY, HTTPS_PROXY, NO_PROXY) to OVN Kubernetes configuration.
  • Bug Fixes

    • Removed DPU node lease timing configuration to fix lease management behavior.
  • Chores

    • Updated Multus CNI version to 0.3.1 for improved compatibility.

@machine424 machine424 changed the title DO NOT MARGE: Tests DO NOT MERGE: Tests May 18, 2026
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 18, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 9dc500dd-a5a6-41c4-aa3c-ec21e2172379

📥 Commits

Reviewing files that changed from the base of the PR and between 6f47993 and 15b1585.

📒 Files selected for processing (10)
  • bindata/network/multus/multus.yaml
  • bindata/network/ovn-kubernetes/common/008-script-lib.yaml
  • bindata/network/ovn-kubernetes/managed/ovnkube-node.yaml
  • bindata/network/ovn-kubernetes/self-hosted/ovnkube-node.yaml
  • hack/hardware-offload-config.yaml
  • pkg/bootstrap/types.go
  • pkg/network/kube_proxy_test.go
  • pkg/network/ovn_kubernetes.go
  • pkg/network/ovn_kubernetes_dpu_host_test.go
  • pkg/network/ovn_kubernetes_test.go
💤 Files with no reviewable changes (4)
  • hack/hardware-offload-config.yaml
  • bindata/network/ovn-kubernetes/managed/ovnkube-node.yaml
  • pkg/network/ovn_kubernetes_dpu_host_test.go
  • bindata/network/ovn-kubernetes/self-hosted/ovnkube-node.yaml

Walkthrough

This PR removes DPU node health-check lease configuration infrastructure from cluster-network-operator, including constants, ConfigMap entries, pod template environment variables, and shell script logic. It also updates Multus to use CNI version 0.3.1 and adds HTTP proxy environment variables to pod templates.

Changes

DPU Node Lease Configuration Removal

Layer / File(s) Summary
Bootstrap type contract cleanup
pkg/bootstrap/types.go
Remove DpuNodeLeaseRenewInterval and DpuNodeLeaseDuration int fields from OVNConfigBoostrapResult struct.
Configuration and ConfigMap cleanup
hack/hardware-offload-config.yaml, pkg/network/kube_proxy_test.go
Remove DPU lease interval/duration keys from the hardware-offload-config ConfigMap and update the test fixture to omit these fields from OVNConfigBoostrapResult.
Pod template environment variable updates
bindata/network/ovn-kubernetes/managed/ovnkube-node.yaml, bindata/network/ovn-kubernetes/self-hosted/ovnkube-node.yaml
Remove OVNKUBE_NODE_LEASE_RENEW_INTERVAL and OVNKUBE_NODE_LEASE_DURATION environment variables from DaemonSet templates; add conditional HTTP_PROXY, HTTPS_PROXY, NO_PROXY, and OVNKUBE_NODE_MGMT_PORT_DP_RESOURCE_NAME environment variables.
Shell script DPU lease flag removal
bindata/network/ovn-kubernetes/common/008-script-lib.yaml
Remove dpu_lease_flags variable construction and initialization from ovnkube-lib.sh; eliminate ${dpu_lease_flags} from the ovnkube command-line arguments.
Core orchestration logic cleanup
pkg/network/ovn_kubernetes.go
Remove DPU_NODE_LEASE_RENEW_INTERVAL_DEFAULT and DPU_NODE_LEASE_DURATION_DEFAULT constants; remove lease field assignments from renderOVNKubernetes; remove lease default initialization and ConfigMap-based parsing/validation logic from bootstrapOVNConfig.
Test suite updates
pkg/network/ovn_kubernetes_dpu_host_test.go, pkg/network/ovn_kubernetes_test.go
Remove TestOVNKubernetesLeaseEnvVars and TestDpuLeaseConfig test functions; remove extractDaemonSetEnvVars helper function; update all test bootstrap fixtures across 19 test functions to omit lease fields.

Multus CNI Version Update

Layer / File(s) Summary
Multus CNI version update
bindata/network/multus/multus.yaml
Change cniVersion in the Multus daemon-config ConfigMap from 1.1.0 to 0.3.1.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

Possibly related PRs

  • openshift/cluster-network-operator#2941: Both PRs touch the same DPU healthcheck lease wiring (e.g., DpuNodeLease* fields, hardware-offload-config keys, ovnkube-node env vars, and ovnkube-lib.sh CLI flags), with this PR removing/stripping the lease functionality added by #2941.

Suggested reviewers

  • jcaamano
  • pperiyasamy
🚥 Pre-merge checks | ✅ 9 | ❌ 3

❌ Failed checks (1 warning, 2 inconclusive)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 36.36% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
Title check ❓ Inconclusive The title 'DO NOT MERGE: Tests' is vague and does not meaningfully describe the actual changes in the pull request. Replace with a descriptive title that summarizes the main change, such as 'Remove DPU node lease configuration' or 'Clean up DPU lease-related code and tests'.
Test Structure And Quality ❓ Inconclusive Custom check requires Ginkgo test code review (Describe, It, BeforeEach), but this repo uses standard Go testing with Gomega assertions, not Ginkgo. Check is inapplicable. Repository uses standard Go testing, not Ginkgo BDD-style tests. The check instructions are written for Ginkgo tests which don't exist in this codebase. Check cannot be assessed.
✅ Passed checks (9 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
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 The check requires stable Ginkgo test names (It(), Describe(), etc.). This codebase uses Go's standard testing framework with t.Run(), not Ginkgo. The check is not applicable to this PR.
Microshift Test Compatibility ✅ Passed No Ginkgo e2e tests added. The check targets Ginkgo tests (It(), Describe(), etc.). Two unit tests were added but use standard Go testing framework, not Ginkgo, making this check not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR does not add any new Ginkgo e2e tests. It reverts the NVIDIA-596 DPU healthcheck feature, removing configuration code, manifest changes, and unit tests. The custom check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR removes DPU lease config without adding new scheduling constraints. No pod affinity, topology spread, or nodeSelector changes that break SNO, Two-Node, or HyperShift topologies.
Ote Binary Stdout Contract ✅ Passed PR reverts DPU healthcheck code without introducing stdout writes in process-level code. logs.InitLogs() properly configures klog to stderr. No fmt.Print/os.Stdout writes found.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR is a revert of DPU healthcheck feature with no new Ginkgo e2e tests. Changes are only to unit tests using Go's testing.T framework, not Ginkgo-style tests. Check is not applicable.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 golangci-lint (2.12.2)

level=error msg="Running error: context loading failed: failed to load packages: failed to load packages: failed to load with go/packages: err: exit status 1: stderr: go: inconsistent vendoring in :\n\tgithub.com/Masterminds/semver@v1.5.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt\n\tgithub.com/Masterminds/sprig/v3@v3.2.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt\n\tgithub.com/containernetworking/cni@v0.8.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt\n\tgithub.com/ghodss/yaml@v1.0.1-0.20190212211648-25d852aebe32: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt\n\tgithub.com/go-bindata/go-bindata@v3.1.2+incompatible: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt\n\tgithub.com/onsi/gomega@v1.39.1: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt\n\tgithub.com/ope

... [truncated 17357 characters] ...

red in go.mod, but not marked as explicit in vendor/modules.txt\n\tk8s.io/gengo/v2@v2.0.0-20251215205346-5ee0d033ba5b: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt\n\tk8s.io/kms@v0.35.2: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt\n\tk8s.io/kube-aggregator@v0.35.1: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt\n\tsigs.k8s.io/randfill@v1.0.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt\n\tsigs.k8s.io/structured-merge-diff/v6@v6.3.2: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt\n\n\tTo ignore the vendor directory, use -mod=readonly or -mod=mod.\n\tTo sync the vendor directory, run:\n\t\tgo mod vendor\n"


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

@openshift-ci openshift-ci Bot requested review from bpickard22 and marty-power May 18, 2026 10:04
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 18, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: machine424
Once this PR has been reviewed and has the lgtm label, please assign kyrtapz 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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 18, 2026

@machine424: This PR was included in a payload test run from openshift/cluster-monitoring-operator#2925
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-conformance-cilium

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/330f9eb0-52a1-11f1-9acd-d022f189e2df-0

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 18, 2026

@machine424: 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-gcp-ovn 15b1585 link true /test e2e-gcp-ovn
ci/prow/e2e-ovn-ipsec-step-registry 15b1585 link true /test e2e-ovn-ipsec-step-registry
ci/prow/e2e-azure-ovn-upgrade 15b1585 link true /test e2e-azure-ovn-upgrade
ci/prow/e2e-aws-ovn-upgrade 15b1585 link true /test e2e-aws-ovn-upgrade
ci/prow/security 15b1585 link false /test security
ci/prow/e2e-metal-ipi-ovn-ipv6-ipsec 15b1585 link true /test e2e-metal-ipi-ovn-ipv6-ipsec

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.

@machine424 machine424 closed this May 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant