From 31aad75316b6e63840ec05b8bc9205fbb6d897aa Mon Sep 17 00:00:00 2001
From: Wang Guoliang <iamwgliang@gmail.com>
Date: Sun, 11 Feb 2018 21:27:11 +0800
Subject: [PATCH] more concise to merge the array

---
 pkg/controller/service/service_controller_test.go            | 5 ++---
 pkg/scheduler/core/generic_scheduler_test.go                 | 5 ++---
 pkg/volume/rbd/rbd.go                                        | 4 +---
 plugin/pkg/admission/gc/gc_admission_test.go                 | 5 ++---
 .../k8s.io/apiserver/pkg/util/flag/namedcertkey_flag_test.go | 5 ++---
 test/e2e_node/resource_collector.go                          | 4 +---
 6 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/pkg/controller/service/service_controller_test.go b/pkg/controller/service/service_controller_test.go
index cb6e16270b..dbf625d3b2 100644
--- a/pkg/controller/service/service_controller_test.go
+++ b/pkg/controller/service/service_controller_test.go
@@ -247,9 +247,8 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
 		controller, cloud, _ := newController()
 
 		var services []*v1.Service
-		for _, service := range item.services {
-			services = append(services, service)
-		}
+		services = append(services, item.services...)
+
 		if err := controller.updateLoadBalancerHosts(services, nodes); err != nil {
 			t.Errorf("unexpected error: %v", err)
 		}
diff --git a/pkg/scheduler/core/generic_scheduler_test.go b/pkg/scheduler/core/generic_scheduler_test.go
index 9df65890f2..14e7e5885d 100644
--- a/pkg/scheduler/core/generic_scheduler_test.go
+++ b/pkg/scheduler/core/generic_scheduler_test.go
@@ -403,9 +403,8 @@ func TestGenericScheduler(t *testing.T) {
 			cache.AddNode(&v1.Node{ObjectMeta: metav1.ObjectMeta{Name: name}})
 		}
 		pvcs := []*v1.PersistentVolumeClaim{}
-		for _, pvc := range test.pvcs {
-			pvcs = append(pvcs, pvc)
-		}
+		pvcs = append(pvcs, test.pvcs...)
+
 		pvcLister := schedulertesting.FakePersistentVolumeClaimLister(pvcs)
 
 		scheduler := NewGenericScheduler(
diff --git a/pkg/volume/rbd/rbd.go b/pkg/volume/rbd/rbd.go
index 9323e4bbd2..2cbf693520 100644
--- a/pkg/volume/rbd/rbd.go
+++ b/pkg/volume/rbd/rbd.go
@@ -590,9 +590,7 @@ func (r *rbdVolumeProvisioner) Provision() (*v1.PersistentVolume, error) {
 		switch dstrings.ToLower(k) {
 		case "monitors":
 			arr := dstrings.Split(v, ",")
-			for _, m := range arr {
-				r.Mon = append(r.Mon, m)
-			}
+			r.Mon = append(r.Mon, arr...)
 		case "adminid":
 			r.adminId = v
 		case "adminsecretname":
diff --git a/plugin/pkg/admission/gc/gc_admission_test.go b/plugin/pkg/admission/gc/gc_admission_test.go
index db805c9b70..fb1e047865 100644
--- a/plugin/pkg/admission/gc/gc_admission_test.go
+++ b/plugin/pkg/admission/gc/gc_admission_test.go
@@ -276,9 +276,8 @@ func TestGCAdmission(t *testing.T) {
 func TestBlockOwnerDeletionAdmission(t *testing.T) {
 	podWithOwnerRefs := func(refs ...metav1.OwnerReference) *api.Pod {
 		var refSlice []metav1.OwnerReference
-		for _, ref := range refs {
-			refSlice = append(refSlice, ref)
-		}
+		refSlice = append(refSlice, refs...)
+
 		return &api.Pod{
 			ObjectMeta: metav1.ObjectMeta{
 				OwnerReferences: refSlice,
diff --git a/staging/src/k8s.io/apiserver/pkg/util/flag/namedcertkey_flag_test.go b/staging/src/k8s.io/apiserver/pkg/util/flag/namedcertkey_flag_test.go
index 76df0e8682..542e221c9f 100644
--- a/staging/src/k8s.io/apiserver/pkg/util/flag/namedcertkey_flag_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/util/flag/namedcertkey_flag_test.go
@@ -112,9 +112,8 @@ func TestNamedCertKeyArrayFlag(t *testing.T) {
 	for i, test := range tests {
 		fs := pflag.NewFlagSet("testNamedCertKeyArray", pflag.ContinueOnError)
 		var nkcs []NamedCertKey
-		for _, d := range test.def {
-			nkcs = append(nkcs, d)
-		}
+		nkcs = append(nkcs, test.def...)
+
 		fs.Var(NewNamedCertKeyArray(&nkcs), "tls-sni-cert-key", "usage")
 
 		args := []string{}
diff --git a/test/e2e_node/resource_collector.go b/test/e2e_node/resource_collector.go
index c98a8c2ff2..94987bc883 100644
--- a/test/e2e_node/resource_collector.go
+++ b/test/e2e_node/resource_collector.go
@@ -220,9 +220,7 @@ func (r *ResourceCollector) GetBasicCPUStats(containerName string) map[float64]f
 
 	// We must make a copy of array, otherwise the timeseries order is changed.
 	usages := make([]*framework.ContainerResourceUsage, 0)
-	for _, usage := range r.buffers[containerName] {
-		usages = append(usages, usage)
-	}
+	usages = append(usages, r.buffers[containerName]...)
 
 	sort.Sort(resourceUsageByCPU(usages))
 	for _, q := range percentiles {