diff --git a/pkg/cloudprovider/providers/azure/azure_loadbalancer.go b/pkg/cloudprovider/providers/azure/azure_loadbalancer.go index 0121e8e7dc..8d4bc1e5be 100644 --- a/pkg/cloudprovider/providers/azure/azure_loadbalancer.go +++ b/pkg/cloudprovider/providers/azure/azure_loadbalancer.go @@ -1000,9 +1000,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, serviceTag) - } + sourceAddressPrefixes = append(sourceAddressPrefixes, serviceTags...) } expectedSecurityRules := []network.SecurityRule{} diff --git a/pkg/cloudprovider/providers/vsphere/vclib/virtualmachine.go b/pkg/cloudprovider/providers/vsphere/vclib/virtualmachine.go index 878822c32d..b6d2a7c094 100644 --- a/pkg/cloudprovider/providers/vsphere/vclib/virtualmachine.go +++ b/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, dsRef) - } + dsRefList = append(dsRefList, hostSystemMo.Datastore...) var dsMoList []mo.Datastore pc := property.DefaultCollector(vm.Client()) diff --git a/pkg/controller/volume/attachdetach/testing/testvolumespec.go b/pkg/controller/volume/attachdetach/testing/testvolumespec.go index 611bf09791..35479ff764 100644 --- a/pkg/controller/volume/attachdetach/testing/testvolumespec.go +++ b/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, pod) - } + obj.Items = append(obj.Items, extraPods.Items...) return true, obj, nil }) fakeClient.AddReactor("create", "pods", func(action core.Action) (handled bool, ret runtime.Object, err error) { diff --git a/pkg/kubectl/cmd/convert/convert.go b/pkg/kubectl/cmd/convert/convert.go index 506b736577..ad365c5d73 100644 --- a/pkg/kubectl/cmd/convert/convert.go +++ b/pkg/kubectl/cmd/convert/convert.go @@ -260,9 +260,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, version) - } + targetVersions = append(targetVersions, scheme.Scheme.PrioritizedVersionsForGroup(gvk.Group)...) } } } diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index 4f2779ed86..9361203456 100644 --- a/pkg/kubelet/BUILD +++ b/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", diff --git a/pkg/kubelet/config/config.go b/pkg/kubelet/config/config.go index 75d42e0e73..bf37b56ace 100644 --- a/pkg/kubelet/config/config.go +++ b/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, value) - } + restorePods = append(restorePods, update.Pods...) default: klog.Warningf("Received invalid update type: %v", update) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index bb00c21a94..6af911b43e 100644 --- a/pkg/kubelet/kubelet.go +++ b/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" @@ -994,9 +993,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 diff --git a/pkg/proxy/winuserspace/proxysocket.go b/pkg/proxy/winuserspace/proxysocket.go index c7c5691e3b..1ac1c76635 100644 --- a/pkg/proxy/winuserspace/proxysocket.go +++ b/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, suffix) - } + dnsSearch = append(dnsSearch, suffixList...) } } diff --git a/pkg/quota/v1/generic/evaluator.go b/pkg/quota/v1/generic/evaluator.go index 4e37717544..4c3dfdf4fa 100644 --- a/pkg/quota/v1/generic/evaluator.go +++ b/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, scopeSelector) - } + selectors = append(selectors, quota.Spec.ScopeSelector.MatchExpressions...) } return selectors }