diff --git a/pkg/acls/gce/storage.go b/pkg/acls/gce/storage.go index 24b7b88840..c52a9fe1f7 100644 --- a/pkg/acls/gce/storage.go +++ b/pkg/acls/gce/storage.go @@ -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, diff --git a/protokube/pkg/gossip/ali/seeds.go b/protokube/pkg/gossip/ali/seeds.go index 6b93131863..308e560746 100644 --- a/protokube/pkg/gossip/ali/seeds.go +++ b/protokube/pkg/gossip/ali/seeds.go @@ -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 diff --git a/upup/pkg/fi/cloudup/gce/network.go b/upup/pkg/fi/cloudup/gce/network.go index 90cecf2b16..54e13849e2 100644 --- a/upup/pkg/fi/cloudup/gce/network.go +++ b/upup/pkg/fi/cloudup/gce/network.go @@ -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) diff --git a/upup/pkg/kutil/import_cluster.go b/upup/pkg/kutil/import_cluster.go index 1db769169c..c95db83d79 100644 --- a/upup/pkg/kutil/import_cluster.go +++ b/upup/pkg/kutil/import_cluster.go @@ -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 })