kubeovn / kube-ovn / 21327189803

23%

push

github

fix(vpc-nat-gw): use consistent provider for all pod annotations (#6204)

* fix(vpc-nat-gw): use consistent provider for all pod annotations

The VPC NAT gateway custom routes were not being applied because of
inconsistent annotation key prefixes. The `GenNatGwPodAnnotations`
function was hardcoding the "ovn" prefix for annotations like
`ovn.kubernetes.io/logical_switch`, while `setPodRoutesAnnotation`
was using the actual subnet provider (e.g., "subnet.namespace.ovn").

This caused the CNI daemon to look for routes annotation with a
different key than what was set by the controller, resulting in
routes being ignored.

Changes:
- Add `provider` parameter to `GenNatGwPodAnnotations` function
- Use annotation templates instead of hardcoded constants to generate
  annotation keys dynamically based on the provider
- Remove redundant annotation settings in `EnableNonPrimaryCNI` branch
  since `GenNatGwPodAnnotations` now handles all cases uniformly
- Update unit tests to cover both "ovn" and NAD provider scenarios

Fixes #6202

Signed-off-by: zbb88888 <jmdxjsjgcxy@gmail.com>

* simple

Signed-off-by: zbb88888 <jmdxjsjgcxy@gmail.com>

* fix ut

Signed-off-by: zbb88888 <jmdxjsjgcxy@gmail.com>

* fix empty provider

Signed-off-by: zbb88888 <jmdxjsjgcxy@gmail.com>

---------

Signed-off-by: zbb88888 <jmdxjsjgcxy@gmail.com>

13 of 24 new or added lines in 2 files covered. (54.17%)

12312 of 53775 relevant lines covered (22.9%)

0.27 hits per line