fix(cilium): add CNI override ConfigMap for Cilium

[mgencur]

…o OCP 5.0

Create a cilium-cni-override ConfigMap with cniVersion 0.4.0 to work around the CNI 0.3.1 incompatibility (OCPBUGS-86033). Mount the override into the cilium agent via readCniConf/extraVolumes and drop the now-redundant cni.chainingMode flag.

Also extend the network-policies version gate to include OCP 5.0.

Ref: https://redhat.atlassian.net/browse/OCPBUGS-86033

/hold

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 3168ffde-55f1-484f-be62-8d3c3ad08f18

📥 Commits

Reviewing files that changed from the base of the PR and between 73b60fd and 9de2c93.

📒 Files selected for processing (2)

• ci-operator/step-registry/cucushift/hypershift-extended/cilium/cucushift-hypershift-extended-cilium-commands.sh
• ci-operator/step-registry/cucushift/hypershift-extended/cilium/network-policies/cucushift-hypershift-extended-cilium-network-policies-commands.sh

---

Walkthrough

This PR updates Cilium installation and NetworkPolicy test logic in HyperShift extended test scenarios. The main change adds a ConfigMap-based CNI configuration override that is mounted into Cilium pods, and expands version-conditional workarounds to support both OCP 4.22 and 5.0.

Changes

Hypershift Cilium extended test updates

Layer / File(s)	Summary
Cilium CNI config override via ConfigMap ci-operator/step-registry/cucushift/hypershift-extended/cilium/cucushift-hypershift-extended-cilium-commands.sh	A cilium-cni-override ConfigMap is created with explicit CNI version (0.4.0) and plugin definitions (cilium-cni, portmap), then mounted and referenced in cilium install flags via cni.readCniConf, extraVolumes, and extraVolumeMounts. The cni.chainingMode=portmap flag is removed from the install arguments.
NetworkPolicy workaround version allowlist ci-operator/step-registry/cucushift/hypershift-extended/cilium/network-policies/cucushift-hypershift-extended-cilium-network-policies-commands.sh	Conditional logic for applying Cilium/NetworkPolicy workarounds is updated to skip only when OCP version is neither 4.22 nor 5.0, expanding support from 4.22 alone.

🎯 2 (Simple) | ⏱️ ~10 minutes

🚥 Pre-merge checks | ✅ 12

✅ Passed checks (12 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately captures the main change: adding a CNI override ConfigMap for Cilium. It is specific, concise, and directly related to the primary objective of the changeset.
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	This PR modifies bash shell scripts for Cilium configuration, not Ginkgo test files. The check is not applicable as no Ginkgo test definitions (It(), Describe(), etc.) are modified.
Test Structure And Quality	✅ Passed	PR contains only shell scripts (bash), not Ginkgo test code. Custom check for Ginkgo test structure/quality does not apply.
Microshift Test Compatibility	✅ Passed	PR only modifies bash scripts in openshift/release (CI config), not Go Ginkgo e2e tests. No test code was added, so MicroShift compatibility check is not applicable.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	PR contains no Ginkgo e2e tests; only bash CI scripts for Cilium configuration are modified. SNO compatibility check only applies to new e2e tests (Go code).
Topology-Aware Scheduling Compatibility	✅ Passed	PR modifies CI test scripts that configure Cilium and network policies. No scheduling constraints (affinity, replicas, nodeSelector, tolerations) are introduced.
Ote Binary Stdout Contract	✅ Passed	The PR changes are CI operator shell scripts, not OTE Go test binaries. The stdout contract check only applies to OpenShift Tests Extension binaries communicating via JSON with openshift-tests.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	PR adds no new Ginkgo e2e tests—only shell script changes for Cilium CI/CD configuration. 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

---

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

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mgencur

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• ci-operator/step-registry/cucushift/hypershift-extended/cilium/network-policies/OWNERS [mgencur]

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

[openshift-merge-bot]

[REHEARSALNOTIFIER]
@mgencur: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name	Repo	Type	Reason
periodic-ci-openshift-hypershift-release-4.23-periodics-e2e-aws-conformance-cilium	N/A	periodic	Registry content changed
periodic-ci-openshift-hypershift-release-4.21-periodics-mce-e2e-agent-connected-cilium-ipv4-metal-conformance	N/A	periodic	Registry content changed
periodic-ci-openshift-hypershift-release-4.20-periodics-e2e-aws-conformance-cilium	N/A	periodic	Registry content changed
periodic-ci-openshift-hypershift-release-4.19-periodics-mce-e2e-agent-connected-cilium-ipv4-metal-conformance	N/A	periodic	Registry content changed
periodic-ci-openshift-hypershift-release-4.19-periodics-e2e-aws-conformance-cilium-private	N/A	periodic	Registry content changed
periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-conformance-cilium	N/A	periodic	Registry content changed
periodic-ci-openshift-openshift-tests-private-release-4.15-amd64-nightly-aws-rosa-hcp-cilium-stage-full-f60	N/A	periodic	Registry content changed
periodic-ci-openshift-hypershift-release-4.20-periodics-e2e-aws-conformance-cilium-private	N/A	periodic	Registry content changed
periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-kubevirt-metal-conformance-cilium	N/A	periodic	Registry content changed
periodic-ci-openshift-hypershift-release-4.20-periodics-e2e-kubevirt-metal-conformance-cilium	N/A	periodic	Registry content changed
periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aws-conformance-cilium-private	N/A	periodic	Registry content changed
periodic-ci-openshift-hypershift-release-4.19-periodics-e2e-aws-conformance-cilium	N/A	periodic	Registry content changed
periodic-ci-openshift-openshift-tests-private-release-4.15-amd64-nightly-aws-rosa-hcp-capi-private-stage-f60	N/A	periodic	Registry content changed
periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aws-conformance-cilium	N/A	periodic	Registry content changed
periodic-ci-openshift-hypershift-release-4.22-periodics-mce-e2e-agent-connected-cilium-ipv4-metal-conformance	N/A	periodic	Registry content changed
periodic-ci-openshift-hypershift-release-4.19-periodics-e2e-kubevirt-metal-conformance-cilium	N/A	periodic	Registry content changed
periodic-ci-openshift-hypershift-release-4.20-periodics-mce-e2e-agent-connected-cilium-ipv4-metal-conformance	N/A	periodic	Registry content changed
periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-aws-conformance-cilium	N/A	periodic	Registry content changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

[mgencur]

/pj-rehearse periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-conformance-cilium

[openshift-merge-bot]

@mgencur: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

[openshift-ci]

@mgencur: The following test 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/rehearse/periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-conformance-cilium	9de2c93	link	unknown	/pj-rehearse periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-conformance-cilium

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.