Skip to content

Commit

Permalink
fix: asgNeedsUpdates invalid condition (pointers)
Browse files Browse the repository at this point in the history 
`machinePoolScope.MachinePool.Spec.Replicas` and `existingASG.DesiredCapacity` are both pointers.
The previous condition compared memory addresses instead of integer
values.
  • Loading branch information
@mweibel
mweibel committed Mar 2, 2022
1 parent 2d87f07 commit 831193e
Show file tree
Hide file tree
Showing 2 changed files with 217 additions and 1 deletion.
6 changes: 5 additions & 1 deletion exp/controllers/awsmachinepool_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,11 @@ func (r *AWSMachinePoolReconciler) reconcileTags(machinePoolScope *scope.Machine

// asgNeedsUpdates compares incoming AWSMachinePool and compares against existing ASG.
func asgNeedsUpdates(machinePoolScope *scope.MachinePoolScope, existingASG *expinfrav1.AutoScalingGroup) bool {
if machinePoolScope.MachinePool.Spec.Replicas != nil && machinePoolScope.MachinePool.Spec.Replicas != existingASG.DesiredCapacity {
if machinePoolScope.MachinePool.Spec.Replicas != nil {
if existingASG.DesiredCapacity == nil || *machinePoolScope.MachinePool.Spec.Replicas != *existingASG.DesiredCapacity {
return true
}
} else if existingASG.DesiredCapacity != nil {
return true
}

Expand Down
212 changes: 212 additions & 0 deletions exp/controllers/awsmachinepool_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"fmt"
"testing"

"github.com/go-logr/logr"
"github.com/golang/mock/gomock"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
Expand Down Expand Up @@ -363,3 +364,214 @@ func setupCluster(clusterName string) (*scope.ClusterScope, error) {
Client: client,
})
}

func Test_asgNeedsUpdates(t *testing.T) {
type args struct {
machinePoolScope *scope.MachinePoolScope
existingASG *expinfrav1.AutoScalingGroup
}
tests := []struct {
name string
args args
want bool
}{
{
name: "replicas != asg.desiredCapacity",
args: args{
machinePoolScope: &scope.MachinePoolScope{
MachinePool: &expclusterv1.MachinePool{
Spec: expclusterv1.MachinePoolSpec{
Replicas: pointer.Int32(0),
},
},
},
existingASG: &expinfrav1.AutoScalingGroup{
DesiredCapacity: pointer.Int32(1),
},
},
want: true,
},
{
name: "replicas (nil) != asg.desiredCapacity",
args: args{
machinePoolScope: &scope.MachinePoolScope{
MachinePool: &expclusterv1.MachinePool{
Spec: expclusterv1.MachinePoolSpec{
Replicas: nil,
},
},
},
existingASG: &expinfrav1.AutoScalingGroup{
DesiredCapacity: pointer.Int32(1),
},
},
want: true,
},
{
name: "replicas != asg.desiredCapacity (nil)",
args: args{
machinePoolScope: &scope.MachinePoolScope{
MachinePool: &expclusterv1.MachinePool{
Spec: expclusterv1.MachinePoolSpec{
Replicas: pointer.Int32(0),
},
},
},
existingASG: &expinfrav1.AutoScalingGroup{
DesiredCapacity: nil,
},
},
want: true,
},
{
name: "maxSize != asg.maxSize",
args: args{
machinePoolScope: &scope.MachinePoolScope{
MachinePool: &expclusterv1.MachinePool{
Spec: expclusterv1.MachinePoolSpec{
Replicas: pointer.Int32(1),
},
},
AWSMachinePool: &expinfrav1.AWSMachinePool{
Spec: expinfrav1.AWSMachinePoolSpec{
MaxSize: 1,
},
},
},
existingASG: &expinfrav1.AutoScalingGroup{
DesiredCapacity: pointer.Int32(1),
MaxSize: 2,
},
},
want: true,
},
{
name: "minSize != asg.minSize",
args: args{
machinePoolScope: &scope.MachinePoolScope{
MachinePool: &expclusterv1.MachinePool{
Spec: expclusterv1.MachinePoolSpec{
Replicas: pointer.Int32(1),
},
},
AWSMachinePool: &expinfrav1.AWSMachinePool{
Spec: expinfrav1.AWSMachinePoolSpec{
MaxSize: 2,
MinSize: 0,
},
},
},
existingASG: &expinfrav1.AutoScalingGroup{
DesiredCapacity: pointer.Int32(1),
MaxSize: 2,
MinSize: 1,
},
},
want: true,
},
{
name: "capacityRebalance != asg.capacityRebalance",
args: args{
machinePoolScope: &scope.MachinePoolScope{
MachinePool: &expclusterv1.MachinePool{
Spec: expclusterv1.MachinePoolSpec{
Replicas: pointer.Int32(1),
},
},
AWSMachinePool: &expinfrav1.AWSMachinePool{
Spec: expinfrav1.AWSMachinePoolSpec{
MaxSize: 2,
MinSize: 0,
CapacityRebalance: true,
},
},
},
existingASG: &expinfrav1.AutoScalingGroup{
DesiredCapacity: pointer.Int32(1),
MaxSize: 2,
MinSize: 0,
CapacityRebalance: false,
},
},
want: true,
},
{
name: "MixedInstancesPolicy != asg.MixedInstancesPolicy",
args: args{
machinePoolScope: &scope.MachinePoolScope{
MachinePool: &expclusterv1.MachinePool{
Spec: expclusterv1.MachinePoolSpec{
Replicas: pointer.Int32(1),
},
},
AWSMachinePool: &expinfrav1.AWSMachinePool{
Spec: expinfrav1.AWSMachinePoolSpec{
MaxSize: 2,
MinSize: 0,
CapacityRebalance: true,
MixedInstancesPolicy: &expinfrav1.MixedInstancesPolicy{
InstancesDistribution: &expinfrav1.InstancesDistribution{
OnDemandAllocationStrategy: expinfrav1.OnDemandAllocationStrategyPrioritized,
},
Overrides: nil,
},
},
},
Logger: logr.Discard(),
},
existingASG: &expinfrav1.AutoScalingGroup{
DesiredCapacity: pointer.Int32(1),
MaxSize: 2,
MinSize: 0,
CapacityRebalance: true,
MixedInstancesPolicy: &expinfrav1.MixedInstancesPolicy{},
},
},
want: true,
},
{
name: "all matches",
args: args{
machinePoolScope: &scope.MachinePoolScope{
MachinePool: &expclusterv1.MachinePool{
Spec: expclusterv1.MachinePoolSpec{
Replicas: pointer.Int32(1),
},
},
AWSMachinePool: &expinfrav1.AWSMachinePool{
Spec: expinfrav1.AWSMachinePoolSpec{
MaxSize: 2,
MinSize: 0,
CapacityRebalance: true,
MixedInstancesPolicy: &expinfrav1.MixedInstancesPolicy{
InstancesDistribution: &expinfrav1.InstancesDistribution{
OnDemandAllocationStrategy: expinfrav1.OnDemandAllocationStrategyPrioritized,
},
Overrides: nil,
},
},
},
},
existingASG: &expinfrav1.AutoScalingGroup{
DesiredCapacity: pointer.Int32(1),
MaxSize: 2,
MinSize: 0,
CapacityRebalance: true,
MixedInstancesPolicy: &expinfrav1.MixedInstancesPolicy{
InstancesDistribution: &expinfrav1.InstancesDistribution{
OnDemandAllocationStrategy: expinfrav1.OnDemandAllocationStrategyPrioritized,
},
Overrides: nil,
},
},
},
want: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
g := NewWithT(t)
g.Expect(asgNeedsUpdates(tt.args.machinePoolScope, tt.args.existingASG)).To(Equal(tt.want))
})
}
}

0 comments on commit 831193e

Please sign in to comment.