mirror of https://github.com/k3s-io/k3s
replace loops with go idiomatic.
parent
b862590bfc
commit
6e820cdcaf
|
@ -1000,9 +1000,7 @@ func (az *Cloud) reconcileSecurityGroup(clusterName string, service *v1.Service,
|
||||||
for _, ip := range sourceRanges {
|
for _, ip := range sourceRanges {
|
||||||
sourceAddressPrefixes = append(sourceAddressPrefixes, ip.String())
|
sourceAddressPrefixes = append(sourceAddressPrefixes, ip.String())
|
||||||
}
|
}
|
||||||
for _, serviceTag := range serviceTags {
|
sourceAddressPrefixes = append(sourceAddressPrefixes, serviceTags...)
|
||||||
sourceAddressPrefixes = append(sourceAddressPrefixes, serviceTag)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
expectedSecurityRules := []network.SecurityRule{}
|
expectedSecurityRules := []network.SecurityRule{}
|
||||||
|
|
||||||
|
|
|
@ -229,9 +229,7 @@ func (vm *VirtualMachine) GetAllAccessibleDatastores(ctx context.Context) ([]*Da
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
var dsRefList []types.ManagedObjectReference
|
var dsRefList []types.ManagedObjectReference
|
||||||
for _, dsRef := range hostSystemMo.Datastore {
|
dsRefList = append(dsRefList, hostSystemMo.Datastore...)
|
||||||
dsRefList = append(dsRefList, dsRef)
|
|
||||||
}
|
|
||||||
|
|
||||||
var dsMoList []mo.Datastore
|
var dsMoList []mo.Datastore
|
||||||
pc := property.DefaultCollector(vm.Client())
|
pc := property.DefaultCollector(vm.Client())
|
||||||
|
|
|
@ -113,9 +113,7 @@ func CreateTestClient() *fake.Clientset {
|
||||||
}
|
}
|
||||||
obj.Items = append(obj.Items, pod)
|
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
|
return true, obj, nil
|
||||||
})
|
})
|
||||||
fakeClient.AddReactor("create", "pods", func(action core.Action) (handled bool, ret runtime.Object, err error) {
|
fakeClient.AddReactor("create", "pods", func(action core.Action) (handled bool, ret runtime.Object, err error) {
|
||||||
|
|
|
@ -260,9 +260,7 @@ func asVersionedObjects(infos []*resource.Info, specifiedOutputVersion schema.Gr
|
||||||
gvks, _, err := scheme.Scheme.ObjectKinds(info.Object)
|
gvks, _, err := scheme.Scheme.ObjectKinds(info.Object)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
for _, gvk := range gvks {
|
for _, gvk := range gvks {
|
||||||
for _, version := range scheme.Scheme.PrioritizedVersionsForGroup(gvk.Group) {
|
targetVersions = append(targetVersions, scheme.Scheme.PrioritizedVersionsForGroup(gvk.Group)...)
|
||||||
targetVersions = append(targetVersions, version)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -144,7 +144,6 @@ go_library(
|
||||||
"//vendor/github.com/golang/groupcache/lru:go_default_library",
|
"//vendor/github.com/golang/groupcache/lru:go_default_library",
|
||||||
"//vendor/github.com/google/cadvisor/events: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/v1:go_default_library",
|
||||||
"//vendor/github.com/google/cadvisor/info/v2:go_default_library",
|
|
||||||
"//vendor/k8s.io/klog:go_default_library",
|
"//vendor/k8s.io/klog:go_default_library",
|
||||||
"//vendor/k8s.io/utils/exec:go_default_library",
|
"//vendor/k8s.io/utils/exec:go_default_library",
|
||||||
"//vendor/k8s.io/utils/integer:go_default_library",
|
"//vendor/k8s.io/utils/integer:go_default_library",
|
||||||
|
|
|
@ -314,9 +314,7 @@ func (s *podStorage) merge(source string, change interface{}) (adds, updates, de
|
||||||
}
|
}
|
||||||
case kubetypes.RESTORE:
|
case kubetypes.RESTORE:
|
||||||
klog.V(4).Infof("Restoring pods for source %s", source)
|
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:
|
default:
|
||||||
klog.Warningf("Received invalid update type: %v", update)
|
klog.Warningf("Received invalid update type: %v", update)
|
||||||
|
|
|
@ -32,7 +32,6 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
cadvisorapi "github.com/google/cadvisor/info/v1"
|
cadvisorapi "github.com/google/cadvisor/info/v1"
|
||||||
cadvisorapiv2 "github.com/google/cadvisor/info/v2"
|
|
||||||
"k8s.io/api/core/v1"
|
"k8s.io/api/core/v1"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/fields"
|
"k8s.io/apimachinery/pkg/fields"
|
||||||
|
@ -994,9 +993,6 @@ type Kubelet struct {
|
||||||
// Cached MachineInfo returned by cadvisor.
|
// Cached MachineInfo returned by cadvisor.
|
||||||
machineInfo *cadvisorapi.MachineInfo
|
machineInfo *cadvisorapi.MachineInfo
|
||||||
|
|
||||||
//Cached RootFsInfo returned by cadvisor
|
|
||||||
rootfsInfo *cadvisorapiv2.FsInfo
|
|
||||||
|
|
||||||
// Handles certificate rotations.
|
// Handles certificate rotations.
|
||||||
serverCertificateManager certificate.Manager
|
serverCertificateManager certificate.Manager
|
||||||
|
|
||||||
|
|
|
@ -507,9 +507,7 @@ func (udp *udpProxySocket) ProxyLoop(service ServicePortPortalName, myInfo *serv
|
||||||
ipconfigInterface := ipconfig.New(execer)
|
ipconfigInterface := ipconfig.New(execer)
|
||||||
suffixList, err := ipconfigInterface.GetDNSSuffixSearchList()
|
suffixList, err := ipconfigInterface.GetDNSSuffixSearchList()
|
||||||
if err == nil {
|
if err == nil {
|
||||||
for _, suffix := range suffixList {
|
dnsSearch = append(dnsSearch, suffixList...)
|
||||||
dnsSearch = append(dnsSearch, suffix)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -109,9 +109,7 @@ func getScopeSelectorsFromQuota(quota *corev1.ResourceQuota) []corev1.ScopedReso
|
||||||
Operator: corev1.ScopeSelectorOpExists})
|
Operator: corev1.ScopeSelectorOpExists})
|
||||||
}
|
}
|
||||||
if quota.Spec.ScopeSelector != nil {
|
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
|
return selectors
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue