Skip to content

Commit 6e820cd

Browse files
committed
replace loops with go idiomatic.
1 parent b862590 commit 6e820cd

File tree

9 files changed

+7
-26
lines changed

9 files changed

+7
-26
lines changed

pkg/cloudprovider/providers/azure/azure_loadbalancer.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,9 +1000,7 @@ func (az *Cloud) reconcileSecurityGroup(clusterName string, service *v1.Service,
10001000
for _, ip := range sourceRanges {
10011001
sourceAddressPrefixes = append(sourceAddressPrefixes, ip.String())
10021002
}
1003-
for _, serviceTag := range serviceTags {
1004-
sourceAddressPrefixes = append(sourceAddressPrefixes, serviceTag)
1005-
}
1003+
sourceAddressPrefixes = append(sourceAddressPrefixes, serviceTags...)
10061004
}
10071005
expectedSecurityRules := []network.SecurityRule{}
10081006

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,7 @@ func (vm *VirtualMachine) GetAllAccessibleDatastores(ctx context.Context) ([]*Da
229229
return nil, err
230230
}
231231
var dsRefList []types.ManagedObjectReference
232-
for _, dsRef := range hostSystemMo.Datastore {
233-
dsRefList = append(dsRefList, dsRef)
234-
}
232+
dsRefList = append(dsRefList, hostSystemMo.Datastore...)
235233

236234
var dsMoList []mo.Datastore
237235
pc := property.DefaultCollector(vm.Client())

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,7 @@ func CreateTestClient() *fake.Clientset {
113113
}
114114
obj.Items = append(obj.Items, pod)
115115
}
116-
for _, pod := range extraPods.Items {
117-
obj.Items = append(obj.Items, pod)
118-
}
116+
obj.Items = append(obj.Items, extraPods.Items...)
119117
return true, obj, nil
120118
})
121119
fakeClient.AddReactor("create", "pods", func(action core.Action) (handled bool, ret runtime.Object, err error) {

pkg/kubectl/cmd/convert/convert.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,7 @@ func asVersionedObjects(infos []*resource.Info, specifiedOutputVersion schema.Gr
260260
gvks, _, err := scheme.Scheme.ObjectKinds(info.Object)
261261
if err == nil {
262262
for _, gvk := range gvks {
263-
for _, version := range scheme.Scheme.PrioritizedVersionsForGroup(gvk.Group) {
264-
targetVersions = append(targetVersions, version)
265-
}
263+
targetVersions = append(targetVersions, scheme.Scheme.PrioritizedVersionsForGroup(gvk.Group)...)
266264
}
267265
}
268266
}

pkg/kubelet/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ go_library(
144144
"//vendor/github.com/golang/groupcache/lru:go_default_library",
145145
"//vendor/github.com/google/cadvisor/events:go_default_library",
146146
"//vendor/github.com/google/cadvisor/info/v1:go_default_library",
147-
"//vendor/github.com/google/cadvisor/info/v2:go_default_library",
148147
"//vendor/k8s.io/klog:go_default_library",
149148
"//vendor/k8s.io/utils/exec:go_default_library",
150149
"//vendor/k8s.io/utils/integer:go_default_library",

pkg/kubelet/config/config.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,7 @@ func (s *podStorage) merge(source string, change interface{}) (adds, updates, de
314314
}
315315
case kubetypes.RESTORE:
316316
klog.V(4).Infof("Restoring pods for source %s", source)
317-
for _, value := range update.Pods {
318-
restorePods = append(restorePods, value)
319-
}
317+
restorePods = append(restorePods, update.Pods...)
320318

321319
default:
322320
klog.Warningf("Received invalid update type: %v", update)

pkg/kubelet/kubelet.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232
"time"
3333

3434
cadvisorapi "github.com/google/cadvisor/info/v1"
35-
cadvisorapiv2 "github.com/google/cadvisor/info/v2"
3635
"k8s.io/api/core/v1"
3736
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3837
"k8s.io/apimachinery/pkg/fields"
@@ -994,9 +993,6 @@ type Kubelet struct {
994993
// Cached MachineInfo returned by cadvisor.
995994
machineInfo *cadvisorapi.MachineInfo
996995

997-
//Cached RootFsInfo returned by cadvisor
998-
rootfsInfo *cadvisorapiv2.FsInfo
999-
1000996
// Handles certificate rotations.
1001997
serverCertificateManager certificate.Manager
1002998

pkg/proxy/winuserspace/proxysocket.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -507,9 +507,7 @@ func (udp *udpProxySocket) ProxyLoop(service ServicePortPortalName, myInfo *serv
507507
ipconfigInterface := ipconfig.New(execer)
508508
suffixList, err := ipconfigInterface.GetDNSSuffixSearchList()
509509
if err == nil {
510-
for _, suffix := range suffixList {
511-
dnsSearch = append(dnsSearch, suffix)
512-
}
510+
dnsSearch = append(dnsSearch, suffixList...)
513511
}
514512
}
515513

pkg/quota/v1/generic/evaluator.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,7 @@ func getScopeSelectorsFromQuota(quota *corev1.ResourceQuota) []corev1.ScopedReso
109109
Operator: corev1.ScopeSelectorOpExists})
110110
}
111111
if quota.Spec.ScopeSelector != nil {
112-
for _, scopeSelector := range quota.Spec.ScopeSelector.MatchExpressions {
113-
selectors = append(selectors, scopeSelector)
114-
}
112+
selectors = append(selectors, quota.Spec.ScopeSelector.MatchExpressions...)
115113
}
116114
return selectors
117115
}

0 commit comments

Comments
 (0)