From 91082fa588b428c2979dac019d9f3b6cf77fcaf1 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Sat, 1 Feb 2025 15:52:57 +0900 Subject: [PATCH] gh-950 podIPs to used as valid endpoint addresses in incluster mode with blacklist --- api/k8s/k8s.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/k8s/k8s.go b/api/k8s/k8s.go index 5f1c1c821..f2f7e4fdc 100644 --- a/api/k8s/k8s.go +++ b/api/k8s/k8s.go @@ -82,7 +82,7 @@ func K8sApiInit(k8sConfigFile string, hooks cmn.NetHookInterface) error { case *v1.Pod: tk.LogIt(tk.LogInfo, "Pod(%s) add: %s - %s:\n", pod.Name, pod.Status.PodIP, pod.Status.HostIP) if pod.Status.HostIP == nodeIP && pod.Status.PodIP != nodeIP && pod.Status.PodIP != "" { - _, err := ApiHooks.NetAddrAdd(&cmn.IPAddrMod{Dev: pod.Name, IP: pod.Status.PodIP + "/32"}) + _, err := ApiHooks.NetAddrAdd(&cmn.IPAddrMod{Dev: "llb-rule-" + pod.Name, IP: pod.Status.PodIP + "/32"}) if err != nil { tk.LogIt(tk.LogDebug, "Pod(%s) add: %s - %s: failed - %s\n", pod.Name, pod.Status.PodIP, pod.Status.HostIP, err) } else { @@ -96,7 +96,7 @@ func K8sApiInit(k8sConfigFile string, hooks cmn.NetHookInterface) error { case *v1.Pod: tk.LogIt(tk.LogInfo, "Pod(%s) delete: %s - %s: \n", pod.Name, pod.Status.PodIP, pod.Status.HostIP) if pod.Status.HostIP == nodeIP && pod.Status.PodIP != nodeIP && pod.Status.PodIP != "" { - _, err := ApiHooks.NetAddrDel(&cmn.IPAddrMod{Dev: pod.Name, IP: pod.Status.PodIP + "/32"}) + _, err := ApiHooks.NetAddrDel(&cmn.IPAddrMod{Dev: "llb-rule-" + pod.Name, IP: pod.Status.PodIP + "/32"}) if err != nil { tk.LogIt(tk.LogDebug, "Pod(%s) delete: %s - %s: failed - %s\n", pod.Name, pod.Status.PodIP, pod.Status.HostIP, err) } else { @@ -109,7 +109,7 @@ func K8sApiInit(k8sConfigFile string, hooks cmn.NetHookInterface) error { switch oldPod := oldObj.(type) { case *v1.Pod: if oldPod.Status.HostIP == nodeIP && oldPod.Status.PodIP != nodeIP && oldPod.Status.PodIP != "" { - _, err := ApiHooks.NetAddrDel(&cmn.IPAddrMod{Dev: oldPod.Name, IP: oldPod.Status.PodIP + "/32"}) + _, err := ApiHooks.NetAddrDel(&cmn.IPAddrMod{Dev: "llb-rule-" + oldPod.Name, IP: oldPod.Status.PodIP + "/32"}) if err != nil { tk.LogIt(tk.LogDebug, "Pod(%s) delete: %s - %s: failed - %s\n", oldPod.Name, oldPod.Status.PodIP, oldPod.Status.HostIP, err) } else { @@ -121,7 +121,7 @@ func K8sApiInit(k8sConfigFile string, hooks cmn.NetHookInterface) error { case *v1.Pod: tk.LogIt(tk.LogInfo, "Pod(%s) modify: %s - %s:\n", pod.Name, pod.Status.PodIP, pod.Status.HostIP) if pod.Status.HostIP == nodeIP && pod.Status.PodIP != nodeIP && pod.Status.PodIP != "" { - _, err := ApiHooks.NetAddrAdd(&cmn.IPAddrMod{Dev: pod.Name, IP: pod.Status.PodIP + "/32"}) + _, err := ApiHooks.NetAddrAdd(&cmn.IPAddrMod{Dev: "llb-rule-" + pod.Name, IP: pod.Status.PodIP + "/32"}) if err != nil { tk.LogIt(tk.LogDebug, "Pod(%s) modify: %s - %s: failed - %s\n", pod.Name, pod.Status.PodIP, pod.Status.HostIP, err) } else {