Merge pull request #73917 from droslean/cleanup

replace loops with go idiomatic.

pkg/cloudprovider/providers/azure/azure_loadbalancer.go

@@ -1032,9 +1032,7 @@ func (az *Cloud) reconcileSecurityGroup(clusterName string, service *v1.Service,
 		for _, ip := range sourceRanges {
 			sourceAddressPrefixes = append(sourceAddressPrefixes, ip.String())
 		}
-		for _, serviceTag := range serviceTags {
+		sourceAddressPrefixes = append(sourceAddressPrefixes, serviceTags...)
-			sourceAddressPrefixes = append(sourceAddressPrefixes, serviceTag)
-		}
 	}
 	expectedSecurityRules := []network.SecurityRule{}
 

pkg/cloudprovider/providers/vsphere/vclib/virtualmachine.go

@@ -229,9 +229,7 @@ func (vm *VirtualMachine) GetAllAccessibleDatastores(ctx context.Context) ([]*Da
 		return nil, err
 	}
 	var dsRefList []types.ManagedObjectReference
-	for _, dsRef := range hostSystemMo.Datastore {
+	dsRefList = append(dsRefList, hostSystemMo.Datastore...)
-		dsRefList = append(dsRefList, dsRef)
-	}
 
 	var dsMoList []mo.Datastore
 	pc := property.DefaultCollector(vm.Client())

pkg/controller/volume/attachdetach/testing/testvolumespec.go

@@ -113,9 +113,7 @@ func CreateTestClient() *fake.Clientset {
 			}
 			obj.Items = append(obj.Items, pod)
 		}
-		for _, pod := range extraPods.Items {
+		obj.Items = append(obj.Items, extraPods.Items...)
-			obj.Items = append(obj.Items, pod)
-		}
 		return true, obj, nil
 	})
 	fakeClient.AddReactor("create", "pods", func(action core.Action) (handled bool, ret runtime.Object, err error) {

pkg/kubectl/cmd/convert/convert.go

@@ -263,9 +263,7 @@ func asVersionedObjects(infos []*resource.Info, specifiedOutputVersion schema.Gr
 			gvks, _, err := scheme.Scheme.ObjectKinds(info.Object)
 			if err == nil {
 				for _, gvk := range gvks {
-					for _, version := range scheme.Scheme.PrioritizedVersionsForGroup(gvk.Group) {
+					targetVersions = append(targetVersions, scheme.Scheme.PrioritizedVersionsForGroup(gvk.Group)...)
-						targetVersions = append(targetVersions, version)
-					}
 				}
 			}
 		}

pkg/kubelet/BUILD

@@ -144,7 +144,6 @@ go_library(
         "//vendor/github.com/golang/groupcache/lru:go_default_library",
         "//vendor/github.com/google/cadvisor/events:go_default_library",
         "//vendor/github.com/google/cadvisor/info/v1:go_default_library",
-        "//vendor/github.com/google/cadvisor/info/v2:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
         "//vendor/k8s.io/utils/integer:go_default_library",

pkg/kubelet/config/config.go

@@ -314,9 +314,7 @@ func (s *podStorage) merge(source string, change interface{}) (adds, updates, de
 		}
 	case kubetypes.RESTORE:
 		klog.V(4).Infof("Restoring pods for source %s", source)
-		for _, value := range update.Pods {
+		restorePods = append(restorePods, update.Pods...)
-			restorePods = append(restorePods, value)
-		}
 
 	default:
 		klog.Warningf("Received invalid update type: %v", update)

pkg/kubelet/kubelet.go

@@ -32,7 +32,6 @@ import (
 	"time"
 
 	cadvisorapi "github.com/google/cadvisor/info/v1"
-	cadvisorapiv2 "github.com/google/cadvisor/info/v2"
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
@@ -991,9 +990,6 @@ type Kubelet struct {
 	// Cached MachineInfo returned by cadvisor.
 	machineInfo *cadvisorapi.MachineInfo
 
-	//Cached RootFsInfo returned by cadvisor
-	rootfsInfo *cadvisorapiv2.FsInfo
-
 	// Handles certificate rotations.
 	serverCertificateManager certificate.Manager
 

pkg/proxy/winuserspace/proxysocket.go

@@ -507,9 +507,7 @@ func (udp *udpProxySocket) ProxyLoop(service ServicePortPortalName, myInfo *serv
 		ipconfigInterface := ipconfig.New(execer)
 		suffixList, err := ipconfigInterface.GetDNSSuffixSearchList()
 		if err == nil {
-			for _, suffix := range suffixList {
+			dnsSearch = append(dnsSearch, suffixList...)
-				dnsSearch = append(dnsSearch, suffix)
-			}
 		}
 	}
 

pkg/quota/v1/generic/evaluator.go

@@ -109,9 +109,7 @@ func getScopeSelectorsFromQuota(quota *corev1.ResourceQuota) []corev1.ScopedReso
 			Operator:  corev1.ScopeSelectorOpExists})
 	}
 	if quota.Spec.ScopeSelector != nil {
-		for _, scopeSelector := range quota.Spec.ScopeSelector.MatchExpressions {
+		selectors = append(selectors, quota.Spec.ScopeSelector.MatchExpressions...)
-			selectors = append(selectors, scopeSelector)
-		}
 	}
 	return selectors
 }