From 931456a1427ed0ca09e944fae89be55e6e462c6a Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 28 Jun 2023 16:58:10 -0400 Subject: [PATCH] Simplify the node name for metrics - just use localhost Signed-off-by: Davanum Srinivas --- test/e2e_node/util.go | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/test/e2e_node/util.go b/test/e2e_node/util.go index 6fa31d42a43..d98f8325f09 100644 --- a/test/e2e_node/util.go +++ b/test/e2e_node/util.go @@ -40,7 +40,6 @@ import ( v1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" utilfeature "k8s.io/apiserver/pkg/util/feature" @@ -641,20 +640,5 @@ func WaitForPodInitContainerToFail(ctx context.Context, c clientset.Interface, n } func nodeNameOrIP() string { - // Check if the node name in test context can be resolved - if ips, err := net.LookupIP(framework.TestContext.NodeName); err != nil { - if dnsErr, ok := err.(*net.DNSError); ok && dnsErr.IsNotFound { - // if it can't be resolved, pick a host interface - if ip, err := utilnet.ChooseHostInterface(); err == nil { - return ip.String() - } - } - } else { - if len(ips) > 0 { - // yay, node name resolved correctly, pick the first - return ips[0].String() - } - } - // fallback to node name in test context - return framework.TestContext.NodeName + return "localhost" }