mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-09-30 19:55:36 +00:00
k8s 1.18 import (#2651)
* k8s 1.18 import wip backup, cmd, controller, generated, restic, restore, serverstatusrequest, test and util Signed-off-by: Andrew Lavery <laverya@umich.edu> * go mod tidy Signed-off-by: Andrew Lavery <laverya@umich.edu> * add changelog file Signed-off-by: Andrew Lavery <laverya@umich.edu> * go fmt Signed-off-by: Andrew Lavery <laverya@umich.edu> * update code-generator and controller-gen in CI Signed-off-by: Andrew Lavery <laverya@umich.edu> * checkout proper code-generator version, regen Signed-off-by: Andrew Lavery <laverya@umich.edu> * fix remaining calls Signed-off-by: Andrew Lavery <laverya@umich.edu> * regenerate CRDs with ./hack/update-generated-crd-code.sh Signed-off-by: Andrew Lavery <laverya@umich.edu> * use existing context in restic and server Signed-off-by: Andrew Lavery <laverya@umich.edu> * fix test cases by resetting resource version also use main library go context, not golang.org/x/net/context, in pkg/restore/restore.go Signed-off-by: Andrew Lavery <laverya@umich.edu> * clarify changelog message Signed-off-by: Andrew Lavery <laverya@umich.edu> * use github.com/kubernetes-csi/external-snapshotter/v2@v2.2.0-rc1 Signed-off-by: Andrew Lavery <laverya@umich.edu> * run 'go mod tidy' to remove old external-snapshotter version Signed-off-by: Andrew Lavery <laverya@umich.edu>
This commit is contained in:
@@ -17,6 +17,7 @@ limitations under the License.
|
||||
package serverstatusrequest
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sort"
|
||||
"testing"
|
||||
"time"
|
||||
@@ -161,7 +162,7 @@ func TestProcess(t *testing.T) {
|
||||
assert.EqualError(t, err, tc.expectedErrMsg)
|
||||
}
|
||||
|
||||
res, err := client.VeleroV1().ServerStatusRequests(tc.req.Namespace).Get(tc.req.Name, metav1.GetOptions{})
|
||||
res, err := client.VeleroV1().ServerStatusRequests(tc.req.Namespace).Get(context.TODO(), tc.req.Name, metav1.GetOptions{})
|
||||
if tc.expected == nil {
|
||||
assert.Nil(t, res)
|
||||
assert.True(t, apierrors.IsNotFound(err))
|
||||
|
||||
Reference in New Issue
Block a user