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

Merge pull request #9098 from Lyndon-Li/bump-up-kopia-0.21.1

Browse Source 
Bump up Kopia to v0.21.1
This commit is contained in:
lyndon-li
2025-07-23 15:03:32 +08:00
committed by GitHub
parent 8ce513ca07 34f8b73507
commit 48033b2e3b
106 changed files with 804 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/cmd/cli/backup/create_test.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package backup
import (
"context"
"fmt"
"strconv"
"strings"
@@ -139,7 +138,7 @@ func TestCreateOptions_BuildBackupFromSchedule(t *testing.T) {
expectedBackupSpec := builder.ForBackup("test", cmdtest.VeleroNameSpace).IncludedNamespaces("test").Result().Spec
schedule := builder.ForSchedule(cmdtest.VeleroNameSpace, "test").Template(expectedBackupSpec).ObjectMeta(builder.WithLabels("velero.io/test", "true"), builder.WithAnnotations("velero.io/test", "true")).Result()
o.client.Create(context.TODO(), schedule, &kbclient.CreateOptions{})
o.client.Create(t.Context(), schedule, &kbclient.CreateOptions{})
t.Run("existing schedule", func(t *testing.T) {
backup, err := o.BuildBackup(cmdtest.VeleroNameSpace)
@@ -391,7 +390,7 @@ func TestCreateCommand(t *testing.T) {
kbclient := velerotest.NewFakeControllerRuntimeClient(t).(kbclient.WithWatch)
schedule := builder.ForSchedule(cmdtest.VeleroNameSpace, fromSchedule).Result()
kbclient.Create(context.Background(), schedule, &controllerclient.CreateOptions{})
kbclient.Create(t.Context(), schedule, &controllerclient.CreateOptions{})
f.On("Namespace").Return(cmdtest.VeleroNameSpace)
f.On("KubebuilderWatchClient").Return(kbclient, nil)

5
pkg/cmd/cli/backup/delete_test.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package backup
import (
"context"
"fmt"
"os"
"os/exec"
@@ -43,8 +42,8 @@ func TestDeleteCommand(t *testing.T) {
f := &factorymocks.Factory{}
client := velerotest.NewFakeControllerRuntimeClient(t)
client.Create(context.Background(), builder.ForBackup(cmdtest.VeleroNameSpace, backup1).Result(), &controllerclient.CreateOptions{})
client.Create(context.Background(), builder.ForBackup("default", backup2).Result(), &controllerclient.CreateOptions{})
client.Create(t.Context(), builder.ForBackup(cmdtest.VeleroNameSpace, backup1).Result(), &controllerclient.CreateOptions{})
client.Create(t.Context(), builder.ForBackup("default", backup2).Result(), &controllerclient.CreateOptions{})
f.On("KubebuilderClient").Return(client, nil)
f.On("Namespace").Return(cmdtest.VeleroNameSpace)

3
pkg/cmd/cli/backup/describe_test.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package backup
import (
"context"
"fmt"
"os"
"os/exec"
@@ -44,7 +43,7 @@ func TestNewDescribeCommand(t *testing.T) {
clientConfig := rest.Config{}
kbClient := test.NewFakeControllerRuntimeClient(t)
kbClient.Create(context.Background(), testBackup, &controllerclient.CreateOptions{})
kbClient.Create(t.Context(), testBackup, &controllerclient.CreateOptions{})
f.On("ClientConfig").Return(&clientConfig, nil)
f.On("Namespace").Return(cmdtest.VeleroNameSpace)

5
pkg/cmd/cli/backup/download_test.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package backup
import (
"context"
"fmt"
"os"
"os/exec"
@@ -41,9 +40,9 @@ func TestNewDownloadCommand(t *testing.T) {
backupName := "backup-1"
kbclient := velerotest.NewFakeControllerRuntimeClient(t)
err := kbclient.Create(context.Background(), builder.ForBackup(cmdtest.VeleroNameSpace, backupName).Result())
err := kbclient.Create(t.Context(), builder.ForBackup(cmdtest.VeleroNameSpace, backupName).Result())
require.NoError(t, err)
err = kbclient.Create(context.Background(), builder.ForBackup(cmdtest.VeleroNameSpace, "bk-to-be-download").Result())
err = kbclient.Create(t.Context(), builder.ForBackup(cmdtest.VeleroNameSpace, "bk-to-be-download").Result())
require.NoError(t, err)
f.On("Namespace").Return(cmdtest.VeleroNameSpace)

3
pkg/cmd/cli/backup/get_test.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package backup
import (
"context"
"fmt"
"os"
"os/exec"
@@ -45,7 +44,7 @@ func TestNewGetCommand(t *testing.T) {
for _, backupName := range args {
backup := builder.ForBackup(cmdtest.VeleroNameSpace, backupName).ObjectMeta(builder.WithLabels("abc", "abc")).Result()
err := client.Create(context.Background(), backup, &kbclient.CreateOptions{})
err := client.Create(t.Context(), backup, &kbclient.CreateOptions{})
require.NoError(t, err)
}

5
pkg/cmd/cli/backup/logs_test.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package backup
import (
"context"
"fmt"
"strconv"
"testing"
@@ -62,7 +61,7 @@ func TestNewLogsCommand(t *testing.T) {
kbClient := velerotest.NewFakeControllerRuntimeClient(t)
backup := builder.ForBackup(cmdtest.VeleroNameSpace, backupName).Result()
err := kbClient.Create(context.Background(), backup, &kbclient.CreateOptions{})
err := kbClient.Create(t.Context(), backup, &kbclient.CreateOptions{})
require.NoError(t, err)
f.On("Namespace").Return(cmdtest.VeleroNameSpace)
@@ -117,7 +116,7 @@ func TestNewLogsCommand(t *testing.T) {
kbClient := velerotest.NewFakeControllerRuntimeClient(t)
backup := builder.ForBackup(cmdtest.VeleroNameSpace, backupName).Phase(velerov1api.BackupPhaseCompleted).Result()
err := kbClient.Create(context.Background(), backup, &kbclient.CreateOptions{})
err := kbClient.Create(t.Context(), backup, &kbclient.CreateOptions{})
require.NoError(t, err)
f.On("Namespace").Return(cmdtest.VeleroNameSpace)

2
pkg/cmd/cli/nodeagent/server_test.go
View File

@@ -108,7 +108,7 @@ func Test_validatePodVolumesHostPath(t *testing.T) {
kubeClient := fake.NewSimpleClientset()
for _, pod := range tt.pods {
_, err := kubeClient.CoreV1().Pods(pod.GetNamespace()).Create(context.TODO(), pod, metav1.CreateOptions{})
_, err := kubeClient.CoreV1().Pods(pod.GetNamespace()).Create(t.Context(), pod, metav1.CreateOptions{})
if err != nil {
t.Error(err)
}

5
pkg/cmd/cli/restore/create_test.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package restore
import (
"context"
"testing"
"time"
@@ -157,9 +156,9 @@ func TestCreateCommand(t *testing.T) {
kbclient := velerotest.NewFakeControllerRuntimeClient(t).(kbclient.WithWatch)
schedule := builder.ForSchedule(cmdtest.VeleroNameSpace, fromSchedule).Result()
require.NoError(t, kbclient.Create(context.Background(), schedule, &controllerclient.CreateOptions{}))
require.NoError(t, kbclient.Create(t.Context(), schedule, &controllerclient.CreateOptions{}))
backup := builder.ForBackup(cmdtest.VeleroNameSpace, "test-backup").FromSchedule(schedule).Phase(velerov1api.BackupPhaseCompleted).Result()
require.NoError(t, kbclient.Create(context.Background(), backup, &controllerclient.CreateOptions{}))
require.NoError(t, kbclient.Create(t.Context(), backup, &controllerclient.CreateOptions{}))
f.On("Namespace").Return(cmdtest.VeleroNameSpace)
f.On("KubebuilderWatchClient").Return(kbclient, nil)

5
pkg/cmd/cli/restore/delete_test.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package restore
import (
"context"
"fmt"
"os"
"os/exec"
@@ -43,8 +42,8 @@ func TestDeleteCommand(t *testing.T) {
f := &factorymocks.Factory{}
client := velerotest.NewFakeControllerRuntimeClient(t)
client.Create(context.Background(), builder.ForRestore(cmdtest.VeleroNameSpace, restore1).Result(), &controllerclient.CreateOptions{})
client.Create(context.Background(), builder.ForRestore("default", restore2).Result(), &controllerclient.CreateOptions{})
client.Create(t.Context(), builder.ForRestore(cmdtest.VeleroNameSpace, restore1).Result(), &controllerclient.CreateOptions{})
client.Create(t.Context(), builder.ForRestore("default", restore2).Result(), &controllerclient.CreateOptions{})
f.On("KubebuilderClient").Return(client, nil)
f.On("Namespace").Return(cmdtest.VeleroNameSpace)

3
pkg/cmd/cli/restore/describe_test.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package restore
import (
"context"
"fmt"
"os"
"os/exec"
@@ -44,7 +43,7 @@ func TestNewDescribeCommand(t *testing.T) {
clientConfig := rest.Config{}
kbClient := test.NewFakeControllerRuntimeClient(t)
kbClient.Create(context.Background(), testRestore, &controllerclient.CreateOptions{})
kbClient.Create(t.Context(), testRestore, &controllerclient.CreateOptions{})
f.On("ClientConfig").Return(&clientConfig, nil)
f.On("Namespace").Return(cmdtest.VeleroNameSpace)

3
pkg/cmd/cli/restore/get_test.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package restore
import (
"context"
"fmt"
"os"
"os/exec"
@@ -44,7 +43,7 @@ func TestNewGetCommand(t *testing.T) {
for _, restoreName := range args {
restore := builder.ForRestore(cmdtest.VeleroNameSpace, restoreName).ObjectMeta(builder.WithLabels("abc", "abc")).Result()
err := client.Create(context.Background(), restore, &kbclient.CreateOptions{})
err := client.Create(t.Context(), restore, &kbclient.CreateOptions{})
require.NoError(t, err)
}

23
pkg/cmd/server/server_test.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package server
import (
"context"
"errors"
"testing"
@@ -334,14 +333,14 @@ func Test_markInProgressBackupsFailed(t *testing.T) {
},
}).
Build()
markInProgressBackupsFailed(context.Background(), c, "velero", logrus.New())
markInProgressBackupsFailed(t.Context(), c, "velero", logrus.New())
backup01 := &velerov1api.Backup{}
require.NoError(t, c.Get(context.Background(), client.ObjectKey{Namespace: "velero", Name: "backup01"}, backup01))
require.NoError(t, c.Get(t.Context(), client.ObjectKey{Namespace: "velero", Name: "backup01"}, backup01))
assert.Equal(t, velerov1api.BackupPhaseFailed, backup01.Status.Phase)
backup02 := &velerov1api.Backup{}
require.NoError(t, c.Get(context.Background(), client.ObjectKey{Namespace: "velero", Name: "backup02"}, backup02))
require.NoError(t, c.Get(t.Context(), client.ObjectKey{Namespace: "velero", Name: "backup02"}, backup02))
assert.Equal(t, velerov1api.BackupPhaseCompleted, backup02.Status.Phase)
}
@@ -374,14 +373,14 @@ func Test_markInProgressRestoresFailed(t *testing.T) {
},
}).
Build()
markInProgressRestoresFailed(context.Background(), c, "velero", logrus.New())
markInProgressRestoresFailed(t.Context(), c, "velero", logrus.New())
restore01 := &velerov1api.Restore{}
require.NoError(t, c.Get(context.Background(), client.ObjectKey{Namespace: "velero", Name: "restore01"}, restore01))
require.NoError(t, c.Get(t.Context(), client.ObjectKey{Namespace: "velero", Name: "restore01"}, restore01))
assert.Equal(t, velerov1api.RestorePhaseFailed, restore01.Status.Phase)
restore02 := &velerov1api.Restore{}
require.NoError(t, c.Get(context.Background(), client.ObjectKey{Namespace: "velero", Name: "restore02"}, restore02))
require.NoError(t, c.Get(t.Context(), client.ObjectKey{Namespace: "velero", Name: "restore02"}, restore02))
assert.Equal(t, velerov1api.RestorePhaseCompleted, restore02.Status.Phase)
}
@@ -408,22 +407,22 @@ func Test_setDefaultBackupLocation(t *testing.T) {
},
}).
Build()
setDefaultBackupLocation(context.Background(), c, "velero", "default", logrus.New())
setDefaultBackupLocation(t.Context(), c, "velero", "default", logrus.New())
defaultLocation := &velerov1api.BackupStorageLocation{}
require.NoError(t, c.Get(context.Background(), client.ObjectKey{Namespace: "velero", Name: "default"}, defaultLocation))
require.NoError(t, c.Get(t.Context(), client.ObjectKey{Namespace: "velero", Name: "default"}, defaultLocation))
assert.True(t, defaultLocation.Spec.Default)
nonDefaultLocation := &velerov1api.BackupStorageLocation{}
require.NoError(t, c.Get(context.Background(), client.ObjectKey{Namespace: "velero", Name: "non-default"}, nonDefaultLocation))
require.NoError(t, c.Get(t.Context(), client.ObjectKey{Namespace: "velero", Name: "non-default"}, nonDefaultLocation))
assert.False(t, nonDefaultLocation.Spec.Default)
// no default location specified
c = fake.NewClientBuilder().WithScheme(scheme).Build()
err := setDefaultBackupLocation(context.Background(), c, "velero", "", logrus.New())
err := setDefaultBackupLocation(t.Context(), c, "velero", "", logrus.New())
require.NoError(t, err)
// no default location created
err = setDefaultBackupLocation(context.Background(), c, "velero", "default", logrus.New())
err = setDefaultBackupLocation(t.Context(), c, "velero", "default", logrus.New())
assert.NoError(t, err)
}