Create RollingUpgradeContext (#234)

* #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]> Co-authored-by: Sahil Badla <[email protected]>
keikoproj · May 13, 2021 · b664fdd · b664fdd
1 parent b8d0e72
commit b664fdd
Show file tree

Hide file tree

Showing 4 changed files with 163 additions and 156 deletions.
diff --git a/controllers/helpers_test.go b/controllers/helpers_test.go
@@ -48,12 +48,22 @@ func createRollingUpgradeReconciler(t *testing.T) *RollingUpgradeReconciler {
 		ScriptRunner: ScriptRunner{
 			Logger: logger,
 		},
-		Cloud: NewDiscoveredState(auth, logger),
 	}
 	return reconciler
 
 }
 
+func createRollingUpgradeContext(r *RollingUpgradeReconciler) *RollingUpgradeContext {
+	return &RollingUpgradeContext{
+		Logger:         r.Logger,
+		Auth:           r.Auth,
+		ScriptRunner:   r.ScriptRunner,
+		Cloud:          NewDiscoveredState(r.Auth, r.Logger),
+		RollingUpgrade: createRollingUpgrade(),
+	}
+
+}
+
 func createRollingUpgrade() *v1alpha1.RollingUpgrade {
 	return &v1alpha1.RollingUpgrade{
 		ObjectMeta: metav1.ObjectMeta{Name: "0", Namespace: "default"},

diff --git a/controllers/rollingupgrade_controller.go b/controllers/rollingupgrade_controller.go
@@ -40,16 +40,13 @@ import (
 type RollingUpgradeReconciler struct {
 	client.Client
 	logr.Logger
-	Scheme           *runtime.Scheme
-	AdmissionMap     sync.Map
-	CacheConfig      *cache.Config
-	Auth             *RollingUpgradeAuthenticator
-	Cloud            *DiscoveredState
-	EventWriter      *kubeprovider.EventWriter
-	maxParallel      int
-	ScriptRunner     ScriptRunner
-	DrainGroupMapper sync.Map
-	DrainErrorMapper sync.Map
+	Scheme       *runtime.Scheme
+	AdmissionMap sync.Map
+	CacheConfig  *cache.Config
+	EventWriter  *kubeprovider.EventWriter
+	maxParallel  int
+	ScriptRunner ScriptRunner
+	Auth         *RollingUpgradeAuthenticator
 }
 
 type RollingUpgradeAuthenticator struct {
@@ -129,16 +126,23 @@ func (r *RollingUpgradeReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	rollingUpgrade.SetCurrentStatus(v1alpha1.StatusInit)
 	common.SetMetricRollupInitOrRunning(rollingUpgrade.Name)
 
-	r.Cloud = NewDiscoveredState(r.Auth, r.Logger)
-	if err := r.Cloud.Discover(); err != nil {
+	rollupCtx := &RollingUpgradeContext{
+		Logger:         r.Logger,
+		Auth:           r.Auth,
+		ScriptRunner:   r.ScriptRunner,
+		RollingUpgrade: rollingUpgrade,
+	}
+	rollupCtx.Cloud = NewDiscoveredState(rollupCtx.Auth, rollupCtx.Logger)
+	if err := rollupCtx.Cloud.Discover(); err != nil {
+		r.Info("failed to discover the cloud", "name", rollingUpgrade.NamespacedName(), "scalingGroup", scalingGroupName)
 		rollingUpgrade.SetCurrentStatus(v1alpha1.StatusError)
 		// Set prometheus metric cr_status_failed
 		common.SetMetricRollupFailed(rollingUpgrade.Name)
 		return ctrl.Result{}, err
 	}
 
 	// process node rotation
-	if err := r.RotateNodes(rollingUpgrade); err != nil {
+	if err := rollupCtx.RotateNodes(); err != nil {
 		rollingUpgrade.SetCurrentStatus(v1alpha1.StatusError)
 		// Set prometheus metric cr_status_failed
 		common.SetMetricRollupFailed(rollingUpgrade.Name)