vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updates for org move to vmware-tanzu (#1920) 

* update import paths to github.com/vmware-tanzu/...

Signed-off-by: Steve Kriss <krisss@vmware.com>

* update other GH org refs to vmware-tanzu

Signed-off-by: Steve Kriss <krisss@vmware.com>

* site and docs: update GH org to vmware-tanzu

Signed-off-by: Steve Kriss <krisss@vmware.com>

* update travis badge links on docs readmes

Signed-off-by: Steve Kriss <krisss@vmware.com>
pull/1922/head
Steve Kriss 2019-09-30 15:26:56 -06:00 committed by Nolan Brubaker
parent d96186473c
commit 48792ece1f
348 changed files with 1059 additions and 1059 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.goreleaser.yml
View File

@ -41,7 +41,7 @@ builds:
- goos: windows - goos: windows
goarch: ppc64le goarch: ppc64le
ldflags: ldflags:
- -X "github.com/heptio/velero/pkg/buildinfo.Version={{ .Tag }}" -X "github.com/heptio/velero/pkg/buildinfo.GitSHA={{ .FullCommit }}" -X "github.com/heptio/velero/pkg/buildinfo.GitTreeState={{ .Env.GIT_TREE_STATE }}" - -X "github.com/vmware-tanzu/velero/pkg/buildinfo.Version={{ .Tag }}" -X "github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA={{ .FullCommit }}" -X "github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState={{ .Env.GIT_TREE_STATE }}"
archives: archives:
- name_template: "{{ .ProjectName }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}" - name_template: "{{ .ProjectName }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}"
wrap_in_directory: true wrap_in_directory: true
@ -52,7 +52,7 @@ checksum:
name_template: 'CHECKSUM' name_template: 'CHECKSUM'
release: release:
github: github:
owner: heptio owner: vmware-tanzu
name: velero name: velero
draft: true draft: true
prerelease: auto prerelease: auto

2
.travis.yml
View File

@ -27,5 +27,5 @@ deploy:
skip_cleanup: true skip_cleanup: true
script: hack/gcr-push.sh script: hack/gcr-push.sh
on: on:
repo: heptio/velero repo: vmware-tanzu/velero
all_branches: true all_branches: true

24
CHANGELOG.md
View File

@ -17,15 +17,15 @@
* [CHANGELOG-0.3.md][1] * [CHANGELOG-0.3.md][1]
[11]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-1.1.md [11]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-1.1.md
[10]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-1.0.md [10]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-1.0.md
[9]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.11.md [9]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.11.md
[8]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.10.md [8]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.10.md
[7]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.9.md [7]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.9.md
[6]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.8.md [6]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.8.md
[5]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.7.md [5]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.7.md
[4]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.6.md [4]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.6.md
[3]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.5.md [3]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.5.md
[2]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.4.md [2]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.4.md
[1]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.3.md [1]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.3.md
[0]: https://github.com/heptio/velero/blob/master/changelogs/unreleased [0]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/unreleased

2
Makefile
View File

@ -18,7 +18,7 @@
BIN ?= velero BIN ?= velero
# This repo's root import path (under GOPATH). # This repo's root import path (under GOPATH).
PKG := github.com/heptio/velero PKG := github.com/vmware-tanzu/velero
# Where to push the docker image. # Where to push the docker image.
REGISTRY ?= gcr.io/heptio-images REGISTRY ?= gcr.io/heptio-images

8
README.md
View File

@ -42,10 +42,10 @@ If you are ready to jump in and test, add code, or help with documentation, foll
See [the list of releases][6] to find out about feature changes. See [the list of releases][6] to find out about feature changes.
[1]: https://travis-ci.org/heptio/velero.svg?branch=master [1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=master
[2]: https://travis-ci.org/heptio/velero [2]: https://travis-ci.org/vmware-tanzu/velero
[4]: https://github.com/heptio/velero/issues [4]: https://github.com/vmware-tanzu/velero/issues
[6]: https://github.com/heptio/velero/releases [6]: https://github.com/vmware-tanzu/velero/releases
[9]: https://kubernetes.io/docs/setup/ [9]: https://kubernetes.io/docs/setup/
[10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos
[11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1

4
cmd/velero/main.go
View File

@ -22,8 +22,8 @@ import (
"k8s.io/klog" "k8s.io/klog"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/velero" "github.com/vmware-tanzu/velero/pkg/cmd/velero"
) )
func main() { func main() {

4
hack/gen-docs.sh
View File

@ -67,7 +67,7 @@ rm site/_data/$NEW_DOCS_TOC.yml && cp site/_data/master-toc.yml site/_data/$NEW_
if [[ $(uname) == "Darwin" ]]; then if [[ $(uname) == "Darwin" ]]; then
echo "[OS X] updating version-specific links" echo "[OS X] updating version-specific links"
find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i '' "s|https://velero.io/docs/master|https://velero.io/docs/$NEW_DOCS_VERSION|g" find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i '' "s|https://velero.io/docs/master|https://velero.io/docs/$NEW_DOCS_VERSION|g"
find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i '' "s|https://github.com/heptio/velero/blob/master|https://github.com/heptio/velero/blob/$NEW_DOCS_VERSION|g" find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i '' "s|https://github.com/vmware-tanzu/velero/blob/master|https://github.com/vmware-tanzu/velero/blob/$NEW_DOCS_VERSION|g"
echo "[OS X] Updating latest version in _config.yml" echo "[OS X] Updating latest version in _config.yml"
sed -i '' "s/latest: ${PREVIOUS_DOCS_VERSION}/latest: ${NEW_DOCS_VERSION}/" site/_config.yml sed -i '' "s/latest: ${PREVIOUS_DOCS_VERSION}/latest: ${NEW_DOCS_VERSION}/" site/_config.yml
@ -87,7 +87,7 @@ ${NEW_DOCS_VERSION}: ${NEW_DOCS_TOC}
else else
echo "[Linux] updating version-specific links" echo "[Linux] updating version-specific links"
find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i'' "s|https://velero.io/docs/master|https://velero.io/docs/$NEW_DOCS_VERSION|g" find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i'' "s|https://velero.io/docs/master|https://velero.io/docs/$NEW_DOCS_VERSION|g"
find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i'' "s|https://github.com/heptio/velero/blob/master|https://github.com/heptio/velero/blob/$NEW_DOCS_VERSION|g" find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i'' "s|https://github.com/vmware-tanzu/velero/blob/master|https://github.com/vmware-tanzu/velero/blob/$NEW_DOCS_VERSION|g"
echo "[Linux] Updating latest version in _config.yml" echo "[Linux] Updating latest version in _config.yml"
sed -i'' "s/latest: ${PREVIOUS_DOCS_VERSION}/latest: ${NEW_DOCS_VERSION}/" site/_config.yml sed -i'' "s/latest: ${PREVIOUS_DOCS_VERSION}/latest: ${NEW_DOCS_VERSION}/" site/_config.yml

2
hack/issue-template-gen/main.go
View File

@ -24,7 +24,7 @@ import (
"os" "os"
"text/template" "text/template"
"github.com/heptio/velero/pkg/cmd/cli/bug" "github.com/vmware-tanzu/velero/pkg/cmd/cli/bug"
) )
func main() { func main() {

2
hack/update-fmt.sh
View File

@ -50,7 +50,7 @@ fi
echo "${ACTION} goimports" echo "${ACTION} goimports"
for file in ${files}; do for file in ${files}; do
output=$(goimports "${MODE}" -local github.com/heptio/velero "${file}") output=$(goimports "${MODE}" -local github.com/vmware-tanzu/velero "${file}")
if [[ -n "${output}" ]]; then if [[ -n "${output}" ]]; then
VERIFY_IMPORTS_FAILED=1 VERIFY_IMPORTS_FAILED=1
echo "${output}" echo "${output}"

6
hack/update-generated-crd-code.sh
View File

@ -35,10 +35,10 @@ fi
${GOPATH}/src/k8s.io/code-generator/generate-groups.sh \ ${GOPATH}/src/k8s.io/code-generator/generate-groups.sh \
all \ all \
github.com/heptio/velero/pkg/generated \ github.com/vmware-tanzu/velero/pkg/generated \
github.com/heptio/velero/pkg/apis \ github.com/vmware-tanzu/velero/pkg/apis \
"velero:v1" \ "velero:v1" \
--go-header-file ${GOPATH}/src/github.com/heptio/velero/hack/boilerplate.go.txt \ --go-header-file ${GOPATH}/src/github.com/vmware-tanzu/velero/hack/boilerplate.go.txt \
$@ $@
go run ${GOPATH}/src/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go \ go run ${GOPATH}/src/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go \

2
pkg/archive/extractor.go
View File

@ -24,7 +24,7 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/heptio/velero/pkg/util/filesystem" "github.com/vmware-tanzu/velero/pkg/util/filesystem"
) )
// Extractor unzips/extracts a backup tarball to a local // Extractor unzips/extracts a backup tarball to a local

4
pkg/archive/parser.go
View File

@ -23,8 +23,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/util/filesystem" "github.com/vmware-tanzu/velero/pkg/util/filesystem"
) )
// Parser traverses an extracted archive on disk to validate // Parser traverses an extracted archive on disk to validate

2
pkg/archive/parser_test.go
View File

@ -24,7 +24,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/heptio/velero/pkg/test" "github.com/vmware-tanzu/velero/pkg/test"
) )
func TestParse(t *testing.T) { func TestParse(t *testing.T) {

14
pkg/backup/backup.go
View File

@ -31,13 +31,13 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
api "github.com/heptio/velero/pkg/apis/velero/v1" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/discovery" "github.com/vmware-tanzu/velero/pkg/discovery"
"github.com/heptio/velero/pkg/plugin/velero" "github.com/vmware-tanzu/velero/pkg/plugin/velero"
"github.com/heptio/velero/pkg/podexec" "github.com/vmware-tanzu/velero/pkg/podexec"
"github.com/heptio/velero/pkg/restic" "github.com/vmware-tanzu/velero/pkg/restic"
"github.com/heptio/velero/pkg/util/collections" "github.com/vmware-tanzu/velero/pkg/util/collections"
) )
// BackupVersion is the current backup version for Velero. // BackupVersion is the current backup version for Velero.

6
pkg/backup/backup_pv_action.go
View File

@ -22,9 +22,9 @@ import (
corev1api "k8s.io/api/core/v1" corev1api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
v1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/kuberesource" "github.com/vmware-tanzu/velero/pkg/kuberesource"
"github.com/heptio/velero/pkg/plugin/velero" "github.com/vmware-tanzu/velero/pkg/plugin/velero"
) )
// PVCAction inspects a PersistentVolumeClaim for the PersistentVolume // PVCAction inspects a PersistentVolumeClaim for the PersistentVolume

8
pkg/backup/backup_pv_action_test.go
View File

@ -24,10 +24,10 @@ import (
corev1api "k8s.io/api/core/v1" corev1api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
v1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/kuberesource" "github.com/vmware-tanzu/velero/pkg/kuberesource"
"github.com/heptio/velero/pkg/plugin/velero" "github.com/vmware-tanzu/velero/pkg/plugin/velero"
velerotest "github.com/heptio/velero/pkg/test" velerotest "github.com/vmware-tanzu/velero/pkg/test"
) )
func TestBackupPVAction(t *testing.T) { func TestBackupPVAction(t *testing.T) {

24
pkg/backup/backup_test.go
View File

@ -40,17 +40,17 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/builder" "github.com/vmware-tanzu/velero/pkg/builder"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/discovery" "github.com/vmware-tanzu/velero/pkg/discovery"
"github.com/heptio/velero/pkg/kuberesource" "github.com/vmware-tanzu/velero/pkg/kuberesource"
"github.com/heptio/velero/pkg/plugin/velero" "github.com/vmware-tanzu/velero/pkg/plugin/velero"
"github.com/heptio/velero/pkg/restic" "github.com/vmware-tanzu/velero/pkg/restic"
"github.com/heptio/velero/pkg/test" "github.com/vmware-tanzu/velero/pkg/test"
testutil "github.com/heptio/velero/pkg/test" testutil "github.com/vmware-tanzu/velero/pkg/test"
kubeutil "github.com/heptio/velero/pkg/util/kube" kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube"
"github.com/heptio/velero/pkg/volume" "github.com/vmware-tanzu/velero/pkg/volume"
) )
func TestBackedUpItemsMatchesTarballContents(t *testing.T) { func TestBackedUpItemsMatchesTarballContents(t *testing.T) {
@ -663,7 +663,7 @@ func TestBackupResourceCohabitation(t *testing.T) {
// TestBackupUsesNewCohabitatingResourcesForEachBackup ensures that when two backups are // TestBackupUsesNewCohabitatingResourcesForEachBackup ensures that when two backups are
// run that each include cohabitating resources, one copy of the relevant resources is // run that each include cohabitating resources, one copy of the relevant resources is
// backed up in each backup. Verification is done by looking at the contents of the backup // backed up in each backup. Verification is done by looking at the contents of the backup
// tarball. This covers a specific issue that was fixed by https://github.com/heptio/velero/pull/485. // tarball. This covers a specific issue that was fixed by https://github.com/vmware-tanzu/velero/pull/485.
func TestBackupUsesNewCohabitatingResourcesForEachBackup(t *testing.T) { func TestBackupUsesNewCohabitatingResourcesForEachBackup(t *testing.T) {
h := newHarness(t) h := newHarness(t)

4
pkg/backup/delete_helpers.go
View File

@ -21,8 +21,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/heptio/velero/pkg/apis/velero/v1" "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/label" "github.com/vmware-tanzu/velero/pkg/label"
) )
// NewDeleteBackupRequest creates a DeleteBackupRequest for the backup identified by name and uid. // NewDeleteBackupRequest creates a DeleteBackupRequest for the backup identified by name and uid.

8
pkg/backup/group_backupper.go
View File

@ -25,10 +25,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/discovery" "github.com/vmware-tanzu/velero/pkg/discovery"
"github.com/heptio/velero/pkg/podexec" "github.com/vmware-tanzu/velero/pkg/podexec"
"github.com/heptio/velero/pkg/restic" "github.com/vmware-tanzu/velero/pkg/restic"
) )
type groupBackupperFactory interface { type groupBackupperFactory interface {

18
pkg/backup/item_backupper.go
View File

@ -33,15 +33,15 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
kubeerrs "k8s.io/apimachinery/pkg/util/errors" kubeerrs "k8s.io/apimachinery/pkg/util/errors"
api "github.com/heptio/velero/pkg/apis/velero/v1" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/discovery" "github.com/vmware-tanzu/velero/pkg/discovery"
"github.com/heptio/velero/pkg/kuberesource" "github.com/vmware-tanzu/velero/pkg/kuberesource"
"github.com/heptio/velero/pkg/plugin/velero" "github.com/vmware-tanzu/velero/pkg/plugin/velero"
"github.com/heptio/velero/pkg/podexec" "github.com/vmware-tanzu/velero/pkg/podexec"
"github.com/heptio/velero/pkg/restic" "github.com/vmware-tanzu/velero/pkg/restic"
"github.com/heptio/velero/pkg/volume" "github.com/vmware-tanzu/velero/pkg/volume"
) )
type itemBackupperFactory interface { type itemBackupperFactory interface {

2
pkg/backup/item_backupper_test.go
View File

@ -24,7 +24,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"github.com/heptio/velero/pkg/builder" "github.com/vmware-tanzu/velero/pkg/builder"
) )
func Test_resourceKey(t *testing.T) { func Test_resourceKey(t *testing.T) {

8
pkg/backup/item_hook_handler.go
View File

@ -29,10 +29,10 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
api "github.com/heptio/velero/pkg/apis/velero/v1" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/kuberesource" "github.com/vmware-tanzu/velero/pkg/kuberesource"
"github.com/heptio/velero/pkg/podexec" "github.com/vmware-tanzu/velero/pkg/podexec"
"github.com/heptio/velero/pkg/util/collections" "github.com/vmware-tanzu/velero/pkg/util/collections"
) )
type hookPhase string type hookPhase string

6
pkg/backup/item_hook_handler_test.go
View File

@ -31,9 +31,9 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
v1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
velerotest "github.com/heptio/velero/pkg/test" velerotest "github.com/vmware-tanzu/velero/pkg/test"
"github.com/heptio/velero/pkg/util/collections" "github.com/vmware-tanzu/velero/pkg/util/collections"
) )
type mockItemHookHandler struct { type mockItemHookHandler struct {

4
pkg/backup/mocks/item_action.go
View File

@ -20,8 +20,8 @@ import (
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
v1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/plugin/velero" "github.com/vmware-tanzu/velero/pkg/plugin/velero"
) )
// ItemAction is an autogenerated mock type for the ItemAction type // ItemAction is an autogenerated mock type for the ItemAction type

6
pkg/backup/pod_action.go
View File

@ -22,9 +22,9 @@ import (
corev1api "k8s.io/api/core/v1" corev1api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
v1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/kuberesource" "github.com/vmware-tanzu/velero/pkg/kuberesource"
"github.com/heptio/velero/pkg/plugin/velero" "github.com/vmware-tanzu/velero/pkg/plugin/velero"
) )
// PodAction implements ItemAction. // PodAction implements ItemAction.

6
pkg/backup/pod_action_test.go
View File

@ -23,9 +23,9 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"github.com/heptio/velero/pkg/kuberesource" "github.com/vmware-tanzu/velero/pkg/kuberesource"
"github.com/heptio/velero/pkg/plugin/velero" "github.com/vmware-tanzu/velero/pkg/plugin/velero"
velerotest "github.com/heptio/velero/pkg/test" velerotest "github.com/vmware-tanzu/velero/pkg/test"
) )
func TestPodActionAppliesTo(t *testing.T) { func TestPodActionAppliesTo(t *testing.T) {

6
pkg/backup/request.go
View File

@ -20,9 +20,9 @@ import (
"fmt" "fmt"
"sort" "sort"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/util/collections" "github.com/vmware-tanzu/velero/pkg/util/collections"
"github.com/heptio/velero/pkg/volume" "github.com/vmware-tanzu/velero/pkg/volume"
) )
type itemKey struct { type itemKey struct {

12
pkg/backup/resource_backupper.go
View File

@ -26,12 +26,12 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
kubeerrs "k8s.io/apimachinery/pkg/util/errors" kubeerrs "k8s.io/apimachinery/pkg/util/errors"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/discovery" "github.com/vmware-tanzu/velero/pkg/discovery"
"github.com/heptio/velero/pkg/kuberesource" "github.com/vmware-tanzu/velero/pkg/kuberesource"
"github.com/heptio/velero/pkg/podexec" "github.com/vmware-tanzu/velero/pkg/podexec"
"github.com/heptio/velero/pkg/restic" "github.com/vmware-tanzu/velero/pkg/restic"
"github.com/heptio/velero/pkg/util/collections" "github.com/vmware-tanzu/velero/pkg/util/collections"
) )
type resourceBackupperFactory interface { type resourceBackupperFactory interface {

8
pkg/backup/service_account_action.go
View File

@ -25,10 +25,10 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
v1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
velerodiscovery "github.com/heptio/velero/pkg/discovery" velerodiscovery "github.com/vmware-tanzu/velero/pkg/discovery"
"github.com/heptio/velero/pkg/kuberesource" "github.com/vmware-tanzu/velero/pkg/kuberesource"
"github.com/heptio/velero/pkg/plugin/velero" "github.com/vmware-tanzu/velero/pkg/plugin/velero"
) )
// ServiceAccountAction implements ItemAction. // ServiceAccountAction implements ItemAction.

6
pkg/backup/service_account_action_test.go
View File

@ -28,9 +28,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"github.com/heptio/velero/pkg/kuberesource" "github.com/vmware-tanzu/velero/pkg/kuberesource"
"github.com/heptio/velero/pkg/plugin/velero" "github.com/vmware-tanzu/velero/pkg/plugin/velero"
velerotest "github.com/heptio/velero/pkg/test" velerotest "github.com/vmware-tanzu/velero/pkg/test"
) )
func newV1ClusterRoleBindingList(rbacCRBList []rbac.ClusterRoleBinding) []ClusterRoleBinding { func newV1ClusterRoleBindingList(rbacCRBList []rbac.ClusterRoleBinding) []ClusterRoleBinding {

2
pkg/builder/backup_builder.go
View File

@ -21,7 +21,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
) )
/* /*

2
pkg/builder/backup_storage_location_builder.go
View File

@ -19,7 +19,7 @@ package builder
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
) )
// BackupStorageLocationBuilder builds BackupStorageLocation objects. // BackupStorageLocationBuilder builds BackupStorageLocation objects.

2
pkg/builder/pod_volume_backup_builder.go
View File

@ -19,7 +19,7 @@ package builder
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
) )
// PodVolumeBackupBuilder builds PodVolumeBackup objects // PodVolumeBackupBuilder builds PodVolumeBackup objects

2
pkg/builder/restore_builder.go
View File

@ -19,7 +19,7 @@ package builder
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
) )
// RestoreBuilder builds Restore objects. // RestoreBuilder builds Restore objects.

2
pkg/builder/schedule_builder.go
View File

@ -21,7 +21,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
) )
// ScheduleBuilder builds Schedule objects. // ScheduleBuilder builds Schedule objects.

2
pkg/builder/server_status_request_builder.go
View File

@ -21,7 +21,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
) )
// ServerStatusRequestBuilder builds ServerStatusRequest objects. // ServerStatusRequestBuilder builds ServerStatusRequest objects.

2
pkg/builder/volume_snapshot_location_builder.go
View File

@ -19,7 +19,7 @@ package builder
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
) )
// VolumeSnapshotLocationBuilder builds VolumeSnapshotLocation objects. // VolumeSnapshotLocationBuilder builds VolumeSnapshotLocation objects.

2
pkg/client/client.go
View File

@ -24,7 +24,7 @@ import (
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
"github.com/heptio/velero/pkg/buildinfo" "github.com/vmware-tanzu/velero/pkg/buildinfo"
) )
// Config returns a *rest.Config, using either the kubeconfig (if specified) or an in-cluster // Config returns a *rest.Config, using either the kubeconfig (if specified) or an in-cluster

4
pkg/client/factory.go
View File

@ -25,8 +25,8 @@ import (
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
v1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
clientset "github.com/heptio/velero/pkg/generated/clientset/versioned" clientset "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned"
) )
// Factory knows how to create a VeleroClient and Kubernetes client. // Factory knows how to create a VeleroClient and Kubernetes client.

4
pkg/cloudprovider/aws/object_store.go
View File

@ -32,7 +32,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/heptio/velero/pkg/cloudprovider" "github.com/vmware-tanzu/velero/pkg/cloudprovider"
) )
const ( const (
@ -311,7 +311,7 @@ func (o *ObjectStore) ListObjects(bucket, prefix string) ([]string, error) {
// ensure that returned objects are in a consistent order so that the deletion logic deletes the objects before // ensure that returned objects are in a consistent order so that the deletion logic deletes the objects before
// the pseudo-folder prefix object for s3 providers (such as Quobyte) that return the pseudo-folder as an object. // the pseudo-folder prefix object for s3 providers (such as Quobyte) that return the pseudo-folder as an object.
// See https://github.com/heptio/velero/pull/999 // See https://github.com/vmware-tanzu/velero/pull/999
sort.Sort(sort.Reverse(sort.StringSlice(ret))) sort.Sort(sort.Reverse(sort.StringSlice(ret)))
return ret, nil return ret, nil

2
pkg/cloudprovider/aws/object_store_test.go
View File

@ -28,7 +28,7 @@ import (
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/heptio/velero/pkg/test" "github.com/vmware-tanzu/velero/pkg/test"
) )
func TestIsValidSignatureVersion(t *testing.T) { func TestIsValidSignatureVersion(t *testing.T) {

2
pkg/cloudprovider/aws/volume_snapshotter.go
View File

@ -33,7 +33,7 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"github.com/heptio/velero/pkg/cloudprovider" "github.com/vmware-tanzu/velero/pkg/cloudprovider"
) )
const regionKey = "region" const regionKey = "region"

2
pkg/cloudprovider/azure/object_store.go
View File

@ -30,7 +30,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/heptio/velero/pkg/cloudprovider" "github.com/vmware-tanzu/velero/pkg/cloudprovider"
) )
const ( const (

2
pkg/cloudprovider/azure/volume_snapshotter.go
View File

@ -35,7 +35,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"github.com/heptio/velero/pkg/cloudprovider" "github.com/vmware-tanzu/velero/pkg/cloudprovider"
) )
const ( const (

2
pkg/cloudprovider/gcp/object_store.go
View File

@ -30,7 +30,7 @@ import (
"google.golang.org/api/iterator" "google.golang.org/api/iterator"
"google.golang.org/api/option" "google.golang.org/api/option"
"github.com/heptio/velero/pkg/cloudprovider" "github.com/vmware-tanzu/velero/pkg/cloudprovider"
) )
const ( const (

2
pkg/cloudprovider/gcp/object_store_test.go
View File

@ -25,7 +25,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
velerotest "github.com/heptio/velero/pkg/test" velerotest "github.com/vmware-tanzu/velero/pkg/test"
) )
type mockWriteCloser struct { type mockWriteCloser struct {

2
pkg/cloudprovider/gcp/volume_snapshotter.go
View File

@ -34,7 +34,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"github.com/heptio/velero/pkg/cloudprovider" "github.com/vmware-tanzu/velero/pkg/cloudprovider"
) )
const ( const (

2
pkg/cloudprovider/gcp/volume_snapshotter_test.go
View File

@ -27,7 +27,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
velerotest "github.com/heptio/velero/pkg/test" velerotest "github.com/vmware-tanzu/velero/pkg/test"
) )
func TestGetVolumeID(t *testing.T) { func TestGetVolumeID(t *testing.T) {

2
pkg/cmd/cli/backup/backup.go
View File

@ -19,7 +19,7 @@ package backup
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
) )
func NewCommand(f client.Factory) *cobra.Command { func NewCommand(f client.Factory) *cobra.Command {

16
pkg/cmd/cli/backup/create.go
View File

@ -25,14 +25,14 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/builder" "github.com/vmware-tanzu/velero/pkg/builder"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/flag" "github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
veleroclient "github.com/heptio/velero/pkg/generated/clientset/versioned" veleroclient "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned"
v1 "github.com/heptio/velero/pkg/generated/informers/externalversions/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/generated/informers/externalversions/velero/v1"
) )
const DefaultBackupTTL time.Duration = 30 * 24 * time.Hour const DefaultBackupTTL time.Duration = 30 * 24 * time.Hour

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

@ -22,9 +22,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/builder" "github.com/vmware-tanzu/velero/pkg/builder"
"github.com/heptio/velero/pkg/generated/clientset/versioned/fake" "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned/fake"
) )
const testNamespace = "velero" const testNamespace = "velero"

10
pkg/cmd/cli/backup/delete.go
View File

@ -25,11 +25,11 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
kubeerrs "k8s.io/apimachinery/pkg/util/errors" kubeerrs "k8s.io/apimachinery/pkg/util/errors"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/backup" "github.com/vmware-tanzu/velero/pkg/backup"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/cli" "github.com/vmware-tanzu/velero/pkg/cmd/cli"
) )
// NewDeleteCommand creates a new command that deletes a backup. // NewDeleteCommand creates a new command that deletes a backup.

12
pkg/cmd/cli/backup/describe.go
View File

@ -23,12 +23,12 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
pkgbackup "github.com/heptio/velero/pkg/backup" pkgbackup "github.com/vmware-tanzu/velero/pkg/backup"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
"github.com/heptio/velero/pkg/restic" "github.com/vmware-tanzu/velero/pkg/restic"
) )
func NewDescribeCommand(f client.Factory, use string) *cobra.Command { func NewDescribeCommand(f client.Factory, use string) *cobra.Command {

8
pkg/cmd/cli/backup/download.go
View File

@ -27,10 +27,10 @@ import (
"github.com/spf13/pflag" "github.com/spf13/pflag"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/downloadrequest" "github.com/vmware-tanzu/velero/pkg/cmd/util/downloadrequest"
) )
func NewDownloadCommand(f client.Factory) *cobra.Command { func NewDownloadCommand(f client.Factory) *cobra.Command {

8
pkg/cmd/cli/backup/get.go
View File

@ -20,10 +20,10 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api "github.com/heptio/velero/pkg/apis/velero/v1" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
) )
func NewGetCommand(f client.Factory, use string) *cobra.Command { func NewGetCommand(f client.Factory, use string) *cobra.Command {

8
pkg/cmd/cli/backup/logs.go
View File

@ -24,10 +24,10 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/downloadrequest" "github.com/vmware-tanzu/velero/pkg/cmd/util/downloadrequest"
) )
func NewLogsCommand(f client.Factory) *cobra.Command { func NewLogsCommand(f client.Factory) *cobra.Command {

2
pkg/cmd/cli/backuplocation/backup_location.go
View File

@ -19,7 +19,7 @@ package backuplocation
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
) )
func NewCommand(f client.Factory) *cobra.Command { func NewCommand(f client.Factory) *cobra.Command {

10
pkg/cmd/cli/backuplocation/create.go
View File

@ -25,11 +25,11 @@ import (
"github.com/spf13/pflag" "github.com/spf13/pflag"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/flag" "github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
) )
func NewCreateCommand(f client.Factory, use string) *cobra.Command { func NewCreateCommand(f client.Factory, use string) *cobra.Command {

8
pkg/cmd/cli/backuplocation/get.go
View File

@ -20,10 +20,10 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api "github.com/heptio/velero/pkg/apis/velero/v1" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
) )
func NewGetCommand(f client.Factory, use string) *cobra.Command { func NewGetCommand(f client.Factory, use string) *cobra.Command {

8
pkg/cmd/cli/bug/bug.go
View File

@ -30,16 +30,16 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/buildinfo" "github.com/vmware-tanzu/velero/pkg/buildinfo"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/features" "github.com/vmware-tanzu/velero/pkg/features"
) )
const ( const (
// kubectlTimeout is how long we wait in seconds for `kubectl version` // kubectlTimeout is how long we wait in seconds for `kubectl version`
// before killing the process // before killing the process
kubectlTimeout = 5 * time.Second kubectlTimeout = 5 * time.Second
issueURL = "https://github.com/heptio/velero/issues/new" issueURL = "https://github.com/vmware-tanzu/velero/issues/new"
// IssueTemplate is used to generate .github/ISSUE_TEMPLATE/bug_report.md // IssueTemplate is used to generate .github/ISSUE_TEMPLATE/bug_report.md
// as well as the initial text that's place in a new Github issue as // as well as the initial text that's place in a new Github issue as
// the result of running `velero bug`. // the result of running `velero bug`.

2
pkg/cmd/cli/client/client.go
View File

@ -19,7 +19,7 @@ package client
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/cmd/cli/client/config" "github.com/vmware-tanzu/velero/pkg/cmd/cli/client/config"
) )
func NewCommand() *cobra.Command { func NewCommand() *cobra.Command {

4
pkg/cmd/cli/client/config/get.go
View File

@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
) )
func NewGetCommand() *cobra.Command { func NewGetCommand() *cobra.Command {

4
pkg/cmd/cli/client/config/set.go
View File

@ -23,8 +23,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
) )
func NewSetCommand() *cobra.Command { func NewSetCommand() *cobra.Command {

2
pkg/cmd/cli/completion/completion.go
View File

@ -22,7 +22,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
kubectlcmd "github.com/heptio/velero/third_party/kubernetes/pkg/kubectl/cmd" kubectlcmd "github.com/vmware-tanzu/velero/third_party/kubernetes/pkg/kubectl/cmd"
) )
func NewCommand() *cobra.Command { func NewCommand() *cobra.Command {

12
pkg/cmd/cli/create/create.go
View File

@ -19,12 +19,12 @@ package create
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd/cli/backup" "github.com/vmware-tanzu/velero/pkg/cmd/cli/backup"
"github.com/heptio/velero/pkg/cmd/cli/backuplocation" "github.com/vmware-tanzu/velero/pkg/cmd/cli/backuplocation"
"github.com/heptio/velero/pkg/cmd/cli/restore" "github.com/vmware-tanzu/velero/pkg/cmd/cli/restore"
"github.com/heptio/velero/pkg/cmd/cli/schedule" "github.com/vmware-tanzu/velero/pkg/cmd/cli/schedule"
"github.com/heptio/velero/pkg/cmd/cli/snapshotlocation" "github.com/vmware-tanzu/velero/pkg/cmd/cli/snapshotlocation"
) )
func NewCommand(f client.Factory) *cobra.Command { func NewCommand(f client.Factory) *cobra.Command {

8
pkg/cmd/cli/delete/delete.go
View File

@ -19,10 +19,10 @@ package delete
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd/cli/backup" "github.com/vmware-tanzu/velero/pkg/cmd/cli/backup"
"github.com/heptio/velero/pkg/cmd/cli/restore" "github.com/vmware-tanzu/velero/pkg/cmd/cli/restore"
"github.com/heptio/velero/pkg/cmd/cli/schedule" "github.com/vmware-tanzu/velero/pkg/cmd/cli/schedule"
) )
func NewCommand(f client.Factory) *cobra.Command { func NewCommand(f client.Factory) *cobra.Command {

6
pkg/cmd/cli/delete_options.go
View File

@ -26,9 +26,9 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/pflag" "github.com/spf13/pflag"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd/util/flag" "github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
clientset "github.com/heptio/velero/pkg/generated/clientset/versioned" clientset "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned"
) )
// DeleteOptions contains parameters used for deleting a restore. // DeleteOptions contains parameters used for deleting a restore.

8
pkg/cmd/cli/describe/describe.go
View File

@ -19,10 +19,10 @@ package describe
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd/cli/backup" "github.com/vmware-tanzu/velero/pkg/cmd/cli/backup"
"github.com/heptio/velero/pkg/cmd/cli/restore" "github.com/vmware-tanzu/velero/pkg/cmd/cli/restore"
"github.com/heptio/velero/pkg/cmd/cli/schedule" "github.com/vmware-tanzu/velero/pkg/cmd/cli/schedule"
) )
func NewCommand(f client.Factory) *cobra.Command { func NewCommand(f client.Factory) *cobra.Command {

14
pkg/cmd/cli/get/get.go
View File

@ -19,13 +19,13 @@ package get
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd/cli/backup" "github.com/vmware-tanzu/velero/pkg/cmd/cli/backup"
"github.com/heptio/velero/pkg/cmd/cli/backuplocation" "github.com/vmware-tanzu/velero/pkg/cmd/cli/backuplocation"
"github.com/heptio/velero/pkg/cmd/cli/plugin" "github.com/vmware-tanzu/velero/pkg/cmd/cli/plugin"
"github.com/heptio/velero/pkg/cmd/cli/restore" "github.com/vmware-tanzu/velero/pkg/cmd/cli/restore"
"github.com/heptio/velero/pkg/cmd/cli/schedule" "github.com/vmware-tanzu/velero/pkg/cmd/cli/schedule"
"github.com/heptio/velero/pkg/cmd/cli/snapshotlocation" "github.com/vmware-tanzu/velero/pkg/cmd/cli/snapshotlocation"
) )
func NewCommand(f client.Factory) *cobra.Command { func NewCommand(f client.Factory) *cobra.Command {

14
pkg/cmd/cli/install/install.go
View File

@ -28,13 +28,13 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/pflag" "github.com/spf13/pflag"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/flag" "github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
"github.com/heptio/velero/pkg/install" "github.com/vmware-tanzu/velero/pkg/install"
kubeutil "github.com/heptio/velero/pkg/util/kube" kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube"
) )
// InstallOptions collects all the options for installing Velero into a Kubernetes cluster. // InstallOptions collects all the options for installing Velero into a Kubernetes cluster.

6
pkg/cmd/cli/plugin/add.go
View File

@ -28,9 +28,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/flag" "github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
) )
const ( const (

8
pkg/cmd/cli/plugin/get.go
View File

@ -23,10 +23,10 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/cli/serverstatus" "github.com/vmware-tanzu/velero/pkg/cmd/cli/serverstatus"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
) )
func NewGetCommand(f client.Factory, use string) *cobra.Command { func NewGetCommand(f client.Factory, use string) *cobra.Command {

2
pkg/cmd/cli/plugin/plugin.go
View File

@ -19,7 +19,7 @@ package plugin
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
) )
func NewCommand(f client.Factory) *cobra.Command { func NewCommand(f client.Factory) *cobra.Command {

4
pkg/cmd/cli/plugin/remove.go
View File

@ -25,8 +25,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
) )
func NewRemoveCommand(f client.Factory) *cobra.Command { func NewRemoveCommand(f client.Factory) *cobra.Command {

8
pkg/cmd/cli/restic/repo/get.go
View File

@ -20,10 +20,10 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api "github.com/heptio/velero/pkg/apis/velero/v1" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
) )
func NewGetCommand(f client.Factory, use string) *cobra.Command { func NewGetCommand(f client.Factory, use string) *cobra.Command {

2
pkg/cmd/cli/restic/repo/repo.go
View File

@ -19,7 +19,7 @@ package repo
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
) )
func NewRepositoryCommand(f client.Factory) *cobra.Command { func NewRepositoryCommand(f client.Factory) *cobra.Command {

4
pkg/cmd/cli/restic/restic.go
View File

@ -19,8 +19,8 @@ package restic
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd/cli/restic/repo" "github.com/vmware-tanzu/velero/pkg/cmd/cli/restic/repo"
) )
func NewCommand(f client.Factory) *cobra.Command { func NewCommand(f client.Factory) *cobra.Command {

20
pkg/cmd/cli/restic/server.go
View File

@ -33,16 +33,16 @@ import (
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
"github.com/heptio/velero/pkg/buildinfo" "github.com/vmware-tanzu/velero/pkg/buildinfo"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/signals" "github.com/vmware-tanzu/velero/pkg/cmd/util/signals"
"github.com/heptio/velero/pkg/controller" "github.com/vmware-tanzu/velero/pkg/controller"
clientset "github.com/heptio/velero/pkg/generated/clientset/versioned" clientset "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned"
informers "github.com/heptio/velero/pkg/generated/informers/externalversions" informers "github.com/vmware-tanzu/velero/pkg/generated/informers/externalversions"
"github.com/heptio/velero/pkg/restic" "github.com/vmware-tanzu/velero/pkg/restic"
"github.com/heptio/velero/pkg/util/filesystem" "github.com/vmware-tanzu/velero/pkg/util/filesystem"
"github.com/heptio/velero/pkg/util/logging" "github.com/vmware-tanzu/velero/pkg/util/logging"
) )
func NewServerCommand(f client.Factory) *cobra.Command { func NewServerCommand(f client.Factory) *cobra.Command {

4
pkg/cmd/cli/restic/server_test.go
View File

@ -25,8 +25,8 @@ import (
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"
"github.com/heptio/velero/pkg/builder" "github.com/vmware-tanzu/velero/pkg/builder"
testutil "github.com/heptio/velero/pkg/test" testutil "github.com/vmware-tanzu/velero/pkg/test"
) )
func Test_validatePodVolumesHostPath(t *testing.T) { func Test_validatePodVolumesHostPath(t *testing.T) {

14
pkg/cmd/cli/restore/create.go
View File

@ -26,13 +26,13 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
api "github.com/heptio/velero/pkg/apis/velero/v1" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/flag" "github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
veleroclient "github.com/heptio/velero/pkg/generated/clientset/versioned" veleroclient "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned"
v1 "github.com/heptio/velero/pkg/generated/informers/externalversions/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/generated/informers/externalversions/velero/v1"
) )
func NewCreateCommand(f client.Factory, use string) *cobra.Command { func NewCreateCommand(f client.Factory, use string) *cobra.Command {

8
pkg/cmd/cli/restore/delete.go
View File

@ -25,10 +25,10 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
kubeerrs "k8s.io/apimachinery/pkg/util/errors" kubeerrs "k8s.io/apimachinery/pkg/util/errors"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/cli" "github.com/vmware-tanzu/velero/pkg/cmd/cli"
) )
// NewDeleteCommand creates and returns a new cobra command for deleting restores. // NewDeleteCommand creates and returns a new cobra command for deleting restores.

10
pkg/cmd/cli/restore/describe.go
View File

@ -23,11 +23,11 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api "github.com/heptio/velero/pkg/apis/velero/v1" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
"github.com/heptio/velero/pkg/restic" "github.com/vmware-tanzu/velero/pkg/restic"
) )
func NewDescribeCommand(f client.Factory, use string) *cobra.Command { func NewDescribeCommand(f client.Factory, use string) *cobra.Command {

8
pkg/cmd/cli/restore/get.go
View File

@ -20,10 +20,10 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api "github.com/heptio/velero/pkg/apis/velero/v1" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
) )
func NewGetCommand(f client.Factory, use string) *cobra.Command { func NewGetCommand(f client.Factory, use string) *cobra.Command {

8
pkg/cmd/cli/restore/logs.go
View File

@ -24,10 +24,10 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/downloadrequest" "github.com/vmware-tanzu/velero/pkg/cmd/util/downloadrequest"
) )
func NewLogsCommand(f client.Factory) *cobra.Command { func NewLogsCommand(f client.Factory) *cobra.Command {

2
pkg/cmd/cli/restore/restore.go
View File

@ -19,7 +19,7 @@ package restore
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
) )
func NewCommand(f client.Factory) *cobra.Command { func NewCommand(f client.Factory) *cobra.Command {

10
pkg/cmd/cli/schedule/create.go
View File

@ -24,11 +24,11 @@ import (
"github.com/spf13/pflag" "github.com/spf13/pflag"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api "github.com/heptio/velero/pkg/apis/velero/v1" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/cli/backup" "github.com/vmware-tanzu/velero/pkg/cmd/cli/backup"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
) )
func NewCreateCommand(f client.Factory, use string) *cobra.Command { func NewCreateCommand(f client.Factory, use string) *cobra.Command {

8
pkg/cmd/cli/schedule/delete.go
View File

@ -25,10 +25,10 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
kubeerrs "k8s.io/apimachinery/pkg/util/errors" kubeerrs "k8s.io/apimachinery/pkg/util/errors"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/cli" "github.com/vmware-tanzu/velero/pkg/cmd/cli"
) )
// NewDeleteCommand creates and returns a new cobra command for deleting schedules. // NewDeleteCommand creates and returns a new cobra command for deleting schedules.

8
pkg/cmd/cli/schedule/describe.go
View File

@ -22,10 +22,10 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
) )
func NewDescribeCommand(f client.Factory, use string) *cobra.Command { func NewDescribeCommand(f client.Factory, use string) *cobra.Command {

8
pkg/cmd/cli/schedule/get.go
View File

@ -20,10 +20,10 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api "github.com/heptio/velero/pkg/apis/velero/v1" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
) )
func NewGetCommand(f client.Factory, use string) *cobra.Command { func NewGetCommand(f client.Factory, use string) *cobra.Command {

2
pkg/cmd/cli/schedule/schedule.go
View File

@ -19,7 +19,7 @@ package schedule
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
) )
func NewCommand(f client.Factory) *cobra.Command { func NewCommand(f client.Factory) *cobra.Command {

6
pkg/cmd/cli/serverstatus/server_status.go
View File

@ -23,9 +23,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/builder" "github.com/vmware-tanzu/velero/pkg/builder"
velerov1client "github.com/heptio/velero/pkg/generated/clientset/versioned/typed/velero/v1" velerov1client "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned/typed/velero/v1"
) )
type ServerStatusGetter interface { type ServerStatusGetter interface {

10
pkg/cmd/cli/snapshotlocation/create.go
View File

@ -24,11 +24,11 @@ import (
"github.com/spf13/pflag" "github.com/spf13/pflag"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api "github.com/heptio/velero/pkg/apis/velero/v1" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/flag" "github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
) )
func NewCreateCommand(f client.Factory, use string) *cobra.Command { func NewCreateCommand(f client.Factory, use string) *cobra.Command {

8
pkg/cmd/cli/snapshotlocation/get.go
View File

@ -20,10 +20,10 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api "github.com/heptio/velero/pkg/apis/velero/v1" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/output" "github.com/vmware-tanzu/velero/pkg/cmd/util/output"
) )
func NewGetCommand(f client.Factory, use string) *cobra.Command { func NewGetCommand(f client.Factory, use string) *cobra.Command {

2
pkg/cmd/cli/snapshotlocation/snapshot_location.go
View File

@ -19,7 +19,7 @@ package snapshotlocation
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
) )
func NewCommand(f client.Factory) *cobra.Command { func NewCommand(f client.Factory) *cobra.Command {

10
pkg/cmd/cli/version/version.go
View File

@ -24,11 +24,11 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/buildinfo" "github.com/vmware-tanzu/velero/pkg/buildinfo"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/cli/serverstatus" "github.com/vmware-tanzu/velero/pkg/cmd/cli/serverstatus"
velerov1client "github.com/heptio/velero/pkg/generated/clientset/versioned/typed/velero/v1" velerov1client "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned/typed/velero/v1"
) )
func NewCommand(f client.Factory) *cobra.Command { func NewCommand(f client.Factory) *cobra.Command {

10
pkg/cmd/cli/version/version_test.go
View File

@ -25,11 +25,11 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/builder" "github.com/vmware-tanzu/velero/pkg/builder"
"github.com/heptio/velero/pkg/buildinfo" "github.com/vmware-tanzu/velero/pkg/buildinfo"
"github.com/heptio/velero/pkg/generated/clientset/versioned/fake" "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned/fake"
v1 "github.com/heptio/velero/pkg/generated/clientset/versioned/typed/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned/typed/velero/v1"
) )
func TestPrintVersion(t *testing.T) { func TestPrintVersion(t *testing.T) {

16
pkg/cmd/server/plugin/plugin.go
View File

@ -20,14 +20,14 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/heptio/velero/pkg/backup" "github.com/vmware-tanzu/velero/pkg/backup"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cloudprovider/aws" "github.com/vmware-tanzu/velero/pkg/cloudprovider/aws"
"github.com/heptio/velero/pkg/cloudprovider/azure" "github.com/vmware-tanzu/velero/pkg/cloudprovider/azure"
"github.com/heptio/velero/pkg/cloudprovider/gcp" "github.com/vmware-tanzu/velero/pkg/cloudprovider/gcp"
velerodiscovery "github.com/heptio/velero/pkg/discovery" velerodiscovery "github.com/vmware-tanzu/velero/pkg/discovery"
veleroplugin "github.com/heptio/velero/pkg/plugin/framework" veleroplugin "github.com/vmware-tanzu/velero/pkg/plugin/framework"
"github.com/heptio/velero/pkg/restore" "github.com/vmware-tanzu/velero/pkg/restore"
) )
func NewCommand(f client.Factory) *cobra.Command { func NewCommand(f client.Factory) *cobra.Command {

38
pkg/cmd/server/server.go
View File

@ -43,25 +43,25 @@ import (
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
api "github.com/heptio/velero/pkg/apis/velero/v1" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/backup" "github.com/vmware-tanzu/velero/pkg/backup"
"github.com/heptio/velero/pkg/buildinfo" "github.com/vmware-tanzu/velero/pkg/buildinfo"
"github.com/heptio/velero/pkg/client" "github.com/vmware-tanzu/velero/pkg/client"
"github.com/heptio/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd"
"github.com/heptio/velero/pkg/cmd/util/flag" "github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
"github.com/heptio/velero/pkg/cmd/util/signals" "github.com/vmware-tanzu/velero/pkg/cmd/util/signals"
"github.com/heptio/velero/pkg/controller" "github.com/vmware-tanzu/velero/pkg/controller"
velerodiscovery "github.com/heptio/velero/pkg/discovery" velerodiscovery "github.com/vmware-tanzu/velero/pkg/discovery"
"github.com/heptio/velero/pkg/features" "github.com/vmware-tanzu/velero/pkg/features"
clientset "github.com/heptio/velero/pkg/generated/clientset/versioned" clientset "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned"
informers "github.com/heptio/velero/pkg/generated/informers/externalversions" informers "github.com/vmware-tanzu/velero/pkg/generated/informers/externalversions"
"github.com/heptio/velero/pkg/metrics" "github.com/vmware-tanzu/velero/pkg/metrics"
"github.com/heptio/velero/pkg/persistence" "github.com/vmware-tanzu/velero/pkg/persistence"
"github.com/heptio/velero/pkg/plugin/clientmgmt" "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
"github.com/heptio/velero/pkg/podexec" "github.com/vmware-tanzu/velero/pkg/podexec"
"github.com/heptio/velero/pkg/restic" "github.com/vmware-tanzu/velero/pkg/restic"
"github.com/heptio/velero/pkg/restore" "github.com/vmware-tanzu/velero/pkg/restore"
"github.com/heptio/velero/pkg/util/logging" "github.com/vmware-tanzu/velero/pkg/util/logging"
) )
const ( const (

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

@ -22,8 +22,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
velerotest "github.com/heptio/velero/pkg/test" velerotest "github.com/vmware-tanzu/velero/pkg/test"
) )
func TestVeleroResourcesExist(t *testing.T) { func TestVeleroResourcesExist(t *testing.T) {

4
pkg/cmd/util/downloadrequest/downloadrequest.go
View File

@ -28,8 +28,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
v1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
velerov1client "github.com/heptio/velero/pkg/generated/clientset/versioned/typed/velero/v1" velerov1client "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned/typed/velero/v1"
) )
// ErrNotFound is exported for external packages to check for when a file is // ErrNotFound is exported for external packages to check for when a file is

Some files were not shown because too many files have changed in this diff Show More