From 588c1a017303b765fa3f513bc83e1397c1ba3a99 Mon Sep 17 00:00:00 2001 From: wanglijie6 Date: Fri, 8 Apr 2022 18:59:40 +0800 Subject: [PATCH 1/2] Show hostName other than podName Signed-off-by: wanglijie6 --- pkg/goldpinger/k8s.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkg/goldpinger/k8s.go b/pkg/goldpinger/k8s.go index 3643a75..33f340f 100644 --- a/pkg/goldpinger/k8s.go +++ b/pkg/goldpinger/k8s.go @@ -16,8 +16,9 @@ package goldpinger import ( "context" - "go.uber.org/zap" "io/ioutil" + + "go.uber.org/zap" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8snet "k8s.io/utils/net" @@ -93,6 +94,14 @@ func getPodIP(p v1.Pod) string { return podIP } +func getPodNodeName(p v1.Pod) string { + if p.Spec.NodeName != "" { + return p.Spec.NodeName + } + + return p.Name +} + // GetAllPods returns a mapping from a pod name to a pointer to a GoldpingerPod(s) func GetAllPods() map[string]*GoldpingerPod { timer := GetLabeledKubernetesCallsTimer() @@ -111,7 +120,7 @@ func GetAllPods() map[string]*GoldpingerPod { podMap := make(map[string]*GoldpingerPod) for _, pod := range pods.Items { podMap[pod.Name] = &GoldpingerPod{ - Name: pod.Name, + Name: getPodNodeName(pod), PodIP: getPodIP(pod), HostIP: getHostIP(pod), } From 7609a3ab3f36e52ff54045ac21e4991f58dbddec Mon Sep 17 00:00:00 2001 From: wanglijie6 Date: Wed, 13 Apr 2022 10:51:51 +0800 Subject: [PATCH 2/2] Add --display-nodename option to control UI display Add GoldpingerConfig.DisplayNodeName to control UI display, default is `false`, which means to display podName Signed-off-by: wanglijie6 --- pkg/goldpinger/config.go | 1 + pkg/goldpinger/k8s.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/goldpinger/config.go b/pkg/goldpinger/config.go index dba0dfb..b71da60 100644 --- a/pkg/goldpinger/config.go +++ b/pkg/goldpinger/config.go @@ -32,6 +32,7 @@ var GoldpingerConfig = struct { UseHostIP bool `long:"use-host-ip" description:"When making the calls, use host ip (defaults to pod ip)" env:"USE_HOST_IP"` LabelSelector string `long:"label-selector" description:"label selector to use to discover goldpinger pods in the cluster" env:"LABEL_SELECTOR" default:"app=goldpinger"` Namespace *string `long:"namespace" description:"namespace to use to discover goldpinger pods in the cluster (empty for all). Defaults to discovering the namespace for the current pod" env:"NAMESPACE"` + DisplayNodeName bool `long:"display-nodename" description:"Display nodename other than podname in UI (defaults is podname)." env:"DISPLAY_NODENAME"` KubernetesClient *kubernetes.Clientset DnsHosts []string `long:"host-to-resolve" description:"A host to attempt dns resolve on (space delimited)" env:"HOSTS_TO_RESOLVE" env-delim:" "` diff --git a/pkg/goldpinger/k8s.go b/pkg/goldpinger/k8s.go index 33f340f..7b323be 100644 --- a/pkg/goldpinger/k8s.go +++ b/pkg/goldpinger/k8s.go @@ -95,7 +95,7 @@ func getPodIP(p v1.Pod) string { } func getPodNodeName(p v1.Pod) string { - if p.Spec.NodeName != "" { + if GoldpingerConfig.DisplayNodeName { return p.Spec.NodeName }