Merge pull request #7759 from beautytiger/dev-191008-clean

replace slice loop with append for simple and clear
This commit is contained in:
Kubernetes Prow Robot 2019-10-21 08:11:37 -07:00 committed by GitHub
commit 7ca9531695
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 15 deletions

View File

@ -64,9 +64,7 @@ func (s *gcsAclStrategy) GetACL(p vfs.Path, cluster *kops.Cluster) (vfs.ACL, err
}
var acls []*storage.ObjectAccessControl
for _, a := range bucket.DefaultObjectAcl {
acls = append(acls, a)
}
acls = append(acls, bucket.DefaultObjectAcl...)
acls = append(acls, &storage.ObjectAccessControl{
Email: serviceAccount,

View File

@ -62,9 +62,7 @@ func (p *SeedProvider) GetSeeds() ([]string, error) {
for _, instance := range instances {
// TODO: Multiple IP addresses?
for _, ip := range instance.VpcAttributes.PrivateIpAddress.IpAddress {
seeds = append(seeds, ip)
}
seeds = append(seeds, instance.VpcAttributes.PrivateIpAddress.IpAddress...)
}
return seeds, nil

View File

@ -66,9 +66,7 @@ func performNetworkAssignmentsIPAliases(ctx context.Context, c *kops.Cluster, cl
var regions []*compute.Region
if err := cloud.Compute().Regions.List(cloud.Project()).Pages(ctx, func(p *compute.RegionList) error {
for _, r := range p.Items {
regions = append(regions, r)
}
regions = append(regions, p.Items...)
return nil
}); err != nil {
return fmt.Errorf("error listing Regions: %v", err)
@ -89,9 +87,7 @@ func performNetworkAssignmentsIPAliases(ctx context.Context, c *kops.Cluster, cl
var subnets []*compute.Subnetwork
for _, r := range regions {
if err := cloud.Compute().Subnetworks.List(cloud.Project(), r.Name).Pages(ctx, func(p *compute.SubnetworkList) error {
for _, s := range p.Items {
subnets = append(subnets, s)
}
subnets = append(subnets, p.Items...)
return nil
}); err != nil {
return fmt.Errorf("error listing Subnetworks: %v", err)

View File

@ -635,9 +635,7 @@ func findInstances(c awsup.AWSCloud) ([]*ec2.Instance, error) {
err := c.EC2().DescribeInstancesPages(request, func(p *ec2.DescribeInstancesOutput, lastPage bool) bool {
for _, reservation := range p.Reservations {
for _, instance := range reservation.Instances {
instances = append(instances, instance)
}
instances = append(instances, reservation.Instances...)
}
return true
})