kubeovn / kube-ovn / 24824233761

25%

master: 25%

push

github

fix(vpcnatgw): keep eth0 on primary CNI in non-primary CNI mode (#6675)

* fix(vpcnatgw): keep eth0 on primary CNI in non-primary CNI mode

PR #6212 forced v1.multus-cni.io/default-network onto the NAT gateway pod
whenever gw.Spec.Subnet used a custom provider. That is correct when
Kube-OVN is the primary CNI, but when --non-primary-cni-mode is enabled
(e.g. Harvester attaching a tenant OVN overlay), eth0 is supposed to sit
on the cluster's primary CNI (Calico) so the pod can reach the control
plane and keep a working default route. Overriding default-network with
the tenant NAD caused eth0 to attach to the tenant subnet, breaking VM
external connectivity through the NAT gateway.

Skip the default-network override when the controller runs as a
non-primary CNI. Primary CNI behaviour, including the fix from #6212, is
unchanged.

Fixes #6632

Co-authored-by: SKALA NETWORKS <127797154+SkalaNetworks@users.noreply.github.com>
Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>

* fix(vpcnatgw): validate custom provider regardless of CNI mode

Address Copilot reviewer feedback on PR #6675: the previous combined
condition `p != OvnProvider && !enableNonPrimaryCNI` bypassed the
`name.namespace.ovn` format check in non-primary CNI mode, which would
silently produce malformed LogicalSwitch/IPAddress annotation keys if a
subnet somehow carried a bad provider string.

Split the branch so that custom providers are always validated, but the
`v1.multus-cni.io/default-network` override is still only applied under
primary CNI mode. Add a unit test case covering invalid provider syntax
under non-primary CNI.

Co-authored-by: SKALA NETWORKS <127797154+SkalaNetworks@users.noreply.github.com>
Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>

---------

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
Co-authored-by: SKALA NETWORKS <127797154+SkalaNetworks@users.noreply.github.com>

8 of 9 new or added lines in 2 files covered. (88.89%)

13813 of 56254 relevant lines covered (24.55%)

0.29 hits per line