github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #86238 from SataQiu/fix-staticcheck-20191213

Browse Source 
Fix staticcheck failures of test/e2e/manifest
This commit is contained in:
Kubernetes Prow Robot 2019-12-15 11:07:37 -08:00 committed by GitHub
commit 32883e46d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.staticcheck_failures
View File

@ -65,7 +65,6 @@ test/e2e/apps
test/e2e/autoscaling test/e2e/autoscaling
test/e2e/instrumentation/logging/stackdriver test/e2e/instrumentation/logging/stackdriver
test/e2e/instrumentation/monitoring test/e2e/instrumentation/monitoring
test/e2e/manifest
test/images/agnhost/dns test/images/agnhost/dns
test/images/agnhost/inclusterclient test/images/agnhost/inclusterclient
test/images/agnhost/net/nat test/images/agnhost/net/nat

3
test/e2e/manifest/manifest.go
View File

@ -166,6 +166,9 @@ func DaemonSetFromManifest(fileName, ns string) (*appsv1.DaemonSet, error) {
func RoleFromManifest(fileName, ns string) (*rbacv1.Role, error) { func RoleFromManifest(fileName, ns string) (*rbacv1.Role, error) {
var role rbacv1.Role var role rbacv1.Role
data, err := testfiles.Read(fileName) data, err := testfiles.Read(fileName)
if err != nil {
return nil, err
}
json, err := utilyaml.ToJSON(data) json, err := utilyaml.ToJSON(data)
if err != nil { if err != nil {