UPSTREAM: <carry>: WIP do not query for node name from api for metrics resource

Signed-off-by: Peter Hunt <pehunt@redhat.com>

Author: haircommander

pkg/kubelet/server/stats/handler.go

@@ -78,8 +78,6 @@ type Provider interface {
 	// GetPodByName returns the spec of the pod with the name in the specified
 	// namespace.
 	GetPodByName(namespace, name string) (*v1.Pod, bool)
-	// GetNode returns the spec of the local node.
-	GetNode() (*v1.Node, error)
 	// GetNodeConfig returns the configuration of the local node.
 	GetNodeConfig() cm.NodeConfig
 	// ListVolumesForPod returns the stats of the volume used by the pod with

pkg/kubelet/server/stats/summary.go

@@ -69,12 +69,6 @@ func NewSummaryProvider(statsProvider Provider) SummaryProvider {
 }
 
 func (sp *summaryProviderImpl) Get(ctx context.Context, updateStats bool) (*statsapi.Summary, error) {
-	// TODO(timstclair): Consider returning a best-effort response if any of
-	// the following errors occur.
-	node, err := sp.provider.GetNode()
-	if err != nil {
-		return nil, fmt.Errorf("failed to get node info: %v", err)
-	}
 	nodeConfig := sp.provider.GetNodeConfig()
 	rootStats, networkStats, err := sp.provider.GetCgroupStats("/", updateStats)
 	if err != nil {
@@ -104,7 +98,7 @@ func (sp *summaryProviderImpl) Get(ctx context.Context, updateStats bool) (*stat
 	}
 
 	nodeStats := statsapi.NodeStats{
-		NodeName:         node.Name,
+		NodeName:         string(nodeConfig.NodeName),
 		CPU:              rootStats.CPU,
 		Memory:           rootStats.Memory,
 		Swap:             rootStats.Swap,
@@ -126,12 +120,6 @@ func (sp *summaryProviderImpl) Get(ctx context.Context, updateStats bool) (*stat
 }
 
 func (sp *summaryProviderImpl) GetCPUAndMemoryStats(ctx context.Context) (*statsapi.Summary, error) {
-	// TODO(timstclair): Consider returning a best-effort response if any of
-	// the following errors occur.
-	node, err := sp.provider.GetNode()
-	if err != nil {
-		return nil, fmt.Errorf("failed to get node info: %v", err)
-	}
 	nodeConfig := sp.provider.GetNodeConfig()
 	rootStats, err := sp.provider.GetCgroupCPUAndMemoryStats("/", false)
 	if err != nil {
@@ -144,7 +132,7 @@ func (sp *summaryProviderImpl) GetCPUAndMemoryStats(ctx context.Context) (*stats
 	}
 
 	nodeStats := statsapi.NodeStats{
-		NodeName:         node.Name,
+		NodeName:         string(nodeConfig.NodeName),
 		CPU:              rootStats.CPU,
 		Memory:           rootStats.Memory,
 		Swap:             rootStats.Swap,

pkg/kubelet/server/stats/summary_test.go

@@ -29,6 +29,7 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	featuregatetesting "k8s.io/component-base/featuregate/testing"
 	statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
@@ -42,6 +43,7 @@ var (
 	rootFsStats  = getFsStats()
 	node         = &v1.Node{ObjectMeta: metav1.ObjectMeta{Name: "test-node"}}
 	nodeConfig   = cm.NodeConfig{
+		NodeName:           types.NodeName("test-node"),
 		RuntimeCgroupsName: "/runtime",
 		SystemCgroupsName:  "/misc",
 		KubeletCgroupsName: "/kubelet",
@@ -77,7 +79,6 @@ func TestSummaryProviderGetStatsNoSplitFileSystem(t *testing.T) {
 
 	mockStatsProvider := statstest.NewMockProvider(t)
 
-	mockStatsProvider.EXPECT().GetNode().Return(node, nil)
 	mockStatsProvider.EXPECT().GetNodeConfig().Return(nodeConfig)
 	mockStatsProvider.EXPECT().GetPodCgroupRoot().Return(cgroupRoot)
 	mockStatsProvider.EXPECT().ListPodStats(ctx).Return(podStats, nil).Maybe()
@@ -178,7 +179,6 @@ func TestSummaryProviderGetStatsSplitImageFs(t *testing.T) {
 
 	mockStatsProvider := statstest.NewMockProvider(t)
 
-	mockStatsProvider.EXPECT().GetNode().Return(node, nil)
 	mockStatsProvider.EXPECT().GetNodeConfig().Return(nodeConfig)
 	mockStatsProvider.EXPECT().GetPodCgroupRoot().Return(cgroupRoot)
 	mockStatsProvider.EXPECT().ListPodStats(ctx).Return(podStats, nil).Maybe()
@@ -278,7 +278,6 @@ func TestSummaryProviderGetCPUAndMemoryStats(t *testing.T) {
 
 	mockStatsProvider := statstest.NewMockProvider(t)
 
-	mockStatsProvider.EXPECT().GetNode().Return(node, nil)
 	mockStatsProvider.EXPECT().GetNodeConfig().Return(nodeConfig)
 	mockStatsProvider.EXPECT().GetPodCgroupRoot().Return(cgroupRoot)
 	mockStatsProvider.EXPECT().ListPodCPUAndMemoryStats(ctx).Return(podStats, nil)

pkg/kubelet/server/stats/summary_windows_test.go

@@ -27,7 +27,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"sigs.k8s.io/randfill"
 
-	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/cm"
@@ -40,7 +39,6 @@ func TestSummaryProvider(t *testing.T) {
 		podStats       = []statsapi.PodStats{*getPodStats()}
 		imageFsStats   = getFsStats()
 		rootFsStats    = getFsStats()
-		node           = &v1.Node{ObjectMeta: metav1.ObjectMeta{Name: "test-node"}}
 		nodeConfig     = cm.NodeConfig{}
 		cgroupRoot     = "/kubepods"
 		cgroupStatsMap = map[string]struct {
@@ -55,7 +53,6 @@ func TestSummaryProvider(t *testing.T) {
 	assert := assert.New(t)
 
 	mockStatsProvider := statstest.NewMockProvider(t)
-	mockStatsProvider.EXPECT().GetNode().Return(node, nil).Maybe()
 	mockStatsProvider.EXPECT().GetNodeConfig().Return(nodeConfig).Maybe()
 	mockStatsProvider.EXPECT().GetPodCgroupRoot().Return(cgroupRoot).Maybe()
 	mockStatsProvider.EXPECT().ListPodStats(ctx).Return(podStats, nil).Maybe()