kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fold setUpCloud() into getGroups()

This commit is contained in:
John Gardiner Myers 2019-12-01 16:46:07 -08:00
parent 612e4ae484
commit 39f849271b
1 changed files with 21 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
pkg/instancegroups/rollingupdate_test.go
View File

@ -47,7 +47,6 @@ func getTestSetup() (*RollingUpdateCluster, awsup.AWSCloud, *kopsapi.Cluster, ma
mockcloud := awsup.BuildMockAWSCloud("us-east-1", "abc") mockcloud := awsup.BuildMockAWSCloud("us-east-1", "abc")
mockcloud.MockAutoscaling = &mockautoscaling.MockAutoscaling{} mockcloud.MockAutoscaling = &mockautoscaling.MockAutoscaling{}
setUpCloud(mockcloud)
cluster := &kopsapi.Cluster{} cluster := &kopsapi.Cluster{}
cluster.Name = "test.k8s.local" cluster.Name = "test.k8s.local"
@ -65,57 +64,9 @@ func getTestSetup() (*RollingUpdateCluster, awsup.AWSCloud, *kopsapi.Cluster, ma
ValidateSuccessDuration: 5 * time.Millisecond, ValidateSuccessDuration: 5 * time.Millisecond,
} }
return c, mockcloud, cluster, getGroups(k8sClient) groups := getGroups(k8sClient, mockcloud)
}
func setUpCloud(cloud awsup.AWSCloud) { return c, mockcloud, cluster, groups
cloud.Autoscaling().CreateAutoScalingGroup(&autoscaling.CreateAutoScalingGroupInput{
AutoScalingGroupName: aws.String("node-1"),
DesiredCapacity: aws.Int64(3),
MinSize: aws.Int64(1),
MaxSize: aws.Int64(5),
})
cloud.Autoscaling().AttachInstances(&autoscaling.AttachInstancesInput{
AutoScalingGroupName: aws.String("node-1"),
InstanceIds: []*string{aws.String("node-1a"), aws.String("node-1b"), aws.String("node-1c")},
})
cloud.Autoscaling().CreateAutoScalingGroup(&autoscaling.CreateAutoScalingGroupInput{
AutoScalingGroupName: aws.String("node-2"),
DesiredCapacity: aws.Int64(3),
MinSize: aws.Int64(1),
MaxSize: aws.Int64(5),
})
cloud.Autoscaling().AttachInstances(&autoscaling.AttachInstancesInput{
AutoScalingGroupName: aws.String("node-2"),
InstanceIds: []*string{aws.String("node-2a"), aws.String("node-2b"), aws.String("node-2c")},
})
cloud.Autoscaling().CreateAutoScalingGroup(&autoscaling.CreateAutoScalingGroupInput{
AutoScalingGroupName: aws.String("master-1"),
DesiredCapacity: aws.Int64(2),
MinSize: aws.Int64(1),
MaxSize: aws.Int64(5),
})
cloud.Autoscaling().AttachInstances(&autoscaling.AttachInstancesInput{
AutoScalingGroupName: aws.String("master-1"),
InstanceIds: []*string{aws.String("master-1a"), aws.String("master-1b")},
})
cloud.Autoscaling().CreateAutoScalingGroup(&autoscaling.CreateAutoScalingGroupInput{
AutoScalingGroupName: aws.String("bastion-1"),
DesiredCapacity: aws.Int64(1),
MinSize: aws.Int64(1),
MaxSize: aws.Int64(5),
})
cloud.Autoscaling().AttachInstances(&autoscaling.AttachInstancesInput{
AutoScalingGroupName: aws.String("bastion-1"),
InstanceIds: []*string{aws.String("bastion-1a")},
})
} }
type successfulClusterValidator struct{} type successfulClusterValidator struct{}
@ -153,7 +104,7 @@ func (v *assertNotCalledClusterValidator) Validate() (*validation.ValidationClus
return nil, errors.New("validator called unexpectedly") return nil, errors.New("validator called unexpectedly")
} }
func makeGroup(groups map[string]*cloudinstances.CloudInstanceGroup, k8sClient *fake.Clientset, name string, role kopsapi.InstanceGroupRole, count int) { func makeGroup(groups map[string]*cloudinstances.CloudInstanceGroup, k8sClient *fake.Clientset, cloud awsup.AWSCloud, name string, role kopsapi.InstanceGroupRole, count int) {
groups[name] = &cloudinstances.CloudInstanceGroup{ groups[name] = &cloudinstances.CloudInstanceGroup{
InstanceGroup: &kopsapi.InstanceGroup{ InstanceGroup: &kopsapi.InstanceGroup{
ObjectMeta: v1meta.ObjectMeta{ ObjectMeta: v1meta.ObjectMeta{
@ -164,6 +115,14 @@ func makeGroup(groups map[string]*cloudinstances.CloudInstanceGroup, k8sClient *
}, },
}, },
} }
cloud.Autoscaling().CreateAutoScalingGroup(&autoscaling.CreateAutoScalingGroupInput{
AutoScalingGroupName: aws.String(name),
DesiredCapacity: aws.Int64(int64(count)),
MinSize: aws.Int64(1),
MaxSize: aws.Int64(5),
})
var instanceIds []*string
for i := 0; i < count; i++ { for i := 0; i < count; i++ {
id := name + string('a'+i) id := name + string('a'+i)
var node *v1.Node var node *v1.Node
@ -177,15 +136,20 @@ func makeGroup(groups map[string]*cloudinstances.CloudInstanceGroup, k8sClient *
ID: id, ID: id,
Node: node, Node: node,
}) })
instanceIds = append(instanceIds, aws.String(id))
} }
cloud.Autoscaling().AttachInstances(&autoscaling.AttachInstancesInput{
AutoScalingGroupName: aws.String(name),
InstanceIds: instanceIds,
})
} }
func getGroups(k8sClient *fake.Clientset) map[string]*cloudinstances.CloudInstanceGroup { func getGroups(k8sClient *fake.Clientset, cloud awsup.AWSCloud) map[string]*cloudinstances.CloudInstanceGroup {
groups := make(map[string]*cloudinstances.CloudInstanceGroup) groups := make(map[string]*cloudinstances.CloudInstanceGroup)
makeGroup(groups, k8sClient, "node-1", kopsapi.InstanceGroupRoleNode, 3) makeGroup(groups, k8sClient, cloud, "node-1", kopsapi.InstanceGroupRoleNode, 3)
makeGroup(groups, k8sClient, "node-2", kopsapi.InstanceGroupRoleNode, 3) makeGroup(groups, k8sClient, cloud, "node-2", kopsapi.InstanceGroupRoleNode, 3)
makeGroup(groups, k8sClient, "master-1", kopsapi.InstanceGroupRoleMaster, 2) makeGroup(groups, k8sClient, cloud, "master-1", kopsapi.InstanceGroupRoleMaster, 2)
makeGroup(groups, k8sClient, "bastion-1", kopsapi.InstanceGroupRoleBastion, 1) makeGroup(groups, k8sClient, cloud, "bastion-1", kopsapi.InstanceGroupRoleBastion, 1)
return groups return groups
} }