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

Merge pull request #94371 from bbyrne5/bmb-resourcequota-staticcheck-errorfix

Browse Source 
fix staticcheck errors in resourcequota
This commit is contained in:
Kubernetes Prow Robot 2020-09-03 03:41:41 -07:00 committed by GitHub
commit 8296643fad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.staticcheck_failures
View File

@ -1,7 +1,6 @@
cluster/images/etcd/migrate cluster/images/etcd/migrate
pkg/controller/podautoscaler pkg/controller/podautoscaler
pkg/controller/replicaset pkg/controller/replicaset
pkg/controller/resourcequota
pkg/volume/azure_dd pkg/volume/azure_dd
pkg/volume/testing pkg/volume/testing
test/e2e/autoscaling test/e2e/autoscaling

6
pkg/controller/resourcequota/resource_quota_controller_test.go
View File

@ -25,7 +25,7 @@ import (
"testing" "testing"
"time" "time"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
@ -807,7 +807,7 @@ func TestSyncResourceQuota(t *testing.T) {
} }
} }
if usage == nil { if usage == nil {
t.Errorf("test: %s,\nExpected update action usage, got none: actions:\n%v", testName, actions) t.Fatalf("test: %s,\nExpected update action usage, got none: actions:\n%v", testName, actions)
} }
// ensure usage is as expected // ensure usage is as expected
@ -1138,7 +1138,7 @@ func expectSyncNotBlocked(fakeDiscoveryClient *fakeServerResources, workerLock *
workerLockAcquired := make(chan struct{}) workerLockAcquired := make(chan struct{})
go func() { go func() {
workerLock.Lock() workerLock.Lock()
workerLock.Unlock() defer workerLock.Unlock()
close(workerLockAcquired) close(workerLockAcquired)
}() }()
select { select {