kubeovn / kube-ovn / 30184375418

28%

master: 28%

Build Type

Pull #7078

github

Committed by pujitha24

Commit Message

fix(vpcnatgw): attach subnet NAD in non-primary CNI mode so LanIP is injected

## What type of this PR

- Bug fixes

## Which issue(s) this PR fixes

Fixes #6744

## Motivation

When Kube-OVN runs as a non-primary CNI (`--enable-non-primary-cni-mode`),
a VpcNatGateway's `lanIp` is never injected into the gateway pod: the pod
only ends up with the primary CNI's eth0 and the external-network
interface, never an interface for the internal OVN subnet, so the VPC
cannot reach the external network through the gateway.

PR #6675 (fixing #6632) made `GenNatGwPodAnnotations` skip setting
`v1.multus-cni.io/default-network` to the subnet's NetworkAttachmentDefinition
(NAD) in non-primary CNI mode, so eth0 correctly stays on the cluster's
primary CNI. However it never attached that NAD anywhere else. The
`ovn.kubernetes.io/logical_switch_provider.<p>` /
`ovn.kubernetes.io/ip_address_provider.<p>` pod annotations that carry the
LanIP were still being set, but with the NAD never listed in
`k8s.v1.cni.cncf.io/networks`, multus never invokes the kube-ovn CNI plugin
for it, so those annotations are never consumed and no interface is ever
created. Before this fix, the only way to get LanIP injected was the manual
workaround of adding the NAD to the VpcNatGateway's
`k8s.v1.cni.cncf.io/networks` annotation by hand.

## Approach

In `GenNatGwPodAnnotations` (pkg/util/vpc_nat_gateway.go), when running in
non-primary CNI mode with a custom NAD-backed provider, attach the
subnet's own NAD to `k8s.v1.cni.cncf.io/networks` as an additional
(non-default) network instead of just skipping it. It is appended after
the external NAD and any user-supplied additional networks, rather than
prepended, so the external NAD keeps the same position it already had
(some code, e.g. the default egress QoS interface in
`execNatGwQoSInPod`, assumes the external NAD is `net1` when no extra
networks are configured).

The `v1.multus-cni.io/default-network` override remains skipped in
non-primary CN... (continued)

Pull Request Pull Request #7078: fix(vpcnatgw): attach subnet NAD in non-primary CNI mode so LanIP is injected

Coverage Stats

21 of 21 new or added lines in 1 file covered. (100.0%)

2 existing lines in 1 file now uncovered.

17089 of 60955 relevant lines covered (28.04%)

0.33 hits per line