Move images func to reduce import impact to install pkg

Signed-off-by: Tiger Kaovilai <[email protected]>
vmware-tanzu · Sep 10, 2024 · cb1ea3b · cb1ea3b
1 parent 55d1b0b
commit cb1ea3b
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 9 deletions.
diff --git a/internal/velero/images.go → internal/velero/images/images.go b/internal/velero/images.go → internal/velero/images/images.go
diff --git a/internal/velero/images_test.go → internal/velero/images/images_test.go b/internal/velero/images_test.go → internal/velero/images/images_test.go
diff --git a/pkg/cmd/cli/install/install.go b/pkg/cmd/cli/install/install.go
@@ -30,7 +30,7 @@ import (
  "github.com/spf13/pflag"
  "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
- "github.com/vmware-tanzu/velero/internal/velero"
+ images "github.com/vmware-tanzu/velero/internal/velero/images"
  velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
  "github.com/vmware-tanzu/velero/pkg/client"
  "github.com/vmware-tanzu/velero/pkg/cmd"
@@ -167,7 +167,7 @@ func (o *Options) BindFlags(flags *pflag.FlagSet) {
 func NewInstallOptions() *Options {
  return &Options{
  Namespace: velerov1api.DefaultNamespace,
- Image: velero.DefaultVeleroImage(),
+ Image: images.DefaultVeleroImage(),
  BackupStorageConfig: flag.NewMap(),
  VolumeSnapshotConfig: flag.NewMap(),
  PodAnnotations: flag.NewMap(),

diff --git a/pkg/install/daemonset.go b/pkg/install/daemonset.go
@@ -24,12 +24,12 @@ import (
  corev1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
- "github.com/vmware-tanzu/velero/internal/velero"
+ images "github.com/vmware-tanzu/velero/internal/velero/images"
 )
 
 func DaemonSet(namespace string, opts ...podTemplateOption) *appsv1.DaemonSet {
  c := &podTemplateConfig{
- image: velero.DefaultVeleroImage(),
+ image: images.DefaultVeleroImage(),
  }
 
  for _, opt := range opts {

diff --git a/pkg/install/deployment.go b/pkg/install/deployment.go
@@ -25,7 +25,7 @@ import (
  corev1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
- "github.com/vmware-tanzu/velero/internal/velero"
+ images "github.com/vmware-tanzu/velero/internal/velero/images"
  "github.com/vmware-tanzu/velero/pkg/builder"
  "github.com/vmware-tanzu/velero/pkg/util/kube"
 )
@@ -195,7 +195,7 @@ func WithKeepLatestMaintenanceJobs(keepLatestMaintenanceJobs int) podTemplateOpt
 func Deployment(namespace string, opts ...podTemplateOption) *appsv1.Deployment {
  // TODO: Add support for server args
  c := &podTemplateConfig{
- image: velero.DefaultVeleroImage(),
+ image: images.DefaultVeleroImage(),
  }
 
  for _, opt := range opts {

diff --git a/pkg/install/install_test.go b/pkg/install/install_test.go
@@ -192,6 +192,5 @@ func TestPkgImportNoCloudProvider(t *testing.T) {
  }
  }
  }
- // TODO: expected to fail until #8145 rebase
  require.Empty(t, cloudProviderDeps)
 }
diff --git a/pkg/restore/actions/pod_volume_restore_action.go b/pkg/restore/actions/pod_volume_restore_action.go
@@ -29,7 +29,7 @@ import (
  corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
  ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 
- veleroimage "github.com/vmware-tanzu/velero/internal/velero"
+ veleroimage "github.com/vmware-tanzu/velero/internal/velero/images"
  velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
  "github.com/vmware-tanzu/velero/pkg/builder"
  "github.com/vmware-tanzu/velero/pkg/label"

diff --git a/pkg/restore/actions/pod_volume_restore_action_test.go b/pkg/restore/actions/pod_volume_restore_action_test.go
@@ -28,7 +28,7 @@ import (
  "k8s.io/apimachinery/pkg/runtime"
  "k8s.io/client-go/kubernetes/fake"
 
- veleroimage "github.com/vmware-tanzu/velero/internal/velero"
+ veleroimage "github.com/vmware-tanzu/velero/internal/velero/images"
  velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
  "github.com/vmware-tanzu/velero/pkg/builder"
  "github.com/vmware-tanzu/velero/pkg/buildinfo"