Skip to content

[release-2.0] Remove suspend process flow from create ASG #3892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 30, 2022
Merged

[release-2.0] Remove suspend process flow from create ASG #3892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7e9a3c
Remove suspend process flow from create ASG
Skarlso Nov 19, 2022
2941a51
Added some logs and fixed the unit test
Skarlso Nov 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions exp/controllers/awsmachinepool_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ func (r *AWSMachinePoolReconciler) reconcileNormal(ctx context.Context, machineP

if asg == nil {
// Create new ASG
if _, err := r.createPool(machinePoolScope, clusterScope); err != nil {
if err := r.createPool(machinePoolScope, clusterScope); err != nil {
conditions.MarkFalse(machinePoolScope.AWSMachinePool, expinfrav1.ASGReadyCondition, expinfrav1.ASGProvisionFailedReason, clusterv1.ConditionSeverityError, err.Error())
return ctrl.Result{}, err
}
Expand Down Expand Up @@ -404,6 +404,7 @@ func (r *AWSMachinePoolReconciler) updatePool(machinePoolScope *scope.MachinePoo

suspendedProcessesSlice := machinePoolScope.AWSMachinePool.Spec.SuspendProcesses.ConvertSetValuesToStringSlice()
if !cmp.Equal(existingASG.CurrentlySuspendProcesses, suspendedProcessesSlice) {
clusterScope.Info("reconciling processes", "suspend-processes", suspendedProcessesSlice)
var (
toBeSuspended []string
toBeResumed []string
Expand Down Expand Up @@ -431,7 +432,7 @@ func (r *AWSMachinePoolReconciler) updatePool(machinePoolScope *scope.MachinePoo
delete(currentlySuspended, k)
}

// Convert them back into lists so
// Convert them back into lists to pass them to resume/suspend.
for k := range desiredSuspended {
toBeSuspended = append(toBeSuspended, k)
}
Expand All @@ -441,11 +442,13 @@ func (r *AWSMachinePoolReconciler) updatePool(machinePoolScope *scope.MachinePoo
}

if len(toBeSuspended) > 0 {
clusterScope.Info("suspending processes", "processes", toBeSuspended)
if err := asgSvc.SuspendProcesses(existingASG.Name, toBeSuspended); err != nil {
return errors.Wrapf(err, "failed to suspend processes while trying update pool")
}
}
if len(toBeResumed) > 0 {
clusterScope.Info("resuming processes", "processes", toBeResumed)
if err := asgSvc.ResumeProcesses(existingASG.Name, toBeResumed); err != nil {
return errors.Wrapf(err, "failed to resume processes while trying update pool")
}
Expand All @@ -454,21 +457,17 @@ func (r *AWSMachinePoolReconciler) updatePool(machinePoolScope *scope.MachinePoo
return nil
}

func (r *AWSMachinePoolReconciler) createPool(machinePoolScope *scope.MachinePoolScope, clusterScope cloud.ClusterScoper) (*expinfrav1.AutoScalingGroup, error) {
func (r *AWSMachinePoolReconciler) createPool(machinePoolScope *scope.MachinePoolScope, clusterScope cloud.ClusterScoper) error {
clusterScope.Info("Initializing ASG client")

asgsvc := r.getASGService(clusterScope)

machinePoolScope.Info("Creating Autoscaling Group")
asg, err := asgsvc.CreateASG(machinePoolScope)
if err != nil {
return nil, errors.Wrapf(err, "failed to create AWSMachinePool")
}
suspendedProcessesSlice := machinePoolScope.AWSMachinePool.Spec.SuspendProcesses.ConvertSetValuesToStringSlice()
if err := asgsvc.SuspendProcesses(asg.Name, suspendedProcessesSlice); err != nil {
return nil, errors.Wrapf(err, "failed to suspend processes while trying to create Pool")
if _, err := asgsvc.CreateASG(machinePoolScope); err != nil {
return errors.Wrapf(err, "failed to create AWSMachinePool")
}
return asg, nil

return nil
}

func (r *AWSMachinePoolReconciler) findASG(machinePoolScope *scope.MachinePoolScope, asgsvc services.ASGInterface) (*expinfrav1.AutoScalingGroup, error) {
Expand Down
51 changes: 12 additions & 39 deletions exp/controllers/awsmachinepool_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ func TestAWSMachinePoolReconciler(t *testing.T) {
},
}
}
t.Run("it should suspend these processes", func(t *testing.T) {
t.Run("it should not call suspend as we don't have an ASG yet", func(t *testing.T) {
g := NewWithT(t)
setup(t, g)
defer teardown(t, g)
Expand All @@ -277,7 +277,7 @@ func TestAWSMachinePoolReconciler(t *testing.T) {
asgSvc.EXPECT().CreateASG(gomock.Any()).Return(&expinfrav1.AutoScalingGroup{
Name: "name",
}, nil)
asgSvc.EXPECT().SuspendProcesses("name", []string{"Launch", "Terminate"}).Return(nil).AnyTimes()
asgSvc.EXPECT().SuspendProcesses("name", []string{"Launch", "Terminate"}).Return(nil).AnyTimes().Times(0)

_, err := reconciler.reconcileNormal(context.Background(), ms, cs, cs)
g.Expect(err).To(Succeed())
Expand All @@ -290,56 +290,29 @@ func TestAWSMachinePoolReconciler(t *testing.T) {
All: true,
}
}
t.Run("it should result in all processes being included except the value all", func(t *testing.T) {
t.Run("processes should be suspended during an update call", func(t *testing.T) {
g := NewWithT(t)
setup(t, g)
defer teardown(t, g)
setSuspendedProcesses(t, g)

ms.AWSMachinePool.Spec.SuspendProcesses.All = true
ec2Svc.EXPECT().ReconcileLaunchTemplate(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil)
asgSvc.EXPECT().GetASGByName(gomock.Any()).Return(nil, nil)
asgSvc.EXPECT().CreateASG(gomock.Any()).Return(&expinfrav1.AutoScalingGroup{
ec2Svc.EXPECT().ReconcileTags(gomock.Any(), gomock.Any()).Return(nil)
asgSvc.EXPECT().GetASGByName(gomock.Any()).Return(&expinfrav1.AutoScalingGroup{
Name: "name",
}, nil)
asgSvc.EXPECT().SuspendProcesses("name", []string{
asgSvc.EXPECT().UpdateASG(gomock.Any()).Return(nil).AnyTimes()
asgSvc.EXPECT().SuspendProcesses("name", gomock.InAnyOrder([]string{
"ScheduledActions",
"Launch",
"Terminate",
"AddToLoadBalancer",
"AlarmNotification",
"AZRebalance",
"HealthCheck",
"InstanceRefresh",
"ReplaceUnhealthy",
"ScheduledActions",
}).Return(nil).AnyTimes()

_, err := reconciler.reconcileNormal(context.Background(), ms, cs, cs)
g.Expect(err).To(Succeed())
})
t.Run("and one or more processes are disabled, it should not list those", func(t *testing.T) {
g := NewWithT(t)
setup(t, g)
defer teardown(t, g)
setSuspendedProcesses(t, g)
ms.AWSMachinePool.Spec.SuspendProcesses.Processes = &expinfrav1.Processes{
Launch: pointer.Bool(false),
AZRebalance: pointer.Bool(true), // this should still be included but not twice...
}
ec2Svc.EXPECT().ReconcileLaunchTemplate(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil)
asgSvc.EXPECT().GetASGByName(gomock.Any()).Return(nil, nil)
asgSvc.EXPECT().CreateASG(gomock.Any()).Return(&expinfrav1.AutoScalingGroup{
Name: "name",
}, nil)
asgSvc.EXPECT().SuspendProcesses("name", []string{
"Terminate",
"AddToLoadBalancer",
"AlarmNotification",
"AZRebalance",
"HealthCheck",
"InstanceRefresh",
"ReplaceUnhealthy",
"ScheduledActions",
}).Return(nil).AnyTimes()
})).Return(nil).AnyTimes().Times(1)

_, err := reconciler.reconcileNormal(context.Background(), ms, cs, cs)
g.Expect(err).To(Succeed())
Expand Down Expand Up @@ -369,8 +342,8 @@ func TestAWSMachinePoolReconciler(t *testing.T) {
CurrentlySuspendProcesses: []string{"Launch", "process3"},
}, nil)
asgSvc.EXPECT().UpdateASG(gomock.Any()).Return(nil).AnyTimes()
asgSvc.EXPECT().SuspendProcesses("name", []string{"Terminate"}).Return(nil).AnyTimes()
asgSvc.EXPECT().ResumeProcesses("name", []string{"process3"}).Return(nil).AnyTimes()
asgSvc.EXPECT().SuspendProcesses("name", []string{"Terminate"}).Return(nil).AnyTimes().Times(1)
asgSvc.EXPECT().ResumeProcesses("name", []string{"process3"}).Return(nil).AnyTimes().Times(1)

_, err := reconciler.reconcileNormal(context.Background(), ms, cs, cs)
g.Expect(err).To(Succeed())
Expand Down