github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Add more //nolint:staticcheck for failures caught in PR tests

Browse Source
This commit is contained in:
Hanna Lee 2021-07-18 14:48:32 -04:00 committed by Antonio Ojea
parent c862d7c0e9
commit c8fde197f5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/volume/util/fsquota/quota_linux.go
View File

@ -305,7 +305,7 @@ func SupportsQuotas(m mount.Interface, path string) (bool, error) {
// If the pod UID is identical to another one known, it may (but presently // If the pod UID is identical to another one known, it may (but presently
// doesn't) choose the same quota ID as other volumes in the pod. // doesn't) choose the same quota ID as other volumes in the pod.
//lint:ignore SA4009 poduid is overwritten by design, see comment below //lint:ignore SA4009 poduid is overwritten by design, see comment below
func AssignQuota(m mount.Interface, path string, poduid types.UID, bytes *resource.Quantity) error { func AssignQuota(m mount.Interface, path string, poduid types.UID, bytes *resource.Quantity) error { //nolint:staticcheck
if bytes == nil { if bytes == nil {
return fmt.Errorf("attempting to assign null quota to %s", path) return fmt.Errorf("attempting to assign null quota to %s", path)
} }
@ -320,7 +320,7 @@ func AssignQuota(m mount.Interface, path string, poduid types.UID, bytes *resour
// volumes in a pod, we can simply remove this line of code. // volumes in a pod, we can simply remove this line of code.
// If and when we decide permanently that we're going to adopt // If and when we decide permanently that we're going to adopt
// one quota per volume, we can rip all of the pod code out. // one quota per volume, we can rip all of the pod code out.
poduid = types.UID(uuid.NewUUID()) poduid = types.UID(uuid.NewUUID()) //nolint:staticcheck
if pod, ok := dirPodMap[path]; ok && pod != poduid { if pod, ok := dirPodMap[path]; ok && pod != poduid {
return fmt.Errorf("requesting quota on existing directory %s but different pod %s %s", path, pod, poduid) return fmt.Errorf("requesting quota on existing directory %s but different pod %s %s", path, pod, poduid)
} }

6
test/integration/garbagecollector/garbage_collector_test.go
View File

@ -599,12 +599,12 @@ func setupRCsPods(t *testing.T, gc *garbagecollector.GarbageCollector, clientSet
orphan := false orphan := false
switch { switch {
//lint:file-ignore SA1019 Keep testing deprecated OrphanDependents option until it's being removed //lint:file-ignore SA1019 Keep testing deprecated OrphanDependents option until it's being removed
case options.OrphanDependents == nil && options.PropagationPolicy == nil && len(initialFinalizers) == 0: case options.OrphanDependents == nil && options.PropagationPolicy == nil && len(initialFinalizers) == 0: //nolint:staticcheck
// if there are no deletion options, the default policy for replication controllers is orphan // if there are no deletion options, the default policy for replication controllers is orphan
orphan = true orphan = true
case options.OrphanDependents != nil: case options.OrphanDependents != nil: //nolint:staticcheck
// if the deletion options explicitly specify whether to orphan, that controls // if the deletion options explicitly specify whether to orphan, that controls
orphan = *options.OrphanDependents orphan = *options.OrphanDependents //nolint:staticcheck
case options.PropagationPolicy != nil: case options.PropagationPolicy != nil:
// if the deletion options explicitly specify whether to orphan, that controls // if the deletion options explicitly specify whether to orphan, that controls
orphan = *options.PropagationPolicy == metav1.DeletePropagationOrphan orphan = *options.PropagationPolicy == metav1.DeletePropagationOrphan

2
test/integration/scheduler_perf/scheduler_perf_legacy_test.go
View File

@ -440,7 +440,7 @@ func benchmarkScheduling(numExistingPods, minPods int,
b *testing.B) { b *testing.B) {
if b.N < minPods { if b.N < minPods {
//lint:ignore SA3001 Set a minimum for b.N to get more meaningful results //lint:ignore SA3001 Set a minimum for b.N to get more meaningful results
b.N = minPods b.N = minPods //nolint:staticcheck
} }
finalFunc, podInformer, clientset, _ := mustSetupScheduler(nil) finalFunc, podInformer, clientset, _ := mustSetupScheduler(nil)
defer finalFunc() defer finalFunc()