update to k8s 1.17 deps and fix breaks (#2180)

* update to k8s 1.17 deps

Signed-off-by: Steve Kriss <krisss@vmware.com>
This commit is contained in:
Steve Kriss
2020-01-10 09:55:58 -07:00
committed by Carlisia Campos
parent 555e8ff2e3
commit 04d8b47d3e
496 changed files with 125423 additions and 71472 deletions

View File

@@ -1,5 +1,5 @@
/*
Copyright 2017 the Velero contributors.
Copyright 2017, 2020 the Velero contributors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -188,11 +188,10 @@ func TestExecutePodCommand(t *testing.T) {
podCommandExecutor.streamExecutorFactory = streamExecutorFactory
baseUrl, _ := url.Parse("https://some.server")
contentConfig := rest.ContentConfig{
GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"},
contentConfig := rest.ClientContentConfig{
GroupVersion: schema.GroupVersion{Group: "", Version: "v1"},
}
postRequest := rest.NewRequest(nil, "POST", baseUrl, "/api/v1", contentConfig, rest.Serializers{}, nil, nil, 0)
poster.On("Post").Return(postRequest)
poster.On("Post").Return(rest.NewRequestWithClient(baseUrl, "/api/v1", contentConfig, nil))
streamExecutor := &mockStreamExecutor{}
defer streamExecutor.AssertExpectations(t)