fixup! fixup! fixup! fixup! Network: gateway routes

Author: cheina97

cmd/gateway/main.go

@@ -27,7 +27,6 @@ import (
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	"k8s.io/klog/v2"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
@@ -110,11 +109,6 @@ func run(cmd *cobra.Command, _ []string) error {
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
 		MapperProvider: mapper.LiqoMapperProvider(scheme),
 		Scheme:         scheme,
-		Cache: cache.Options{
-			DefaultNamespaces: map[string]cache.Config{
-				connoptions.GwOptions.Namespace: {},
-			},
-		},
 		Metrics: server.Options{
 			BindAddress: "0", // Metrics are exposed by "connection" container.
 		},

cmd/liqo-controller-manager/main.go

@@ -678,16 +678,16 @@ func main() {
 			os.Exit(1)
 		}
 
-		intcfgr := configurationcontroller.NewConfigurationReconciler(mgr.GetClient(), mgr.GetScheme(),
+		intCfg := configurationcontroller.NewConfigurationReconciler(mgr.GetClient(), mgr.GetScheme(),
 			mgr.GetEventRecorderFor("internal.-configuration-controller"))
-		if err = intcfgr.SetupWithManager(mgr); err != nil {
+		if err = intCfg.SetupWithManager(mgr); err != nil {
 			klog.Errorf("unable to create controller ConfigurationReconciler: %s", err)
 			os.Exit(1)
 		}
 
-		extcfg := externalnetworkroute.NewConfigurationReconciler(mgr.GetClient(), mgr.GetScheme(),
+		extCfg := externalnetworkroute.NewConfigurationReconciler(mgr.GetClient(), mgr.GetScheme(),
 			mgr.GetEventRecorderFor("external-configuration-controller"))
-		if err = extcfg.SetupWithManager(mgr); err != nil {
+		if err = extCfg.SetupWithManager(mgr); err != nil {
 			klog.Errorf("unable to create controller ExternalConfigurationReconciler: %s", err)
 			os.Exit(1)
 		}
@@ -708,9 +708,9 @@ func main() {
 			os.Exit(1)
 		}
 
-		intpod := internalnetworkroute.NewPodReconciler(allPodsManager.GetClient(), allPodsManager.GetScheme(),
+		intPod := internalnetworkroute.NewPodReconciler(allPodsManager.GetClient(), allPodsManager.GetScheme(),
 			allPodsManager.GetEventRecorderFor("internal-pod-controller"), &internalnetworkroute.Options{Namespace: *liqoNamespace})
-		if err = intpod.SetupWithManager(allPodsManager); err != nil {
+		if err = intPod.SetupWithManager(allPodsManager); err != nil {
 			klog.Errorf("unable to create controller InternalPodReconciler: %s", err)
 			os.Exit(1)
 		}

pkg/liqo-controller-manager/internal-network/route/k8s.go

@@ -48,44 +48,57 @@ func enforeRoutePodPresence(ctx context.Context, cl client.Client, scheme *runti
 		ObjectMeta: metav1.ObjectMeta{Name: fmt.Sprintf("%s-gw-node", pod.Spec.NodeName), Namespace: opts.Namespace},
 	}
 
-	_, err := controllerutil.CreateOrUpdate(ctx, cl, routecfg, func() error {
+	_, err := controllerutil.CreateOrUpdate(ctx, cl, routecfg, forgeRoutePodMutateFunction(internalnode, routecfg, pod, scheme))
+	return err
+}
+
+func forgeRoutePodMutateFunction(internalnode *networkingv1alpha1.InternalNode, routecfg *networkingv1alpha1.RouteConfiguration,
+	pod *corev1.Pod, scheme *runtime.Scheme) controllerutil.MutateFn {
+	return func() error {
 		if err := controllerutil.SetOwnerReference(internalnode, routecfg, scheme); err != nil {
 			return err
 		}
 
 		routecfg.SetLabels(geneve.ForgeRouteInternalTargetLabels())
 
-		routecfg.Spec.Table.Name = fmt.Sprintf("%s-gw-node", pod.Spec.NodeName)
+		routecfg.Spec.Table.Name = pod.Spec.NodeName
 
 		if routecfg.Spec.Table.Rules == nil || len(routecfg.Spec.Table.Rules) == 0 {
 			routecfg.Spec.Table.Rules = make([]networkingv1alpha1.Rule, 1)
 		}
 
-		if routeContainsPod(pod, &routecfg.Spec.Table.Rules[0]) {
-			return nil
+		if existingroute, exists := routeContainsPod(pod, &routecfg.Spec.Table.Rules[0]); exists {
+			updatePodToRoute(pod, internalnode, existingroute)
+		} else {
+			addPodToRoute(pod, internalnode, &routecfg.Spec.Table.Rules[0])
 		}
 
-		addPodToRoute(pod, internalnode, &routecfg.Spec.Table.Rules[0])
 		return nil
-	})
-	return err
+	}
 }
 
-func routeContainsPod(pod *corev1.Pod, rule *networkingv1alpha1.Rule) bool {
+func routeContainsPod(pod *corev1.Pod, rule *networkingv1alpha1.Rule) (*networkingv1alpha1.Route, bool) {
 	for i := range rule.Routes {
-		route := rule.Routes[i]
-		if string(*route.Dst) == fmt.Sprintf("%s/32", pod.Status.PodIP) {
-			return true
+		if string(*rule.Routes[i].Dst) == fmt.Sprintf("%s/32", pod.Status.PodIP) {
+			return &rule.Routes[i], true
 		}
 	}
-	return false
+	return nil, false
 }
 
 func addPodToRoute(pod *corev1.Pod, internalnode *networkingv1alpha1.InternalNode, rule *networkingv1alpha1.Rule) {
 	route := networkingv1alpha1.Route{
-		Dst: ptr.To(networkingv1alpha1.CIDR(fmt.Sprintf("%s/32", pod.Status.PodIP))),
-		Dev: &internalnode.Spec.Interface.Gateway.Name,
-		Gw:  ptr.To(networkingv1alpha1.IP(fabric.GeneveNodeInterfaceIP)),
+		Dst:    ptr.To(networkingv1alpha1.CIDR(fmt.Sprintf("%s/32", pod.Status.PodIP))),
+		Dev:    &internalnode.Spec.Interface.Gateway.Name,
+		Gw:     ptr.To(networkingv1alpha1.IP(fabric.GeneveNodeInterfaceIP)),
+		Onlink: ptr.To(true),
 	}
 	rule.Routes = append(rule.Routes, route)
 }
+
+func updatePodToRoute(pod *corev1.Pod, internalnode *networkingv1alpha1.InternalNode, route *networkingv1alpha1.Route) {
+	route.Dst = ptr.To(networkingv1alpha1.CIDR(fmt.Sprintf("%s/32", pod.Status.PodIP)))
+	route.Dev = &internalnode.Spec.Interface.Gateway.Name
+	route.Gw = ptr.To(networkingv1alpha1.IP(fabric.GeneveNodeInterfaceIP))
+	route.Onlink = ptr.To(true)
+}