mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-05 15:47:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Field labels for Duration, Time, client.ObjectKey, KibishiiData, VeleroCLI2Version

Browse Source 
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
This commit is contained in:
Tiger Kaovilai
2023-04-16 12:34:28 -04:00
parent 65f99c1264
commit da0f5d5850
7 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/hook/item_hook_handler_test.go
+36 -36
View File
@@ -792,7 +792,7 @@ func TestGetPodExecRestoreHookFromAnnotations(t *testing.T) {
expected: &velerov1api.ExecRestoreHook{
Command: []string{"/usr/bin/foo"},
Container: "my-app",
ExecTimeout: metav1.Duration{0},
ExecTimeout: metav1.Duration{Duration: 0},
},
},
{
@@ -805,7 +805,7 @@ func TestGetPodExecRestoreHookFromAnnotations(t *testing.T) {
expected: &velerov1api.ExecRestoreHook{
Command: []string{"/usr/bin/foo"},
Container: "my-app",
ExecTimeout: metav1.Duration{0},
ExecTimeout: metav1.Duration{Duration: 0},
},
},
}
@@ -856,8 +856,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{time.Minute},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: time.Minute},
},
},
},
@@ -886,8 +886,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{time.Minute},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: time.Minute},
},
},
},
@@ -905,8 +905,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{time.Minute},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: time.Minute},
},
},
},
@@ -926,8 +926,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{time.Minute},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: time.Minute},
},
},
},
@@ -944,8 +944,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Exec: &velerov1api.ExecRestoreHook{
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{time.Minute},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: time.Minute},
},
},
},
@@ -965,8 +965,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{time.Minute},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: time.Minute},
},
},
},
@@ -984,8 +984,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container2",
Command: []string{"/usr/bin/bar"},
OnError: velerov1api.HookErrorModeFail,
ExecTimeout: metav1.Duration{time.Hour},
WaitTimeout: metav1.Duration{time.Hour},
ExecTimeout: metav1.Duration{Duration: time.Hour},
WaitTimeout: metav1.Duration{Duration: time.Hour},
},
},
},
@@ -1012,8 +1012,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{time.Minute},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: time.Minute},
},
},
},
@@ -1053,8 +1053,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{time.Minute},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: time.Minute},
},
},
},
@@ -1075,8 +1075,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeFail,
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{time.Minute},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: time.Minute},
},
},
{
@@ -1084,8 +1084,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container2",
Command: []string{"/usr/bin/baz"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second * 3},
WaitTimeout: metav1.Duration{time.Second * 3},
ExecTimeout: metav1.Duration{Duration: time.Second * 3},
WaitTimeout: metav1.Duration{Duration: time.Second * 3},
},
},
{
@@ -1093,8 +1093,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/bar"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second * 2},
WaitTimeout: metav1.Duration{time.Minute * 2},
ExecTimeout: metav1.Duration{Duration: time.Second * 2},
WaitTimeout: metav1.Duration{Duration: time.Minute * 2},
},
},
},
@@ -1108,8 +1108,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/aaa"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second * 4},
WaitTimeout: metav1.Duration{time.Minute * 4},
ExecTimeout: metav1.Duration{Duration: time.Second * 4},
WaitTimeout: metav1.Duration{Duration: time.Minute * 4},
},
},
},
@@ -1129,8 +1129,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeFail,
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{time.Minute},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: time.Minute},
},
},
{
@@ -1140,8 +1140,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/bar"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second * 2},
WaitTimeout: metav1.Duration{time.Minute * 2},
ExecTimeout: metav1.Duration{Duration: time.Second * 2},
WaitTimeout: metav1.Duration{Duration: time.Minute * 2},
},
},
{
@@ -1151,8 +1151,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/aaa"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second * 4},
WaitTimeout: metav1.Duration{time.Minute * 4},
ExecTimeout: metav1.Duration{Duration: time.Second * 4},
WaitTimeout: metav1.Duration{Duration: time.Minute * 4},
},
},
},
@@ -1164,8 +1164,8 @@ func TestGroupRestoreExecHooks(t *testing.T) {
Container: "container2",
Command: []string{"/usr/bin/baz"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second * 3},
WaitTimeout: metav1.Duration{time.Second * 3},
ExecTimeout: metav1.Duration{Duration: time.Second * 3},
WaitTimeout: metav1.Duration{Duration: time.Second * 3},
},
},
},
internal/hook/wait_exec_hook_handler_test.go
+24 -24
View File
@@ -102,8 +102,8 @@ func TestWaitExecHandleHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{time.Minute},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: time.Minute},
},
},
},
@@ -115,7 +115,7 @@ func TestWaitExecHandleHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeContinue,
Timeout: metav1.Duration{time.Second},
Timeout: metav1.Duration{Duration: time.Second},
},
error: nil,
pod: builder.ForPod("default", "my-pod").
@@ -171,8 +171,8 @@ func TestWaitExecHandleHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeFail,
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{time.Minute},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: time.Minute},
},
},
},
@@ -184,7 +184,7 @@ func TestWaitExecHandleHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeFail,
Timeout: metav1.Duration{time.Second},
Timeout: metav1.Duration{Duration: time.Second},
},
error: errors.New("pod hook error"),
pod: builder.ForPod("default", "my-pod").
@@ -240,8 +240,8 @@ func TestWaitExecHandleHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{time.Minute},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: time.Minute},
},
},
},
@@ -253,7 +253,7 @@ func TestWaitExecHandleHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeContinue,
Timeout: metav1.Duration{time.Second},
Timeout: metav1.Duration{Duration: time.Second},
},
error: errors.New("pod hook error"),
pod: builder.ForPod("default", "my-pod").
@@ -309,8 +309,8 @@ func TestWaitExecHandleHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeContinue,
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{time.Minute},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: time.Minute},
},
},
},
@@ -322,7 +322,7 @@ func TestWaitExecHandleHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeContinue,
Timeout: metav1.Duration{time.Second},
Timeout: metav1.Duration{Duration: time.Second},
},
error: nil,
pod: builder.ForPod("default", "my-pod").
@@ -444,7 +444,7 @@ func TestWaitExecHandleHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeContinue,
WaitTimeout: metav1.Duration{time.Millisecond},
WaitTimeout: metav1.Duration{Duration: time.Millisecond},
},
},
},
@@ -475,7 +475,7 @@ func TestWaitExecHandleHooks(t *testing.T) {
Container: "container1",
Command: []string{"/usr/bin/foo"},
OnError: velerov1api.HookErrorModeFail,
WaitTimeout: metav1.Duration{time.Millisecond},
WaitTimeout: metav1.Duration{Duration: time.Millisecond},
},
},
},
@@ -878,13 +878,13 @@ func TestMaxHookWait(t *testing.T) {
"container1": {
{
Hook: velerov1api.ExecRestoreHook{
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{0},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: 0},
},
},
{
Hook: velerov1api.ExecRestoreHook{
WaitTimeout: metav1.Duration{-1},
WaitTimeout: metav1.Duration{Duration: -1},
},
},
},
@@ -897,24 +897,24 @@ func TestMaxHookWait(t *testing.T) {
"container1": {
{
Hook: velerov1api.ExecRestoreHook{
WaitTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{Duration: time.Second},
},
},
{
Hook: velerov1api.ExecRestoreHook{
WaitTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{Duration: time.Second},
},
},
},
"container2": {
{
Hook: velerov1api.ExecRestoreHook{
WaitTimeout: metav1.Duration{time.Hour},
WaitTimeout: metav1.Duration{Duration: time.Hour},
},
},
{
Hook: velerov1api.ExecRestoreHook{
WaitTimeout: metav1.Duration{time.Minute},
WaitTimeout: metav1.Duration{Duration: time.Minute},
},
},
},
@@ -927,13 +927,13 @@ func TestMaxHookWait(t *testing.T) {
"container1": {
{
Hook: velerov1api.ExecRestoreHook{
ExecTimeout: metav1.Duration{time.Second},
WaitTimeout: metav1.Duration{time.Second},
ExecTimeout: metav1.Duration{Duration: time.Second},
WaitTimeout: metav1.Duration{Duration: time.Second},
},
},
{
Hook: velerov1api.ExecRestoreHook{
WaitTimeout: metav1.Duration{0},
WaitTimeout: metav1.Duration{Duration: 0},
},
},
},
pkg/controller/backup_controller_test.go
+1 -1
View File
@@ -725,7 +725,7 @@ func TestProcessBackupCompletions(t *testing.T) {
Phase: velerov1api.BackupPhaseFinalizing,
Version: 1,
FormatVersion: "1.1.0",
Expiration: &metav1.Time{now.Add(10 * time.Minute)},
Expiration: &metav1.Time{Time: now.Add(10 * time.Minute)},
StartTimestamp: &timestamp,
},
},
pkg/controller/backup_repository_controller_test.go
+4 -4
View File
@@ -54,7 +54,7 @@ func mockBackupRepositoryCR() *velerov1api.BackupRepository {
Name: "repo",
},
Spec: velerov1api.BackupRepositorySpec{
MaintenanceFrequency: metav1.Duration{testMaintenanceFrequency},
MaintenanceFrequency: metav1.Duration{Duration: testMaintenanceFrequency},
},
}
@@ -153,7 +153,7 @@ func TestBackupRepoReconcile(t *testing.T) {
Name: "unknown",
},
Spec: velerov1api.BackupRepositorySpec{
MaintenanceFrequency: metav1.Duration{testMaintenanceFrequency},
MaintenanceFrequency: metav1.Duration{Duration: testMaintenanceFrequency},
},
},
expectNil: true,
@@ -166,7 +166,7 @@ func TestBackupRepoReconcile(t *testing.T) {
Name: "repo",
},
Spec: velerov1api.BackupRepositorySpec{
MaintenanceFrequency: metav1.Duration{testMaintenanceFrequency},
MaintenanceFrequency: metav1.Duration{Duration: testMaintenanceFrequency},
},
},
expectNil: true,
@@ -179,7 +179,7 @@ func TestBackupRepoReconcile(t *testing.T) {
Name: "repo",
},
Spec: velerov1api.BackupRepositorySpec{
MaintenanceFrequency: metav1.Duration{testMaintenanceFrequency},
MaintenanceFrequency: metav1.Duration{Duration: testMaintenanceFrequency},
},
Status: velerov1api.BackupRepositoryStatus{
Phase: velerov1api.BackupRepositoryPhaseNew,
pkg/repository/manager.go
+1 -1
View File
@@ -247,7 +247,7 @@ func (m *manager) getRepositoryProvider(repo *velerov1api.BackupRepository) (pro
func (m *manager) assembleRepoParam(repo *velerov1api.BackupRepository) (provider.RepoParam, error) {
bsl := &velerov1api.BackupStorageLocation{}
if err := m.client.Get(context.Background(), client.ObjectKey{m.namespace, repo.Spec.BackupStorageLocation}, bsl); err != nil {
if err := m.client.Get(context.Background(), client.ObjectKey{Namespace: m.namespace, Name: repo.Spec.BackupStorageLocation}, bsl); err != nil {
return provider.RepoParam{}, errors.WithStack(err)
}
return provider.RepoParam{
test/e2e/basic/namespace-mapping.go
+1 -1
View File
@@ -33,7 +33,7 @@ func (n *NamespaceMapping) Init() error {
n.Client = *n.VeleroCfg.ClientToInstallVelero
n.VeleroCfg.UseVolumeSnapshots = n.UseVolumeSnapshots
n.VeleroCfg.UseNodeAgent = !n.UseVolumeSnapshots
n.kibishiiData = &KibishiiData{2, 10, 10, 1024, 1024, 0, 2}
n.kibishiiData = &KibishiiData{Levels: 2, DirsPerLevel: 10, FilesPerLevel: 10, FileLength: 1024, BlockSize: 1024, PassNum: 0, ExpectedNodes: 2}
backupType := "restic"
if n.UseVolumeSnapshots {
backupType = "snapshot"
test/e2e/util/velero/velero_utils.go
+1 -1
View File
@@ -1092,7 +1092,7 @@ func GetVersionList(veleroCli, veleroVersion string) []VeleroCLI2Version {
for _, veleroVersion := range veleroVersionList {
veleroCLI2VersionList = append(veleroCLI2VersionList,
VeleroCLI2Version{veleroVersion, ""})
VeleroCLI2Version{VeleroVersion: veleroVersion, VeleroCLI: ""})
}
for i, veleroCli := range veleroCliList {
if i == len(veleroVersionList)-1 {