mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 06:27:05 +00:00
Merge pull request #87457 from 928234269/fix_staticcheck03
fix static check errors in test/integration/etcd
This commit is contained in:
commit
4630690eae
@ -42,7 +42,6 @@ test/e2e/apps
|
||||
test/e2e/autoscaling
|
||||
test/e2e/instrumentation/logging/stackdriver
|
||||
test/integration/deployment
|
||||
test/integration/etcd
|
||||
test/integration/examples
|
||||
test/integration/framework
|
||||
test/integration/garbagecollector
|
||||
|
@ -135,10 +135,10 @@ func StartRealMasterOrDie(t *testing.T, configFuncs ...func(*options.ServerRunOp
|
||||
|
||||
prepared, err := kubeAPIServer.PrepareRun()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
t.Error(err)
|
||||
}
|
||||
if err := prepared.Run(stopCh); err != nil {
|
||||
t.Fatal(err)
|
||||
t.Error(err)
|
||||
}
|
||||
}()
|
||||
|
||||
@ -174,7 +174,7 @@ func StartRealMasterOrDie(t *testing.T, configFuncs ...func(*options.ServerRunOp
|
||||
restMapper := restmapper.NewDeferredDiscoveryRESTMapper(discoveryClient)
|
||||
restMapper.Reset()
|
||||
|
||||
serverResources, err := kubeClient.Discovery().ServerResources()
|
||||
_, serverResources, err := kubeClient.Discovery().ServerGroupsAndResources()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user