SDN-3733: [DownstreamMerge] 6-18-2023 by trozet · Pull Request #1714 · openshift/ovn-kubernetes

trozet · 2023-06-18T18:19:47Z

Final large merge to bring us up to date with upstream.

@tssurya @pliurh @kyrtapz @maiqueb @dcbw @pperiyasamy @jordigilh FYI

only 1 trivial conflict in github actions test.yaml which has no effect on downstream

This commit passes the egressip_enabled_flag to cluster manager pod on control plane so that we can configure the feature from CM for IC Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>

This commit does three things: 1) It adds eipFactory to CMWatchFactory which is required for EIP 2) It adds EIPClient and CloudNetworkClient to CMClientset CM = cluster manager This plubming is the foundation to be able to move egressIP bits into CM. Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>

This commit adds DeleteLogicalRouterStaticRoutesWithPredicateOps to libovsdbops package. Note that we already had DeleteLogicalRouterStaticRoutesWithPredicate and now we want to just have a util that returns the ops so that we can batch this when doing a deletion for EIP. NOTE: This commit only introduces the utility, its use comes down in future commit. Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>

This commit does the following: Cluster Manager side: 1) We create a new egressIPController and call that from CM if the feature is enabled 2) We do only WatchEgressNodes, WatchEgressIP and WatchCloudPrivateIPConfig from CM (namespaces, pods will be taken care of by master) 3) We move all the eip healthcheck bits and node allocator bits to CM 4) Any updates to EIP CRD will always be done by CM; master side will only read the CRD 5) All bits for cloud private IP config was moved to CM from master. Master side: 1) We rename egressIPController to egressIPZoneController - this is responsible for doing NBDB configurations for everything happening in its zone and sometimes for pods in remote zones when necessary 2) We add a localZoneNodes similar to what we have in base which holds the list of local zone nodes 3) master will be responsible for adding snats, reroute policies and static routes for eip pods High level logic: - Do SNATs towards egressIP only if egressNode is local to the zone irrespective of whether the pod is local or remote - Do reroute policies towards transit switch only if pod is local to the zone. NOTE: In IC, nexthop is transit switchIP NOT joinIP - Do static routes towards joinIP only if pod is non-local to the zone but egressnode is local to the zone. NOTE: This is NEW, we never used static routes for EIP before. It is an IC only thing. - Do SNATs towards nodeIP only if pod is local to the zone - Duplicate the code for `IsReachableLegacy` and `IsReachableViaGRPC` functions which will now be in both CM and master - but this is temporary to ensure ESVC works in non-IC setup and until we do ESVC refactor for IC. Tests: The commit also fixes unit tests to run in non-ic and ic modes and splits the tests for global controller logic into cluster-manager while keeping the tests to check libovsdb objects in master itself. Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>

Support Egress IP on OVN-IC

This is the metrics refactor for interconnect following the work done in ovn-kubernetes/ovn-kubernetes#3386. Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>

Ensuring the work done here: martinkennelly/ovn-kubernetes-1@c47ed89 sees light. Co-Authored-by: Martin Kennelly <mkennell@redhat.com> Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>

…(informer,lister,api) Signed-off-by: jordigilh <jgil@redhat.com>

* Implements controllers for Admin Policy Based External Route to handle changes to namespaces, pods and admin policy based external route CRs. * Initialize in master node to handle interactions with the north bound DB. Initialize in worker nodes to handle changes to the conntrack (delete ECMP entries when a gateway IP is no longer a valid external gateway IP) * Implements repair() function for the master node. * Integrates with the annotation logic to avoid duplications in cache by sharing the externalGWCache and EXGWCacheMutex objects between the annotation and controller logic. * Updates the annotation logic to ensure the namespace anontation k8s.ovn.org/external-gw-pod-ips is updated when changes occur in a CR instance that coexists in the same namespace and that can impact the list of dynamic gateway IPs. * The implementation no longer relies on namespace annotations, including "k8s.ovn.org/external-gw-pod-ips", instead it uses its own cache structure to identify the valid pod IPs for a given namespace. * Implement E2E tests for admin policy based external route. The tests are a duplication of the existing annotated based logic for external gateways using the CR instead. Signed-off-by: jordigilh <jgil@redhat.com>

…rnal_gateway [SDN-2482] API enhancement to add support for Admin Policy Based External Route CRs

Without it Stop() will always fail with `close of nil channel`. Additionally removed unused fields from FakeClusterManager. Signed-off-by: Patryk Diak <pdiak@redhat.com>

- go 19 in go.mod - use go v1.19.6 in Makefile for building - upgrade golangci linter to latest version - one whitespace error fixed as part of the lint upgrade Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>

Users can create the external gateway bridge without attaching a host physical interface as the uplink port in local gateway mode. The gateway router will use 169.254.169.4 as the default gateway. Add a new gateway config flag 'allow-no-uplink' to controll if this setup is allowed or not. It's disabled by default. With this setup, egressIP and egressGW can not work. Signed-off-by: Peng Liu <pliu@redhat.com>

Signed-off-by: Peng Liu <pliu@redhat.com>

Initialize EgressIP stopChan in cluster-manager