github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fail earlier on discovery failures

Browse Source
This commit is contained in:
David Eads
2018-01-15 09:59:06 -05:00
parent 0b6b8cda6d
commit 49f12fa70f
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/integration/etcd/etcd_storage_path_test.go
View File

@@ -44,14 +44,11 @@ import (
"k8s.io/apiserver/pkg/storage/storagebackend"
clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/client-go/util/flowcontrol"
"k8s.io/kubernetes/cmd/kube-apiserver/app"
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
"k8s.io/kubernetes/pkg/api/legacyscheme"
kapi "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/test/integration/framework"
// install all APIs
@@ -798,9 +795,7 @@ func startRealMasterOrDie(t *testing.T, certDir string) (*allClient, clientv3.KV
t.Fatal(err)
}
mapper, _ := util.NewFactory(clientcmd.NewDefaultClientConfig(*clientcmdapi.NewConfig(), &clientcmd.ConfigOverrides{})).Object()
return client, kvClient, mapper
return client, kvClient, legacyscheme.Registry.RESTMapper()
}
func dumpEtcdKVOnFailure(t *testing.T, kvClient clientv3.KV) {