fix(cilium): add CNI override ConfigMap for Cilium#79593
Conversation
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (2)
💤 Files with no reviewable changes (2)
WalkthroughThis 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. ChangesHypershift Cilium extended test updates
🎯 2 (Simple) | ⏱️ ~10 minutes Suggested labels: Suggested reviewers:
🚥 Pre-merge checks | ✅ 12✅ Passed checks (12 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
/pj-rehearse periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-conformance-cilium |
|
@mgencur: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
…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 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The excluded tests are already in the workflow itself, no need to exclude them again.
9de2c93 to
9555c30
Compare
|
/pj-rehearse periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-conformance-cilium |
|
@mgencur: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: mgencur The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
[REHEARSALNOTIFIER]
Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
@mgencur: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
…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
Summary by CodeRabbit
This PR updates the OpenShift HyperShift CI infrastructure to work around a Cilium CNI compatibility issue (OCPBUGS-86033) by introducing a CNI configuration override mechanism for test environments.
Main Changes:
Cilium Installation Step (
cucushift-hypershift-extended-cilium-commands.sh):cilium-cni-overrideConfigMap that explicitly setscniVersionto0.4.0, working around an incompatibility with CNI version 0.3.1cni.readCniConfparametercni.chainingMode=portmapflag from the installation arguments, as it's now handled by the override ConfigMapNetwork Policy Workarounds (
network-policies-commands.sh):4.22and5.0(previously only4.22)CI Configuration Updates (
openshift-hypershift-release-{4.23,5.0}__periodics.yaml):TEST_SKIPSconfiguration from thee2e-aws-conformance-ciliumperiodic test jobs for both 4.23 and 5.0 release branchesPractical Impact: These changes enable the HyperShift CI/CD pipeline to properly test Cilium networking in OpenShift environments by ensuring correct CNI version compatibility, while also preparing the infrastructure for OCP 5.0 support.