Revert "Fix metrics collecting issue (#249)" (#256)

This reverts commit f5dd1cb.
keikoproj · Jun 16, 2021 · 376657f · 376657f
1 parent f5dd1cb
commit 376657f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/api/v1alpha1/rollingupgrade_types.go b/api/v1alpha1/rollingupgrade_types.go
@@ -54,8 +54,8 @@ type RollingUpgradeStatus struct {
 	LastNodeTerminationTime *metav1.Time              `json:"lastTerminationTime,omitempty"`
 	LastNodeDrainTime       *metav1.Time              `json:"lastDrainTime,omitempty"`
 
-	Statistics     []*RollingUpgradeStatistics  `json:"statistics,omitempty"`
-	LastBatchNodes map[string]*NodeInProcessing `json:"lastBatchNodes,omitempty"`
+	Statistics     []*RollingUpgradeStatistics `json:"statistics,omitempty"`
+	LastBatchNodes []string                    `json:"lastBatchNodes,omitempty"`
 }
 
 // RollingUpgrade Statistics, includes summary(sum/count) from each step

diff --git a/controllers/metrics.go b/controllers/metrics.go
@@ -10,7 +10,11 @@ import (
 
 // Update last batch nodes
 func (s *RollingUpgradeContext) UpdateLastBatchNodes(batchNodes map[string]*v1alpha1.NodeInProcessing) {
-	s.RollingUpgrade.Status.LastBatchNodes = batchNodes
+	keys := make([]string, 0, len(batchNodes))
+	for k := range batchNodes {
+		keys = append(keys, k)
+	}
+	s.RollingUpgrade.Status.LastBatchNodes = keys
 }
 
 // Update Node Statistics

diff --git a/controllers/upgrade.go b/controllers/upgrade.go
@@ -131,10 +131,7 @@ func (r *RollingUpgradeContext) ReplaceNodeBatch(batch []*autoscaling.Instance)
 	//A map to retain the steps for multiple nodes
 	nodeSteps := make(map[string][]v1alpha1.NodeStepDuration)
 
-	inProcessingNodes := r.RollingUpgrade.Status.LastBatchNodes
-	if inProcessingNodes == nil {
-		inProcessingNodes = make(map[string]*v1alpha1.NodeInProcessing)
-	}
+	inProcessingNodes := make(map[string]*v1alpha1.NodeInProcessing)
 
 	switch mode {
 	case v1alpha1.UpdateStrategyModeEager: