Merge pull request #838 from yangjunmyfm192085/delete-start-time

Don‘t use Kubelet start time for metrics-server.

pkg/scraper/client/summary/decode.go

@@ -54,15 +54,14 @@ func decodeBatch(summary *Summary) *storage.MetricsBatch {
 }
 
 func decodeNodeStats(nodeStats *NodeStats, target *storage.NodeMetricsPoint) (success bool) {
-	if nodeStats.StartTime.IsZero() || nodeStats.CPU == nil || nodeStats.CPU.Time.IsZero() {
+	if nodeStats.CPU == nil || nodeStats.CPU.Time.IsZero() {
 		// if we can't get a timestamp, assume bad data in general
 		klog.V(1).InfoS("Failed getting node metric timestamp", "node", klog.KRef("", nodeStats.NodeName))
 		return false
 	}
 	*target = storage.NodeMetricsPoint{
 		Name: nodeStats.NodeName,
 		MetricsPoint: storage.MetricsPoint{
-			StartTime: nodeStats.StartTime.Time,
 			Timestamp: nodeStats.CPU.Time.Time,
 		},
 	}

pkg/scraper/client/summary/decode_test.go

@@ -37,10 +37,9 @@ var _ = Describe("Decode", func() {
 		scrapeTime := time.Now()
 		summary = &Summary{
 			Node: NodeStats{
-				NodeName:  "node1",
-				CPU:       cpuStats(100, scrapeTime.Add(100*time.Millisecond)),
-				Memory:    memStats(200, scrapeTime.Add(200*time.Millisecond)),
-				StartTime: metav1.Time{Time: scrapeTime.Add(-100 * time.Millisecond)},
+				NodeName: "node1",
+				CPU:      cpuStats(100, scrapeTime.Add(100*time.Millisecond)),
+				Memory:   memStats(200, scrapeTime.Add(200*time.Millisecond)),
 			},
 			Pods: []PodStats{
 				podStats("ns1", "pod1",
@@ -75,7 +74,6 @@ var _ = Describe("Decode", func() {
 		batch := decodeBatch(summary)
 
 		By("verifying that the scrape time is as expected")
-		Expect(batch.Nodes[0].StartTime).To(Equal(summary.Node.StartTime.Time))
 		Expect(batch.Pods[0].Containers[0].StartTime).To(Equal(summary.Pods[0].Containers[0].StartTime.Time))
 		Expect(batch.Pods[1].Containers[0].StartTime).To(Equal(summary.Pods[1].Containers[0].StartTime.Time))
 	})

pkg/scraper/client/summary/types.go

@@ -30,8 +30,6 @@ type Summary struct {
 type NodeStats struct {
 	// Reference to the measured Node.
 	NodeName string `json:"nodeName"`
-	// Start time of system
-	StartTime metav1.Time `json:"startTime"`
 	// Stats pertaining to CPU resources.
 	// +optional
 	CPU *CPUStats `json:"cpu,omitempty"`

pkg/scraper/client/summary/types_test.go

@@ -467,7 +467,6 @@ var expected = &storage.MetricsBatch{
 		{
 			Name: "e2e-v1.17.0-control-plane",
 			MetricsPoint: storage.MetricsPoint{
-				StartTime:         time.Date(2020, 3, 31, 18, 00, 54, 0, time.UTC),
 				Timestamp:         time.Date(2020, 4, 16, 20, 25, 28, 0, time.UTC),
 				CumulativeCpuUsed: 519978197128,
 				MemoryUsage:       1417551872,

pkg/storage/node.go

@@ -31,7 +31,7 @@ type nodeStorage struct {
 	// last stores node metric points from last scrape
 	last map[string]NodeMetricsPoint
 	// prev stores node metric points from scrape preceding the last one.
-	// Points timestamp should proceed the corresponding points from last and have same start time (no restart between them).
+	// Points timestamp should proceed the corresponding points from last.
 	prev map[string]NodeMetricsPoint
 }
 
@@ -69,8 +69,7 @@ func (s *nodeStorage) Store(newNodes []NodeMetricsPoint) {
 		}
 		lastNodes[newNode.Name] = newNode
 
-		// Keep previous metric point if newNode has not restarted (new metric start time < stored timestamp)
-		if lastNode, found := s.last[newNode.Name]; found && newNode.StartTime.Before(lastNode.Timestamp) {
+		if lastNode, found := s.last[newNode.Name]; found {
 			// If new point is different then one already stored
 			if newNode.Timestamp.After(lastNode.Timestamp) {
 				// Move stored point to previous