chore: define common aliases for k8s packages (#8672)

* lchore: define common alias for k8s packages

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

* Update .golangci.yaml

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

* Update .golangci.yaml

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

* Update .golangci.yaml

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

---------

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

internal/hook/wait_exec_hook_handler.go

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/sirupsen/logrus"
-	v1 "k8s.io/api/core/v1"
+	corev1api "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/cache"
@@ -37,7 +37,7 @@ type WaitExecHookHandler interface {
 	HandleHooks(
 		ctx context.Context,
 		log logrus.FieldLogger,
-		pod *v1.Pod,
+		pod *corev1api.Pod,
 		byContainer map[string][]PodExecRestoreHook,
 		multiHookTracker *MultiHookTracker,
 		restoreName string,
@@ -73,7 +73,7 @@ var _ WaitExecHookHandler = &DefaultWaitExecHookHandler{}
 func (e *DefaultWaitExecHookHandler) HandleHooks(
 	ctx context.Context,
 	log logrus.FieldLogger,
-	pod *v1.Pod,
+	pod *corev1api.Pod,
 	byContainer map[string][]PodExecRestoreHook,
 	multiHookTracker *MultiHookTracker,
 	restoreName string,
@@ -117,7 +117,7 @@ func (e *DefaultWaitExecHookHandler) HandleHooks(
 	// When a container is observed running and its hooks are executed, the container is deleted
 	// from the byContainer map. When the map is empty the watch is ended.
 	handler := func(newObj any) {
-		newPod, ok := newObj.(*v1.Pod)
+		newPod, ok := newObj.(*corev1api.Pod)
 		if !ok {
 			return
 		}
@@ -128,7 +128,7 @@ func (e *DefaultWaitExecHookHandler) HandleHooks(
 			},
 		)
 
-		if newPod.Status.Phase == v1.PodSucceeded || newPod.Status.Phase == v1.PodFailed {
+		if newPod.Status.Phase == corev1api.PodSucceeded || newPod.Status.Phase == corev1api.PodFailed {
 			err := fmt.Errorf("pod entered phase %s before some post-restore exec hooks ran", newPod.Status.Phase)
 			podLog.Warning(err)
 			cancel()
@@ -265,7 +265,7 @@ func (e *DefaultWaitExecHookHandler) HandleHooks(
 	return errors
 }
 
-func podHasContainer(pod *v1.Pod, containerName string) bool {
+func podHasContainer(pod *corev1api.Pod, containerName string) bool {
 	if pod == nil {
 		return false
 	}
@@ -278,7 +278,7 @@ func podHasContainer(pod *v1.Pod, containerName string) bool {
 	return false
 }
 
-func isContainerUp(pod *v1.Pod, containerName string, hooks []PodExecRestoreHook) bool {
+func isContainerUp(pod *corev1api.Pod, containerName string, hooks []PodExecRestoreHook) bool {
 	if pod == nil {
 		return false
 	}

internal/hook/wait_exec_hook_handler_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-	v1 "k8s.io/api/core/v1"
+	corev1api "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -52,18 +52,18 @@ func TestWaitExecHandleHooks(t *testing.T) {
 	type change struct {
 		// delta to wait since last change applied or pod added
 		wait    time.Duration
-		updated *v1.Pod
+		updated *corev1api.Pod
 	}
 	type expectedExecution struct {
 		hook  *velerov1api.ExecHook
 		name  string
 		error error
-		pod   *v1.Pod
+		pod   *corev1api.Pod
 	}
 	tests := []struct {
 		name string
 		// Used as argument to HandleHooks and first state added to ListerWatcher
-		initialPod         *v1.Pod
+		initialPod         *corev1api.Pod
 		groupResource      string
 		byContainer        map[string][]PodExecRestoreHook
 		expectedExecutions []expectedExecution
@@ -83,13 +83,13 @@ func TestWaitExecHandleHooks(t *testing.T) {
 					podRestoreHookTimeoutAnnotationKey, "1s",
 					podRestoreHookWaitTimeoutAnnotationKey, "1m",
 				)).
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Running: &v1.ContainerStateRunning{},
+					State: corev1api.ContainerState{
+						Running: &corev1api.ContainerStateRunning{},
 					},
 				}).
 				Result(),
@@ -128,13 +128,13 @@ func TestWaitExecHandleHooks(t *testing.T) {
 							podRestoreHookTimeoutAnnotationKey, "1s",
 							podRestoreHookWaitTimeoutAnnotationKey, "1m",
 						)).
-						Containers(&v1.Container{
+						Containers(&corev1api.Container{
 							Name: "container1",
 						}).
-						ContainerStatuses(&v1.ContainerStatus{
+						ContainerStatuses(&corev1api.ContainerStatus{
 							Name: "container1",
-							State: v1.ContainerState{
-								Running: &v1.ContainerStateRunning{},
+							State: corev1api.ContainerState{
+								Running: &corev1api.ContainerStateRunning{},
 							},
 						}).
 						Result(),
@@ -152,13 +152,13 @@ func TestWaitExecHandleHooks(t *testing.T) {
 					podRestoreHookTimeoutAnnotationKey, "1s",
 					podRestoreHookWaitTimeoutAnnotationKey, "1m",
 				)).
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Running: &v1.ContainerStateRunning{},
+					State: corev1api.ContainerState{
+						Running: &corev1api.ContainerStateRunning{},
 					},
 				}).
 				Result(),
@@ -197,13 +197,13 @@ func TestWaitExecHandleHooks(t *testing.T) {
 							podRestoreHookTimeoutAnnotationKey, "1s",
 							podRestoreHookWaitTimeoutAnnotationKey, "1m",
 						)).
-						Containers(&v1.Container{
+						Containers(&corev1api.Container{
 							Name: "container1",
 						}).
-						ContainerStatuses(&v1.ContainerStatus{
+						ContainerStatuses(&corev1api.ContainerStatus{
 							Name: "container1",
-							State: v1.ContainerState{
-								Running: &v1.ContainerStateRunning{},
+							State: corev1api.ContainerState{
+								Running: &corev1api.ContainerStateRunning{},
 							},
 						}).
 						Result(),
@@ -221,13 +221,13 @@ func TestWaitExecHandleHooks(t *testing.T) {
 					podRestoreHookTimeoutAnnotationKey, "1s",
 					podRestoreHookWaitTimeoutAnnotationKey, "1m",
 				)).
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Running: &v1.ContainerStateRunning{},
+					State: corev1api.ContainerState{
+						Running: &corev1api.ContainerStateRunning{},
 					},
 				}).
 				Result(),
@@ -266,13 +266,13 @@ func TestWaitExecHandleHooks(t *testing.T) {
 							podRestoreHookTimeoutAnnotationKey, "1s",
 							podRestoreHookWaitTimeoutAnnotationKey, "1m",
 						)).
-						Containers(&v1.Container{
+						Containers(&corev1api.Container{
 							Name: "container1",
 						}).
-						ContainerStatuses(&v1.ContainerStatus{
+						ContainerStatuses(&corev1api.ContainerStatus{
 							Name: "container1",
-							State: v1.ContainerState{
-								Running: &v1.ContainerStateRunning{},
+							State: corev1api.ContainerState{
+								Running: &corev1api.ContainerStateRunning{},
 							},
 						}).
 						Result(),
@@ -290,13 +290,13 @@ func TestWaitExecHandleHooks(t *testing.T) {
 					podRestoreHookTimeoutAnnotationKey, "1s",
 					podRestoreHookWaitTimeoutAnnotationKey, "1m",
 				)).
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Waiting: &v1.ContainerStateWaiting{},
+					State: corev1api.ContainerState{
+						Waiting: &corev1api.ContainerStateWaiting{},
 					},
 				}).
 				Result(),
@@ -335,13 +335,13 @@ func TestWaitExecHandleHooks(t *testing.T) {
 							podRestoreHookTimeoutAnnotationKey, "1s",
 							podRestoreHookWaitTimeoutAnnotationKey, "1m",
 						)).
-						Containers(&v1.Container{
+						Containers(&corev1api.Container{
 							Name: "container1",
 						}).
-						ContainerStatuses(&v1.ContainerStatus{
+						ContainerStatuses(&corev1api.ContainerStatus{
 							Name: "container1",
-							State: v1.ContainerState{
-								Running: &v1.ContainerStateRunning{},
+							State: corev1api.ContainerState{
+								Running: &corev1api.ContainerStateRunning{},
 							},
 						}).
 						Result(),
@@ -359,13 +359,13 @@ func TestWaitExecHandleHooks(t *testing.T) {
 							podRestoreHookTimeoutAnnotationKey, "1s",
 							podRestoreHookWaitTimeoutAnnotationKey, "1m",
 						)).
-						Containers(&v1.Container{
+						Containers(&corev1api.Container{
 							Name: "container1",
 						}).
-						ContainerStatuses(&v1.ContainerStatus{
+						ContainerStatuses(&corev1api.ContainerStatus{
 							Name: "container1",
-							State: v1.ContainerState{
-								Running: &v1.ContainerStateRunning{},
+							State: corev1api.ContainerState{
+								Running: &corev1api.ContainerStateRunning{},
 							},
 						}).
 						Result(),
@@ -376,13 +376,13 @@ func TestWaitExecHandleHooks(t *testing.T) {
 			name:          "should return no error when hook from spec executes successfully",
 			groupResource: "pods",
 			initialPod: builder.ForPod("default", "my-pod").
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Running: &v1.ContainerStateRunning{},
+					State: corev1api.ContainerState{
+						Running: &corev1api.ContainerStateRunning{},
 					},
 				}).
 				Result(),
@@ -408,13 +408,13 @@ func TestWaitExecHandleHooks(t *testing.T) {
 					},
 					pod: builder.ForPod("default", "my-pod").
 						ObjectMeta(builder.WithResourceVersion("1")).
-						Containers(&v1.Container{
+						Containers(&corev1api.Container{
 							Name: "container1",
 						}).
-						ContainerStatuses(&v1.ContainerStatus{
+						ContainerStatuses(&corev1api.ContainerStatus{
 							Name: "container1",
-							State: v1.ContainerState{
-								Running: &v1.ContainerStateRunning{},
+							State: corev1api.ContainerState{
+								Running: &corev1api.ContainerStateRunning{},
 							},
 						}).
 						Result(),
@@ -425,13 +425,13 @@ func TestWaitExecHandleHooks(t *testing.T) {
 			name:          "should return error when spec hook with wait timeout expires with OnError mode Continue",
 			groupResource: "pods",
 			initialPod: builder.ForPod("default", "my-pod").
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Waiting: &v1.ContainerStateWaiting{},
+					State: corev1api.ContainerState{
+						Waiting: &corev1api.ContainerStateWaiting{},
 					},
 				}).
 				Result(),
@@ -456,13 +456,13 @@ func TestWaitExecHandleHooks(t *testing.T) {
 			name:          "should return an error when spec hook with wait timeout expires with OnError mode Fail",
 			groupResource: "pods",
 			initialPod: builder.ForPod("default", "my-pod").
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Waiting: &v1.ContainerStateWaiting{},
+					State: corev1api.ContainerState{
+						Waiting: &corev1api.ContainerStateWaiting{},
 					},
 				}).
 				Result(),
@@ -487,13 +487,13 @@ func TestWaitExecHandleHooks(t *testing.T) {
 			name:          "should return an error when shared hooks context is canceled before spec hook with OnError mode Fail executes",
 			groupResource: "pods",
 			initialPod: builder.ForPod("default", "my-pod").
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Waiting: &v1.ContainerStateWaiting{},
+					State: corev1api.ContainerState{
+						Waiting: &corev1api.ContainerStateWaiting{},
 					},
 				}).
 				Result(),
@@ -519,13 +519,13 @@ func TestWaitExecHandleHooks(t *testing.T) {
 			expectedErrors: []error{errors.New("hook my-hook-1 in container container1 in pod default/my-pod not executed: context deadline exceeded")},
 			groupResource:  "pods",
 			initialPod: builder.ForPod("default", "my-pod").
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Waiting: &v1.ContainerStateWaiting{},
+					State: corev1api.ContainerState{
+						Waiting: &corev1api.ContainerStateWaiting{},
 					},
 				}).
 				Result(),
@@ -549,23 +549,23 @@ func TestWaitExecHandleHooks(t *testing.T) {
 			name:          "should return no error with 2 spec hooks in 2 different containers, 1st container starts running after 10ms, 2nd container after 20ms, both succeed",
 			groupResource: "pods",
 			initialPod: builder.ForPod("default", "my-pod").
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container2",
 				}).
 				// initially both are waiting
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Waiting: &v1.ContainerStateWaiting{},
+					State: corev1api.ContainerState{
+						Waiting: &corev1api.ContainerStateWaiting{},
 					},
 				}).
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container2",
-					State: v1.ContainerState{
-						Waiting: &v1.ContainerStateWaiting{},
+					State: corev1api.ContainerState{
+						Waiting: &corev1api.ContainerStateWaiting{},
 					},
 				}).
 				Result(),
@@ -602,23 +602,23 @@ func TestWaitExecHandleHooks(t *testing.T) {
 					error: nil,
 					pod: builder.ForPod("default", "my-pod").
 						ObjectMeta(builder.WithResourceVersion("2")).
-						Containers(&v1.Container{
+						Containers(&corev1api.Container{
 							Name: "container1",
 						}).
-						Containers(&v1.Container{
+						Containers(&corev1api.Container{
 							Name: "container2",
 						}).
-						ContainerStatuses(&v1.ContainerStatus{
+						ContainerStatuses(&corev1api.ContainerStatus{
 							Name: "container1",
-							State: v1.ContainerState{
-								Running: &v1.ContainerStateRunning{},
+							State: corev1api.ContainerState{
+								Running: &corev1api.ContainerStateRunning{},
 							},
 						}).
 						// container 2 is still waiting when the first hook executes in container1
-						ContainerStatuses(&v1.ContainerStatus{
+						ContainerStatuses(&corev1api.ContainerStatus{
 							Name: "container2",
-							State: v1.ContainerState{
-								Waiting: &v1.ContainerStateWaiting{},
+							State: corev1api.ContainerState{
+								Waiting: &corev1api.ContainerStateWaiting{},
 							},
 						}).
 						Result(),
@@ -632,22 +632,22 @@ func TestWaitExecHandleHooks(t *testing.T) {
 					error: nil,
 					pod: builder.ForPod("default", "my-pod").
 						ObjectMeta(builder.WithResourceVersion("3")).
-						Containers(&v1.Container{
+						Containers(&corev1api.Container{
 							Name: "container1",
 						}).
-						Containers(&v1.Container{
+						Containers(&corev1api.Container{
 							Name: "container2",
 						}).
-						ContainerStatuses(&v1.ContainerStatus{
+						ContainerStatuses(&corev1api.ContainerStatus{
 							Name: "container1",
-							State: v1.ContainerState{
-								Running: &v1.ContainerStateRunning{},
+							State: corev1api.ContainerState{
+								Running: &corev1api.ContainerStateRunning{},
 							},
 						}).
-						ContainerStatuses(&v1.ContainerStatus{
+						ContainerStatuses(&corev1api.ContainerStatus{
 							Name: "container2",
-							State: v1.ContainerState{
-								Running: &v1.ContainerStateRunning{},
+							State: corev1api.ContainerState{
+								Running: &corev1api.ContainerStateRunning{},
 							},
 						}).
 						Result(),
@@ -659,22 +659,22 @@ func TestWaitExecHandleHooks(t *testing.T) {
 					wait: 10 * time.Millisecond,
 					updated: builder.ForPod("default", "my-pod").
 						ObjectMeta(builder.WithResourceVersion("2")).
-						Containers(&v1.Container{
+						Containers(&corev1api.Container{
 							Name: "container1",
 						}).
-						Containers(&v1.Container{
+						Containers(&corev1api.Container{
 							Name: "container2",
 						}).
-						ContainerStatuses(&v1.ContainerStatus{
+						ContainerStatuses(&corev1api.ContainerStatus{
 							Name: "container1",
-							State: v1.ContainerState{
-								Running: &v1.ContainerStateRunning{},
+							State: corev1api.ContainerState{
+								Running: &corev1api.ContainerStateRunning{},
 							},
 						}).
-						ContainerStatuses(&v1.ContainerStatus{
+						ContainerStatuses(&corev1api.ContainerStatus{
 							Name: "container2",
-							State: v1.ContainerState{
-								Waiting: &v1.ContainerStateWaiting{},
+							State: corev1api.ContainerState{
+								Waiting: &corev1api.ContainerStateWaiting{},
 							},
 						}).
 						Result(),
@@ -684,22 +684,22 @@ func TestWaitExecHandleHooks(t *testing.T) {
 					wait: 10 * time.Millisecond,
 					updated: builder.ForPod("default", "my-pod").
 						ObjectMeta(builder.WithResourceVersion("3")).
-						Containers(&v1.Container{
+						Containers(&corev1api.Container{
 							Name: "container1",
 						}).
-						Containers(&v1.Container{
+						Containers(&corev1api.Container{
 							Name: "container2",
 						}).
-						ContainerStatuses(&v1.ContainerStatus{
+						ContainerStatuses(&corev1api.ContainerStatus{
 							Name: "container1",
-							State: v1.ContainerState{
-								Running: &v1.ContainerStateRunning{},
+							State: corev1api.ContainerState{
+								Running: &corev1api.ContainerStateRunning{},
 							},
 						}).
-						ContainerStatuses(&v1.ContainerStatus{
+						ContainerStatuses(&corev1api.ContainerStatus{
 							Name: "container2",
-							State: v1.ContainerState{
-								Running: &v1.ContainerStateRunning{},
+							State: corev1api.ContainerState{
+								Running: &corev1api.ContainerStateRunning{},
 							},
 						}).
 						Result(),
@@ -758,7 +758,7 @@ func TestWaitExecHandleHooks(t *testing.T) {
 func TestPodHasContainer(t *testing.T) {
 	tests := []struct {
 		name      string
-		pod       *v1.Pod
+		pod       *corev1api.Pod
 		container string
 		expect    bool
 	}{
@@ -767,7 +767,7 @@ func TestPodHasContainer(t *testing.T) {
 			expect:    true,
 			container: "container1",
 			pod: builder.ForPod("default", "my-pod").
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
 				Result(),
@@ -777,7 +777,7 @@ func TestPodHasContainer(t *testing.T) {
 			expect:    false,
 			container: "container1",
 			pod: builder.ForPod("default", "my-pod").
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container2",
 				}).
 				Result(),
@@ -794,7 +794,7 @@ func TestPodHasContainer(t *testing.T) {
 func TestIsContainerUp(t *testing.T) {
 	tests := []struct {
 		name      string
-		pod       *v1.Pod
+		pod       *corev1api.Pod
 		container string
 		expect    bool
 		hooks     []PodExecRestoreHook
@@ -804,10 +804,10 @@ func TestIsContainerUp(t *testing.T) {
 			container: "container1",
 			expect:    true,
 			pod: builder.ForPod("default", "my-pod").
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Running: &v1.ContainerStateRunning{},
+					State: corev1api.ContainerState{
+						Running: &corev1api.ContainerStateRunning{},
 					},
 				}).
 				Result(),
@@ -818,10 +818,10 @@ func TestIsContainerUp(t *testing.T) {
 			container: "container1",
 			expect:    false,
 			pod: builder.ForPod("default", "my-pod").
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Running: &v1.ContainerStateRunning{},
+					State: corev1api.ContainerState{
+						Running: &corev1api.ContainerStateRunning{},
 					},
 					Ready: false,
 				}).
@@ -839,10 +839,10 @@ func TestIsContainerUp(t *testing.T) {
 			container: "container1",
 			expect:    true,
 			pod: builder.ForPod("default", "my-pod").
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Running: &v1.ContainerStateRunning{},
+					State: corev1api.ContainerState{
+						Running: &corev1api.ContainerStateRunning{},
 					},
 					Ready: true,
 				}).
@@ -860,9 +860,9 @@ func TestIsContainerUp(t *testing.T) {
 			container: "container1",
 			expect:    false,
 			pod: builder.ForPod("default", "my-pod").
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name:  "container1",
-					State: v1.ContainerState{},
+					State: corev1api.ContainerState{},
 				}).
 				Result(),
 			hooks: []PodExecRestoreHook{},
@@ -872,10 +872,10 @@ func TestIsContainerUp(t *testing.T) {
 			container: "container1",
 			expect:    false,
 			pod: builder.ForPod("default", "my-pod").
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Waiting: &v1.ContainerStateWaiting{},
+					State: corev1api.ContainerState{
+						Waiting: &corev1api.ContainerStateWaiting{},
 					},
 				}).
 				Result(),
@@ -886,16 +886,16 @@ func TestIsContainerUp(t *testing.T) {
 			container: "container1",
 			expect:    true,
 			pod: builder.ForPod("default", "my-pod").
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container0",
-					State: v1.ContainerState{
-						Terminated: &v1.ContainerStateTerminated{},
+					State: corev1api.ContainerState{
+						Terminated: &corev1api.ContainerStateTerminated{},
 					},
 				},
-					&v1.ContainerStatus{
+					&corev1api.ContainerStatus{
 						Name: "container1",
-						State: v1.ContainerState{
-							Running: &v1.ContainerStateRunning{},
+						State: corev1api.ContainerState{
+							Running: &corev1api.ContainerStateRunning{},
 						},
 					}).
 				Result(),
@@ -1003,7 +1003,7 @@ func TestRestoreHookTrackerUpdate(t *testing.T) {
 		hook  *velerov1api.ExecHook
 		name  string
 		error error
-		pod   *v1.Pod
+		pod   *corev1api.Pod
 	}
 
 	hookTracker1 := NewMultiHookTracker()
@@ -1021,7 +1021,7 @@ func TestRestoreHookTrackerUpdate(t *testing.T) {
 
 	tests1 := []struct {
 		name               string
-		initialPod         *v1.Pod
+		initialPod         *corev1api.Pod
 		groupResource      string
 		byContainer        map[string][]PodExecRestoreHook
 		expectedExecutions []expectedExecution
@@ -1038,13 +1038,13 @@ func TestRestoreHookTrackerUpdate(t *testing.T) {
 					podRestoreHookTimeoutAnnotationKey, "1s",
 					podRestoreHookWaitTimeoutAnnotationKey, "1m",
 				)).
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Running: &v1.ContainerStateRunning{},
+					State: corev1api.ContainerState{
+						Running: &corev1api.ContainerStateRunning{},
 					},
 				}).
 				Result(),
@@ -1083,13 +1083,13 @@ func TestRestoreHookTrackerUpdate(t *testing.T) {
 							podRestoreHookTimeoutAnnotationKey, "1s",
 							podRestoreHookWaitTimeoutAnnotationKey, "1m",
 						)).
-						Containers(&v1.Container{
+						Containers(&corev1api.Container{
 							Name: "container1",
 						}).
-						ContainerStatuses(&v1.ContainerStatus{
+						ContainerStatuses(&corev1api.ContainerStatus{
 							Name: "container1",
-							State: v1.ContainerState{
-								Running: &v1.ContainerStateRunning{},
+							State: corev1api.ContainerState{
+								Running: &corev1api.ContainerStateRunning{},
 							},
 						}).
 						Result(),
@@ -1102,13 +1102,13 @@ func TestRestoreHookTrackerUpdate(t *testing.T) {
 			name:          "a hook with OnError mode Fail failed to execute",
 			groupResource: "pods",
 			initialPod: builder.ForPod("default", "my-pod").
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Waiting: &v1.ContainerStateWaiting{},
+					State: corev1api.ContainerState{
+						Waiting: &corev1api.ContainerStateWaiting{},
 					},
 				}).
 				Result(),
@@ -1133,13 +1133,13 @@ func TestRestoreHookTrackerUpdate(t *testing.T) {
 			name:          "a hook with OnError mode Continue failed to execute",
 			groupResource: "pods",
 			initialPod: builder.ForPod("default", "my-pod").
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Waiting: &v1.ContainerStateWaiting{},
+					State: corev1api.ContainerState{
+						Waiting: &corev1api.ContainerStateWaiting{},
 					},
 				}).
 				Result(),
@@ -1164,23 +1164,23 @@ func TestRestoreHookTrackerUpdate(t *testing.T) {
 			name:          "two hooks with OnError mode Continue failed to execute",
 			groupResource: "pods",
 			initialPod: builder.ForPod("default", "my-pod").
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container2",
 				}).
 				// initially both are waiting
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Waiting: &v1.ContainerStateWaiting{},
+					State: corev1api.ContainerState{
+						Waiting: &corev1api.ContainerStateWaiting{},
 					},
 				}).
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container2",
-					State: v1.ContainerState{
-						Waiting: &v1.ContainerStateWaiting{},
+					State: corev1api.ContainerState{
+						Waiting: &corev1api.ContainerStateWaiting{},
 					},
 				}).
 				Result(),
@@ -1217,13 +1217,13 @@ func TestRestoreHookTrackerUpdate(t *testing.T) {
 			name:          "a hook was recorded before added to tracker",
 			groupResource: "pods",
 			initialPod: builder.ForPod("default", "my-pod").
-				Containers(&v1.Container{
+				Containers(&corev1api.Container{
 					Name: "container1",
 				}).
-				ContainerStatuses(&v1.ContainerStatus{
+				ContainerStatuses(&corev1api.ContainerStatus{
 					Name: "container1",
-					State: v1.ContainerState{
-						Waiting: &v1.ContainerStateWaiting{},
+					State: corev1api.ContainerState{
+						Waiting: &corev1api.ContainerStateWaiting{},
 					},
 				}).
 				Result(),