Remove fail argument from ReadOrDie()
Every caller of ReadOrDie() specified ginkgo.Fail as fail argument, and that was intentional to avoid depending on Ginkgo. However that just spreaded the dependency on Ginkgo to caller sides. Especially that was unnecessary e2e test framework "ingress" depended on Ginkgo only for the above reason. Now we are cleaning up the dependencies on e2e tests, so let's just remove such dependencies.
This commit is contained in:
@@ -23,8 +23,6 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/runtime/serializer"
|
||||
"k8s.io/kubernetes/test/e2e/framework/testfiles"
|
||||
|
||||
"github.com/onsi/ginkgo"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -54,7 +52,7 @@ func NumberOfSampleResources(node *v1.Node) int64 {
|
||||
|
||||
// GetSampleDevicePluginPod returns the Device Plugin pod for sample resources in e2e tests
|
||||
func GetSampleDevicePluginPod() *v1.Pod {
|
||||
ds := ReadDaemonSetV1OrDie(testfiles.ReadOrDie(sampleDevicePluginDSYAML, ginkgo.Fail))
|
||||
ds := ReadDaemonSetV1OrDie(testfiles.ReadOrDie(sampleDevicePluginDSYAML))
|
||||
p := &v1.Pod{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: sampleDevicePluginName,
|
||||
|
Reference in New Issue
Block a user