diff --git a/test/e2e/framework/kubelet_stats.go b/test/e2e/framework/kubelet_stats.go index 08115875004..9781b931173 100644 --- a/test/e2e/framework/kubelet_stats.go +++ b/test/e2e/framework/kubelet_stats.go @@ -28,16 +28,19 @@ import ( "text/tabwriter" "time" - "github.com/prometheus/common/model" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" kubeletmetrics "k8s.io/kubernetes/pkg/kubelet/metrics" "k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/pkg/metrics" + + "github.com/golang/glog" + "github.com/prometheus/common/model" ) // KubeletMetric stores metrics scraped from the kubelet server's /metric endpoint. @@ -367,6 +370,11 @@ func getOneTimeResourceUsageOnNode( } f := func(name string, newStats *stats.ContainerStats) *ContainerResourceUsage { + // TODO(gmarek): remove when #46198 is debugged. + if newStats == nil || newStats.CPU == nil { + glog.Warning("NewStats is %#v for container %v", newStats, name) + return &ContainerResourceUsage{} + } return &ContainerResourceUsage{ Name: name, Timestamp: newStats.StartTime.Time,