Skip to content

Commit dab4af9

Browse files
authored
Merge pull request kubernetes#130998 from dims/use-established-pattern-for-kubelet-metrics-url
Use established pattern for kubelet metrics url
2 parents 9a8c2a9 + 2bd0481 commit dab4af9

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

test/e2e_node/container_metrics_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"github.com/onsi/gomega/gstruct"
2727
"github.com/onsi/gomega/types"
2828

29+
"k8s.io/kubernetes/pkg/cluster/ports"
2930
"k8s.io/kubernetes/test/e2e/framework"
3031
e2emetrics "k8s.io/kubernetes/test/e2e/framework/metrics"
3132
e2evolume "k8s.io/kubernetes/test/e2e/framework/volume"
@@ -125,7 +126,7 @@ var _ = SIGDescribe("ContainerMetrics", "[LinuxOnly]", framework.WithNodeConform
125126

126127
func getContainerMetrics(ctx context.Context) (e2emetrics.KubeletMetrics, error) {
127128
ginkgo.By("getting container metrics from cadvisor")
128-
return e2emetrics.GrabKubeletMetricsWithoutProxy(ctx, framework.TestContext.NodeName+":10255", "/metrics/cadvisor")
129+
return e2emetrics.GrabKubeletMetricsWithoutProxy(ctx, fmt.Sprintf("%s:%d", nodeNameOrIP(), ports.KubeletReadOnlyPort), "/metrics/cadvisor")
129130
}
130131

131132
func preciseSample(value interface{}) types.GomegaMatcher {

0 commit comments

Comments
 (0)