mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-21 02:41:25 +00:00
Merge pull request #86238 from SataQiu/fix-staticcheck-20191213
Fix staticcheck failures of test/e2e/manifest
This commit is contained in:
commit
32883e46d6
@ -65,7 +65,6 @@ test/e2e/apps
|
||||
test/e2e/autoscaling
|
||||
test/e2e/instrumentation/logging/stackdriver
|
||||
test/e2e/instrumentation/monitoring
|
||||
test/e2e/manifest
|
||||
test/images/agnhost/dns
|
||||
test/images/agnhost/inclusterclient
|
||||
test/images/agnhost/net/nat
|
||||
|
@ -166,6 +166,9 @@ func DaemonSetFromManifest(fileName, ns string) (*appsv1.DaemonSet, error) {
|
||||
func RoleFromManifest(fileName, ns string) (*rbacv1.Role, error) {
|
||||
var role rbacv1.Role
|
||||
data, err := testfiles.Read(fileName)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
json, err := utilyaml.ToJSON(data)
|
||||
if err != nil {
|
||||
|
Loading…
Reference in New Issue
Block a user