Resolve compile errors caused by merge conflict. (#235)

* #2285: rollup CR statistic metrics in v2 (#218) * #2285: rollup CR statistic metrics in v2 Signed-off-by: sbadla1 <[email protected]> * #2285: updated metric flags Signed-off-by: sbadla1 <[email protected]> * #2285: updated metric flags Signed-off-by: sbadla1 <[email protected]> Signed-off-by: sbadiger <[email protected]> * log cloud discovery failure Signed-off-by: sbadiger <[email protected]> * Create RollingUpgrade Context Signed-off-by: sbadiger <[email protected]> * rollingupgrade context Signed-off-by: sbadiger <[email protected]> * resolve compile errors due to merge conflict Signed-off-by: sbadiger <[email protected]> Co-authored-by: Sahil Badla <[email protected]>
keikoproj · May 13, 2021 · b659e0f · b659e0f
1 parent b664fdd
commit b659e0f
Show file tree

Hide file tree

Showing 2 changed files with 298 additions and 2 deletions.
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/controllers/upgrade.go b/controllers/upgrade.go
@@ -65,7 +65,7 @@ func (r *RollingUpgradeContext) RotateNodes() error {
 		drainInterval       = r.RollingUpgrade.PostDrainDelaySeconds()
 	)
 	r.RollingUpgrade.SetCurrentStatus(v1alpha1.StatusRunning)
-	common.SetRollupInitOrRunningStatus(r.RollingUpgrade.Name)
+	common.SetMetricRollupInitOrRunning(r.RollingUpgrade.Name)
 
 	// set status start time
 	if r.RollingUpgrade.StartTime() == "" {
@@ -97,7 +97,7 @@ func (r *RollingUpgradeContext) RotateNodes() error {
 	if !r.IsScalingGroupDrifted() {
 		r.RollingUpgrade.SetCurrentStatus(v1alpha1.StatusComplete)
 		// Set prometheus metric cr_status_completed
-		common.SetRollupCompletedStatus(r.RollingUpgrade.Name)
+		common.SetMetricRollupCompleted(r.RollingUpgrade.Name)
 		return nil
 	}