diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 68e065038..6851cf68b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -40,7 +40,7 @@ Please provide the output of the following commands (Pasting long output into a **Vote on this issue!** -This is an invitation to the Velero community to vote on issues, you can see the project's [top voted issues listed here](https://github.com/velero-io/velero/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc). +This is an invitation to the Velero community to vote on issues, you can see the project's [top voted issues listed here](https://github.com/vmware-tanzu/velero/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc). Use the "reaction smiley face" up to the right of this comment to vote. - :+1: for "I would like to see this bug fixed as soon as possible" diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 6468a2e2f..6e4e6841b 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: false contact_links: - name: Velero Q&A - url: https://github.com/velero-io/velero/discussions/categories/community-support-q-a + url: https://github.com/vmware-tanzu/velero/discussions/categories/community-support-q-a about: Have questions about Velero? Please ask them here. diff --git a/.github/ISSUE_TEMPLATE/feature-enhancement-request.md b/.github/ISSUE_TEMPLATE/feature-enhancement-request.md index 7e839def3..bf95fd986 100644 --- a/.github/ISSUE_TEMPLATE/feature-enhancement-request.md +++ b/.github/ISSUE_TEMPLATE/feature-enhancement-request.md @@ -26,7 +26,7 @@ about: Suggest an idea for this project **Vote on this issue!** -This is an invitation to the Velero community to vote on issues, you can see the project's [top voted issues listed here](https://github.com/velero-io/velero/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc). +This is an invitation to the Velero community to vote on issues, you can see the project's [top voted issues listed here](https://github.com/vmware-tanzu/velero/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc). Use the "reaction smiley face" up to the right of this comment to vote. - :+1: for "The project would be better with this feature added" diff --git a/.gitignore b/.gitignore index e7e14f74d..ce62679f1 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,6 @@ debug.test* .cache/ # Go telemetry directory created when container sets HOME to working directory -# This happens because Makefile uses 'docker run -w /github.com/velero-io/velero' +# This happens because Makefile uses 'docker run -w /github.com/vmware-tanzu/velero' # and Go's os.UserConfigDir() falls back to $HOME/.config when XDG_CONFIG_HOME is unset .config/ diff --git a/.golangci.yaml b/.golangci.yaml index 582ed84ba..72db2986b 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -423,7 +423,7 @@ formatters: simplify: true goimports: local-prefixes: - - github.com/velero-io/velero + - github.com/vmware-tanzu/velero severity: default: error diff --git a/.goreleaser.yml b/.goreleaser.yml index 1b30ab300..f206d3f9c 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -44,7 +44,7 @@ builds: - goos: windows goarch: s390x ldflags: - - -X "github.com/velero-io/velero/pkg/buildinfo.Version={{ .Tag }}" -X "github.com/velero-io/velero/pkg/buildinfo.GitSHA={{ .FullCommit }}" -X "github.com/velero-io/velero/pkg/buildinfo.GitTreeState={{ .Env.GIT_TREE_STATE }}" -X "github.com/velero-io/velero/pkg/buildinfo.ImageRegistry={{ .Env.REGISTRY }}" + - -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 }}" -X "github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry={{ .Env.REGISTRY }}" archives: - name_template: "{{ .ProjectName }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}" wrap_in_directory: true diff --git a/ADOPTERS.md b/ADOPTERS.md index d8f320523..7bc46e9c3 100644 --- a/ADOPTERS.md +++ b/ADOPTERS.md @@ -82,8 +82,8 @@ If you would like to add your logo to a future `Adopters of Velero` section on [ [1]: #adding-a-logo-to-veleroio [2]: https://velero.io -[3]: https://github.com/velero-io/velero/pulls -[4]: https://github.com/velero-io/velero/pull/2242 +[3]: https://github.com/vmware-tanzu/velero/pulls +[4]: https://github.com/vmware-tanzu/velero/pull/2242 [10]: https://www.nirmata.com/2019/08/14/kubernetes-disaster-recovery-using-velero-and-nirmata/ [11]: https://nirmata.com diff --git a/CHANGELOG.md b/CHANGELOG.md index c29f81481..cc3e910d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,29 +28,29 @@ * [CHANGELOG-0.3.md][1] -[25]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.15.md -[24]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.14.md -[23]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.13.md -[22]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.12.md -[21]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.11.md -[20]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.10.md -[19]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.9.md -[18]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.8.md -[17]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.7.md -[16]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.6.md -[15]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.5.md -[14]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.4.md -[13]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.3.md -[12]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.2.md -[11]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.1.md -[10]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-1.0.md -[9]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-0.11.md -[8]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-0.10.md -[7]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-0.9.md -[6]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-0.8.md -[5]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-0.7.md -[4]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-0.6.md -[3]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-0.5.md -[2]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-0.4.md -[1]: https://github.com/velero-io/velero/blob/main/changelogs/CHANGELOG-0.3.md -[0]: https://github.com/velero-io/velero/blob/main/changelogs/unreleased +[25]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.15.md +[24]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.14.md +[23]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.13.md +[22]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.12.md +[21]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.11.md +[20]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.10.md +[19]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.9.md +[18]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.8.md +[17]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.7.md +[16]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.6.md +[15]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.5.md +[14]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.4.md +[13]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.3.md +[12]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.2.md +[11]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.1.md +[10]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.0.md +[9]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-0.11.md +[8]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-0.10.md +[7]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-0.9.md +[6]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-0.8.md +[5]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-0.7.md +[4]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-0.6.md +[3]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-0.5.md +[2]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-0.4.md +[1]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-0.3.md +[0]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/unreleased diff --git a/Dockerfile b/Dockerfile index 3c6b8d460..12306fad2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,9 +34,9 @@ ENV CGO_ENABLED=0 \ GOARM=${TARGETVARIANT} \ LDFLAGS="-X ${PKG}/pkg/buildinfo.Version=${VERSION} -X ${PKG}/pkg/buildinfo.GitSHA=${GIT_SHA} -X ${PKG}/pkg/buildinfo.GitTreeState=${GIT_TREE_STATE} -X ${PKG}/pkg/buildinfo.ImageRegistry=${REGISTRY}" -WORKDIR /go/src/github.com/velero-io/velero +WORKDIR /go/src/github.com/vmware-tanzu/velero -COPY . /go/src/github.com/velero-io/velero +COPY . /go/src/github.com/vmware-tanzu/velero RUN mkdir -p /output/usr/bin && \ export GOARM=$( echo "${GOARM}" | cut -c2-) && \ diff --git a/Dockerfile-Windows b/Dockerfile-Windows index 26774b375..df588def5 100644 --- a/Dockerfile-Windows +++ b/Dockerfile-Windows @@ -36,9 +36,9 @@ ENV CGO_ENABLED=0 \ GOARM=${TARGETVARIANT} \ LDFLAGS="-X ${PKG}/pkg/buildinfo.Version=${VERSION} -X ${PKG}/pkg/buildinfo.GitSHA=${GIT_SHA} -X ${PKG}/pkg/buildinfo.GitTreeState=${GIT_TREE_STATE} -X ${PKG}/pkg/buildinfo.ImageRegistry=${REGISTRY}" -WORKDIR /go/src/github.com/velero-io/velero +WORKDIR /go/src/github.com/vmware-tanzu/velero -COPY . /go/src/github.com/velero-io/velero +COPY . /go/src/github.com/vmware-tanzu/velero RUN mkdir -p /output/usr/bin && \ export GOARM=$( echo "${GOARM}" | cut -c2-) && \ diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 0bf265329..687baeb00 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -10,14 +10,14 @@ This document defines the project governance for Velero. The following code repositories are governed by Velero community and maintained under the `vmware-tanzu\Velero` organization. -* **[Velero](https://github.com/velero-io/velero):** Main Velero codebase +* **[Velero](https://github.com/vmware-tanzu/velero):** Main Velero codebase * **[Helm Chart](https://github.com/vmware-tanzu/helm-charts/tree/main/charts/velero):** The Helm chart for the Velero server component -* **[Velero CSI Plugin](https://github.com/velero-io/velero-plugin-for-csi):** This repository contains Velero plugins for snapshotting CSI backed PVCs using the CSI beta snapshot APIs -* **[Velero Plugin for vSphere](https://github.com/velero-io/velero-plugin-for-vsphere):** This repository contains the Velero Plugin for vSphere. This plugin is a volume snapshotter plugin that provides crash-consistent snapshots of vSphere block volumes and backup of volume data into S3 compatible storage. -* **[Velero Plugin for AWS](https://github.com/velero-io/velero-plugin-for-aws):** This repository contains the plugins to support running Velero on AWS, including the object store plugin and the volume snapshotter plugin -* **[Velero Plugin for GCP](https://github.com/velero-io/velero-plugin-for-gcp):** This repository contains the plugins to support running Velero on GCP, including the object store plugin and the volume snapshotter plugin -* **[Velero Plugin for Azure](https://github.com/velero-io/velero-plugin-for-microsoft-azure):** This repository contains the plugins to support running Velero on Azure, including the object store plugin and the volume snapshotter plugin -* **[Velero Plugin Example](https://github.com/velero-io/velero-plugin-example):** This repository contains example plugins for Velero +* **[Velero CSI Plugin](https://github.com/vmware-tanzu/velero-plugin-for-csi):** This repository contains Velero plugins for snapshotting CSI backed PVCs using the CSI beta snapshot APIs +* **[Velero Plugin for vSphere](https://github.com/vmware-tanzu/velero-plugin-for-vsphere):** This repository contains the Velero Plugin for vSphere. This plugin is a volume snapshotter plugin that provides crash-consistent snapshots of vSphere block volumes and backup of volume data into S3 compatible storage. +* **[Velero Plugin for AWS](https://github.com/vmware-tanzu/velero-plugin-for-aws):** This repository contains the plugins to support running Velero on AWS, including the object store plugin and the volume snapshotter plugin +* **[Velero Plugin for GCP](https://github.com/vmware-tanzu/velero-plugin-for-gcp):** This repository contains the plugins to support running Velero on GCP, including the object store plugin and the volume snapshotter plugin +* **[Velero Plugin for Azure](https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure):** This repository contains the plugins to support running Velero on Azure, including the object store plugin and the volume snapshotter plugin +* **[Velero Plugin Example](https://github.com/vmware-tanzu/velero-plugin-example):** This repository contains example plugins for Velero ## Community Roles @@ -67,12 +67,12 @@ interested in implementing the proposal should be either deeply engaged in the proposal process or be an author of the proposal. The proposal should be documented as a separated markdown file pushed to the root of the -`design` folder in the [Velero](https://github.com/velero-io/velero/tree/main/design) +`design` folder in the [Velero](https://github.com/vmware-tanzu/velero/tree/main/design) repository via PR. The name of the file should follow the name pattern `_design.md`, e.g: `restore-hooks-design.md`. -Use the [Proposal Template](https://github.com/velero-io/velero/blob/main/design/_template.md) as a starting point. +Use the [Proposal Template](https://github.com/vmware-tanzu/velero/blob/main/design/_template.md) as a starting point. ### Proposal Lifecycle @@ -88,7 +88,7 @@ To maintain velocity in a project as busy as Velero, the concept of [Lazy Consensus](http://en.osswiki.info/concepts/lazy_consensus) is practiced. Ideas and / or proposals should be shared by maintainers via GitHub with the appropriate maintainer groups (e.g., -`@velero-io/velero-maintainers`) tagged. Out of respect for other contributors, +`@vmware-tanzu/velero-maintainers`) tagged. Out of respect for other contributors, major changes should also be accompanied by a ping on Slack or a note on the Velero mailing list as appropriate. Author(s) of proposal, Pull Requests, issues, etc. will give a time period of no less than five (5) working days for @@ -111,7 +111,7 @@ Lazy consensus does _not_ apply to the process of: ### Deprecation Process -Any contributor may introduce a request to deprecate a feature or an option of a feature by opening a feature request issue in the velero-io/velero GitHub project. The issue should describe why the feature is no longer needed or has become detrimental to Velero, as well as whether and how it has been superseded. The submitter should give as much detail as possible. +Any contributor may introduce a request to deprecate a feature or an option of a feature by opening a feature request issue in the vmware-tanzu/velero GitHub project. The issue should describe why the feature is no longer needed or has become detrimental to Velero, as well as whether and how it has been superseded. The submitter should give as much detail as possible. Once the issue is filed, a one-month discussion period begins. Discussions take place within the issue itself as well as in the community meetings. The person who opens the issue, or a maintainer, should add the date and time marking the end of the discussion period in a comment on the issue as soon as possible after it is opened. A decision on the issue needs to be made within this one-month period. diff --git a/MAINTAINERS.md b/MAINTAINERS.md index b3c157989..2789a573d 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -1,6 +1,6 @@ # Velero Maintainers -[GOVERNANCE.md](https://github.com/velero-io/velero/blob/main/GOVERNANCE.md) describes governance guidelines and maintainer responsibilities. +[GOVERNANCE.md](https://github.com/vmware-tanzu/velero/blob/main/GOVERNANCE.md) describes governance guidelines and maintainer responsibilities. ## Maintainers diff --git a/Makefile b/Makefile index cf0276f9b..80db72e3a 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ BIN ?= velero # This repo's root import path (under GOPATH). -PKG := github.com/velero-io/velero +PKG := github.com/vmware-tanzu/velero # Where to push the docker image. REGISTRY ?= velero @@ -194,7 +194,7 @@ TTY := $(shell tty -s && echo "-t") # Example: make shell CMD="date > datefile" shell: build-dirs build-env - @# bind-mount the Velero root dir in at /github.com/velero-io/velero + @# bind-mount the Velero root dir in at /github.com/vmware-tanzu/velero @# because the Kubernetes code-generator tools require the project to @# exist in a directory hierarchy ending like this (but *NOT* necessarily @# under $GOPATH). @@ -204,7 +204,7 @@ shell: build-dirs build-env -i $(TTY) \ --rm \ -u $$(id -u):$$(id -g) \ - -v "$$(pwd):/github.com/velero-io/velero:delegated" \ + -v "$$(pwd):/github.com/vmware-tanzu/velero:delegated" \ -v "$$(pwd)/_output/bin:/output:delegated" \ -v "$$(pwd)/.go/pkg:/go/pkg:delegated" \ -v "$$(pwd)/.go/std:/go/std:delegated" \ @@ -212,7 +212,7 @@ shell: build-dirs build-env -v "$$(pwd)/.go/go-build:/.cache/go-build:delegated" \ -v "$$(pwd)/.go/golangci-lint:/.cache/golangci-lint:delegated" \ -v "$$(pwd)/.go/goimports:/.cache/goimports:delegated" \ - -w /github.com/velero-io/velero \ + -w /github.com/vmware-tanzu/velero \ $(BUILDER_IMAGE) \ /bin/sh $(CMD) @@ -432,7 +432,7 @@ changelog: # PUBLISH=false \ # make release # -# To run the release, which will publish a *DRAFT* GitHub release in github.com/velero-io/velero +# To run the release, which will publish a *DRAFT* GitHub release in github.com/vmware-tanzu/velero # (you still need to review/publish the GitHub release manually): # GITHUB_TOKEN=your-github-token \ # RELEASE_NOTES_FILE=changelogs/CHANGELOG-1.2.md \ diff --git a/ROADMAP.md b/ROADMAP.md index a9b7037fe..798acf588 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1 +1 @@ -# Please go to the [Velero Wiki](https://github.com/velero-io/velero/wiki/) to see our latest roadmap, archived roadmaps and roadmap guidance. \ No newline at end of file +# Please go to the [Velero Wiki](https://github.com/vmware-tanzu/velero/wiki/) to see our latest roadmap, archived roadmaps and roadmap guidance. \ No newline at end of file diff --git a/SECURITY.md b/SECURITY.md index 219426f6f..84e6f45dc 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -5,7 +5,7 @@ Velero is an open source tool with a growing community devoted to safe backup an ## Supported Versions -The Velero project maintains the following [governance document](https://github.com/velero-io/velero/blob/main/GOVERNANCE.md), [release document](https://github.com/velero-io/velero/blob/f42c63af1b9af445e38f78a7256b1c48ef79c10e/site/docs/main/release-instructions.md), and [support document](https://velero.io/docs/main/support-process/). Please refer to these for release and related details. Only the most recent version of Velero is supported. Each [release](https://github.com/velero-io/velero/releases) includes information about upgrading to the latest version. +The Velero project maintains the following [governance document](https://github.com/vmware-tanzu/velero/blob/main/GOVERNANCE.md), [release document](https://github.com/vmware-tanzu/velero/blob/f42c63af1b9af445e38f78a7256b1c48ef79c10e/site/docs/main/release-instructions.md), and [support document](https://velero.io/docs/main/support-process/). Please refer to these for release and related details. Only the most recent version of Velero is supported. Each [release](https://github.com/vmware-tanzu/velero/releases) includes information about upgrading to the latest version. ## Reporting a Vulnerability - Private Disclosure Process @@ -18,7 +18,7 @@ If you know of a publicly disclosed security vulnerability for Velero, please ** **IMPORTANT: Do not file public issues on GitHub for security vulnerabilities** -To report a vulnerability or a security-related issue, please contact the email address with the details of the vulnerability. The email will be fielded by the Security Team and then shared with the Velero maintainers who have committer and release permissions. Emails will be addressed within 3 business days, including a detailed plan to investigate the issue and any potential workarounds to perform in the meantime. Do not report non-security-impacting bugs through this channel. Use [GitHub issues](https://github.com/velero-io/velero/issues/new/choose) instead. +To report a vulnerability or a security-related issue, please contact the email address with the details of the vulnerability. The email will be fielded by the Security Team and then shared with the Velero maintainers who have committer and release permissions. Emails will be addressed within 3 business days, including a detailed plan to investigate the issue and any potential workarounds to perform in the meantime. Do not report non-security-impacting bugs through this channel. Use [GitHub issues](https://github.com/vmware-tanzu/velero/issues/new/choose) instead. ## Proposed Email Content @@ -68,7 +68,7 @@ The Security Team will respond to vulnerability reports as follows: ## Public Disclosure Process -The Security Team publishes a [public advisory](https://github.com/velero-io/velero/security/advisories) to the Velero community via GitHub. In most cases, additional communication via Slack, Twitter, mailing lists, blog and other channels will assist in educating Velero users and rolling out the patched release to affected users. +The Security Team publishes a [public advisory](https://github.com/vmware-tanzu/velero/security/advisories) to the Velero community via GitHub. In most cases, additional communication via Slack, Twitter, mailing lists, blog and other channels will assist in educating Velero users and rolling out the patched release to affected users. The Security Team will also publish any mitigating steps users can take until the fix can be applied to their Velero instances. Velero distributors will handle creating and publishing their own security advisories. diff --git a/changelogs/CHANGELOG-0.10.md b/changelogs/CHANGELOG-0.10.md index 699d1dd9c..e4f451d9d 100644 --- a/changelogs/CHANGELOG-0.10.md +++ b/changelogs/CHANGELOG-0.10.md @@ -69,8 +69,8 @@ carefully to ensure a successful upgrade!** - The `Config` CRD has been replaced by `BackupStorageLocation` and `VolumeSnapshotLocation` CRDs. - The interface for external plugins (object/block stores, backup/restore item actions) has changed. If you have authored any custom plugins, they'll need to be updated for v0.10. - - The [`ObjectStore.ListCommonPrefixes`](https://github.com/velero-io/velero/blob/main/pkg/cloudprovider/object_store.go#L50) signature has changed to add a `prefix` parameter. - - Registering plugins has changed. Create a new plugin server with the `NewServer` function, and register plugins with the appropriate functions. See the [`Server`](https://github.com/velero-io/velero/blob/main/pkg/plugin/server.go#L37) interface for details. + - The [`ObjectStore.ListCommonPrefixes`](https://github.com/vmware-tanzu/velero/blob/main/pkg/cloudprovider/object_store.go#L50) signature has changed to add a `prefix` parameter. + - Registering plugins has changed. Create a new plugin server with the `NewServer` function, and register plugins with the appropriate functions. See the [`Server`](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/server.go#L37) interface for details. - The organization of Ark data in object storage has changed. Existing data will need to be moved around to conform to the new layout. ### All Changes diff --git a/changelogs/CHANGELOG-0.9.md b/changelogs/CHANGELOG-0.9.md index 5e243128b..f29a0d28e 100644 --- a/changelogs/CHANGELOG-0.9.md +++ b/changelogs/CHANGELOG-0.9.md @@ -137,7 +137,7 @@ ### Highlights: * Ark now has support for backing up and restoring Kubernetes volumes using a free open-source backup tool called [restic](https://github.com/restic/restic). This provides users an out-of-the-box solution for backing up and restoring almost any type of Kubernetes volume, whether or not it has snapshot support - integrated with Ark. For more information, see the [documentation](https://github.com/velero-io/velero/blob/main/docs/restic.md). + integrated with Ark. For more information, see the [documentation](https://github.com/vmware-tanzu/velero/blob/main/docs/restic.md). * Support for Prometheus metrics has been added! View total number of backup attempts (including success or failure), total backup size in bytes, and backup durations. More metrics coming in future releases! diff --git a/changelogs/CHANGELOG-1.10.md b/changelogs/CHANGELOG-1.10.md index aba7d8419..412b23b07 100644 --- a/changelogs/CHANGELOG-1.10.md +++ b/changelogs/CHANGELOG-1.10.md @@ -2,7 +2,7 @@ ### 2022-11-23 ### Download -https://github.com/velero-io/velero/releases/tag/v1.10.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.10.0 ### Container Image `velero/velero:v1.10.0` @@ -20,7 +20,7 @@ In this release, we introduced the Unified Repository architecture to build a da In this release, we also deeply integrate Velero with Kopia, specifically, Kopia's uploader modules are isolated as a generic file system uploader; Kopia's repository modules are encapsulated as the unified backup repository. -For more information, refer to the [design document](https://github.com/velero-io/velero/blob/v1.10.0/design/unified-repo-and-kopia-integration/unified-repo-and-kopia-integration.md). +For more information, refer to the [design document](https://github.com/vmware-tanzu/velero/blob/v1.10.0/design/unified-repo-and-kopia-integration/unified-repo-and-kopia-integration.md). #### File system backup refactor Velero's file system backup (a.k.s. pod volume backup or formerly restic backup) is refactored as the first user of the Unified Repository architecture. Specifically, we added a new path, the Kopia path, besides the existing Restic path. While Restic path is still available and set as default, you can opt in Kopia path by specifying the `uploader-type` parameter at installation time. Meanwhile, you are free to restore from existing backups under either path, Velero dynamically switches to the correct path to process the restore. @@ -33,7 +33,7 @@ Meanwhile, we've created a performance guide for both Restic path and Kopia path #### Plugin versioning V1 refactor In this release, Velero moves plugins BackupItemAction, RestoreItemAction and VolumeSnapshotterAction to version v1, this allows future plugin changes that do not support backward compatibility, so is a preparation for various complex tasks, for example, data movement tasks. -For more information, refer to the [plugin versioning design document](https://github.com/velero-io/velero/blob/v1.10.0/design/plugin-versioning.md). +For more information, refer to the [plugin versioning design document](https://github.com/vmware-tanzu/velero/blob/v1.10.0/design/plugin-versioning.md). #### Refactor the controllers using Kubebuilder v3 In this release we continued our code modernization work, rewriting some controllers using Kubebuilder v3. This work is ongoing and we will continue to make progress in future releases. @@ -75,9 +75,9 @@ Due to file system backup refactor, below modules and parameters name have been Due to the major changes of file system backup, the old upgrade steps are not suitable any more. For the new upgrade steps, visit [v1.10 upgrade guide document](https://velero.io/docs/v1.10/upgrade-to-1.10/). #### Limitations/Known issues -In this release, Kopia backup repository (so the Kopia path of file system backup) doesn't support self signed certificate for S3 compatible storage. To track this problem, refer to this [Velero issue](https://github.com/velero-io/velero/issues/5123) or [Kopia issue](https://github.com/kopia/kopia/issues/1443). +In this release, Kopia backup repository (so the Kopia path of file system backup) doesn't support self signed certificate for S3 compatible storage. To track this problem, refer to this [Velero issue](https://github.com/vmware-tanzu/velero/issues/5123) or [Kopia issue](https://github.com/kopia/kopia/issues/1443). -Due to the code change in Velero, there will be some code change required in vSphere plugin, without which the functionality may be impacted. Therefore, if you are using vSphere plugin in your workflow, please hold the upgrade until the issue [#485](https://github.com/velero-io/velero-plugin-for-vsphere/issues/485) is fixed in vSphere plugin. +Due to the code change in Velero, there will be some code change required in vSphere plugin, without which the functionality may be impacted. Therefore, if you are using vSphere plugin in your workflow, please hold the upgrade until the issue [#485](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/issues/485) is fixed in vSphere plugin. ### All changes @@ -185,6 +185,6 @@ Related issue: #2413 (#5178, @allenxu404) * Delete opened issues triage action. (#5041, @jxun) * When spec.RestoreStatus is empty, don't restore status (#5008, @sseago) * Added DownloadTargetKindCSIBackupVolumeSnapshots for retrieving the signed URL to download only the ``-csi-volumesnapshots.json.gz and DownloadTargetKindCSIBackupVolumeSnapshotContents to download only ``-csi-volumesnapshotcontents.json.gz in the DownloadRequest CR structure. These files are already present in the backup layout. (#4980, @anshulahuja98) - * Refactor BackupItemAction proto and related code to backupitemaction/v1 package. This is part of implementation of the plugin version design https://github.com/velero-io/velero/blob/main/design/plugin-versioning.md (#4943, @phuongatemc) + * Refactor BackupItemAction proto and related code to backupitemaction/v1 package. This is part of implementation of the plugin version design https://github.com/vmware-tanzu/velero/blob/main/design/plugin-versioning.md (#4943, @phuongatemc) * Unified Repository Design (#4926, @Lyndon-Li) * Add credentials to volume snapshot locations (#4864, @sseago) \ No newline at end of file diff --git a/changelogs/CHANGELOG-1.11.md b/changelogs/CHANGELOG-1.11.md index 0eef338eb..75d08d4df 100644 --- a/changelogs/CHANGELOG-1.11.md +++ b/changelogs/CHANGELOG-1.11.md @@ -2,7 +2,7 @@ ### 2023-04-07 ### Download -https://github.com/velero-io/velero/releases/tag/v1.11.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.11.0 ### Container Image `velero/velero:v1.11.0` @@ -26,10 +26,10 @@ This feature implemented the RestoreItemAction v2. RIA v2 has three new methods: The Progress() and Cancel() methods are needed to facilitate long-running RestoreItemAction plugin actions that may not be complete when the Execute() method returns. This will allow long-running RestoreItemAction plugin actions to continue in the background while the Velero moves to the following plugin or the next item. The AreAdditionalItemsReady() method is needed to allow plugins to tell Velero to wait until the returned additional items have been restored and are ready for use in the cluster before restoring the current item. #### Plugin Progress Monitoring -This is intended as a replacement for the previously-approved Upload Progress Monitoring design ([Upload Progress Monitoring](https://github.com/velero-io/velero/blob/main/design/upload-progress.md)) to expand the supported use cases beyond snapshot upload to include what was previously called Async Backup/Restore Item Actions. +This is intended as a replacement for the previously-approved Upload Progress Monitoring design ([Upload Progress Monitoring](https://github.com/vmware-tanzu/velero/blob/main/design/upload-progress.md)) to expand the supported use cases beyond snapshot upload to include what was previously called Async Backup/Restore Item Actions. #### Flexible resource policy that can filter volumes to skip in the backup -This feature provides a flexible policy to filter volumes in the backup without requiring patching any labels or annotations to the pods or volumes. This policy is configured as k8s ConfigMap and maintained by the users themselves, and it can be extended to more scenarios in the future. By now, the policy rules out volumes from backup depending on the CSI driver, NFS setting, volume size, and StorageClass setting. Please refer to [policy API design](https://github.com/velero-io/velero/blob/main/design/Implemented/handle-backup-of-volumes-by-resources-filters.md#api-design) for the policy's ConifgMap format. It is not guaranteed to work on unofficial third-party plugins as it may not follow the existing backup workflow code logic of Velero. +This feature provides a flexible policy to filter volumes in the backup without requiring patching any labels or annotations to the pods or volumes. This policy is configured as k8s ConfigMap and maintained by the users themselves, and it can be extended to more scenarios in the future. By now, the policy rules out volumes from backup depending on the CSI driver, NFS setting, volume size, and StorageClass setting. Please refer to [policy API design](https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/handle-backup-of-volumes-by-resources-filters.md#api-design) for the policy's ConifgMap format. It is not guaranteed to work on unofficial third-party plugins as it may not follow the existing backup workflow code logic of Velero. #### Resource Filters that can distinguish cluster scope and namespace scope resources This feature adds four new resource filters for backup. The new filters are separated into cluster scope and namespace scope. Before this feature, Velero could not filter cluster scope resources precisely. This feature provides the ability and refactors existing resource filter parameters. diff --git a/changelogs/CHANGELOG-1.12.md b/changelogs/CHANGELOG-1.12.md index f65d5b663..4b980641a 100644 --- a/changelogs/CHANGELOG-1.12.md +++ b/changelogs/CHANGELOG-1.12.md @@ -2,7 +2,7 @@ ### 2023-08-18 ### Download -https://github.com/velero-io/velero/releases/tag/v1.12.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.12.0 ### Container Image `velero/velero:v1.12.0` @@ -23,17 +23,17 @@ CSI Snapshot Data Movement is useful in below scenarios: * For on-premises users, the storage usually doesn't support durable snapshots, so it is impossible/less efficient/cost ineffective to keep volume snapshots by the storage This feature helps to move the snapshot data to a storage with lower cost and larger scale for long time preservation. * For public cloud users, this feature helps users to fulfill the multiple cloud strategy. It allows users to back up volume snapshots from one cloud provider and preserve or restore the data to another cloud provider. Then users will be free to flow their business data across cloud providers based on Velero backup and restore -CSI Snapshot Data Movement is built according to the Volume Snapshot Data Movement design ([Volume Snapshot Data Movement](https://github.com/velero-io/velero/blob/main/design/Implemented/unified-repo-and-kopia-integration/unified-repo-and-kopia-integration.md)). More details can be found in the design. +CSI Snapshot Data Movement is built according to the Volume Snapshot Data Movement design ([Volume Snapshot Data Movement](https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/unified-repo-and-kopia-integration/unified-repo-and-kopia-integration.md)). More details can be found in the design. #### Resource Modifiers In many use cases, customers often need to substitute specific values in Kubernetes resources during the restoration process like changing the namespace, changing the storage class, etc. -To address this need, Resource Modifiers (also known as JSON Substitutions) offer a generic solution in the restore workflow. It allows the user to define filters for specific resources and then specify a JSON patch (operator, path, value) to apply to the resource. This feature simplifies the process of making substitutions without requiring the implementation of a new RestoreItemAction plugin. More details can be found in Volume Snapshot Resource Modifiers design ([Resource Modifiers](https://github.com/velero-io/velero/blob/main/design/Implemented/json-substitution-action-design.md)). +To address this need, Resource Modifiers (also known as JSON Substitutions) offer a generic solution in the restore workflow. It allows the user to define filters for specific resources and then specify a JSON patch (operator, path, value) to apply to the resource. This feature simplifies the process of making substitutions without requiring the implementation of a new RestoreItemAction plugin. More details can be found in Volume Snapshot Resource Modifiers design ([Resource Modifiers](https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/json-substitution-action-design.md)). #### Multiple VolumeSnapshotClasses Prior to version 1.12, the Velero CSI plugin would choose the VolumeSnapshotClass in the cluster based on matching driver names and the presence of the "velero.io/csi-volumesnapshot-class" label. However, this approach proved inadequate for many user scenarios. -With the introduction of version 1.12, Velero now offers support for multiple VolumeSnapshotClasses in the CSI Plugin, enabling users to select a specific class for a particular backup. More details can be found in Multiple VolumeSnapshotClasses design ([Multiple VolumeSnapshotClasses](https://github.com/velero-io/velero/blob/main/design/Implemented/multiple-csi-volumesnapshotclass-support.md)). +With the introduction of version 1.12, Velero now offers support for multiple VolumeSnapshotClasses in the CSI Plugin, enabling users to select a specific class for a particular backup. More details can be found in Multiple VolumeSnapshotClasses design ([Multiple VolumeSnapshotClasses](https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/multiple-csi-volumesnapshotclass-support.md)). #### Restore Finalizer Before v1.12, the restore controller would only delete restore resources but wouldn’t delete restore data from the backup storage location when the command `velero restore delete` was executed. The only chance Velero deletes restores data from the backup storage location is when the associated backup is deleted. diff --git a/changelogs/CHANGELOG-1.13.md b/changelogs/CHANGELOG-1.13.md index 26132ec64..ec7362bbe 100644 --- a/changelogs/CHANGELOG-1.13.md +++ b/changelogs/CHANGELOG-1.13.md @@ -2,7 +2,7 @@ ### 2024-01-10 ### Download -https://github.com/velero-io/velero/releases/tag/v1.13.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.13.0 ### Container Image `velero/velero:v1.13.0` @@ -16,7 +16,7 @@ https://velero.io/docs/v1.13/upgrade-to-1.13/ ### Highlights #### Resource Modifier Enhancement -Velero introduced the Resource Modifiers in v1.12.0. This feature allows users to specify a ConfigMap with a set of rules to modify the resources during restoration. However, only the JSON Patch is supported when creating the rules, and JSON Patch has some limitations, which cannot cover all use cases. In v1.13.0, Velero adds new support for JSON Merge Patch and Strategic Merge Patch, which provide more power and flexibility and allow users to use the same ConfigMap to apply patches on the resources. More design details can be found in [Support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers](https://github.com/velero-io/velero/blob/main/design/Implemented/merge-patch-and-strategic-in-resource-modifier.md) design. For instructions on how to use the feature, please refer to the [Resource Modifiers](https://velero.io/docs/v1.13/restore-resource-modifiers/) doc. +Velero introduced the Resource Modifiers in v1.12.0. This feature allows users to specify a ConfigMap with a set of rules to modify the resources during restoration. However, only the JSON Patch is supported when creating the rules, and JSON Patch has some limitations, which cannot cover all use cases. In v1.13.0, Velero adds new support for JSON Merge Patch and Strategic Merge Patch, which provide more power and flexibility and allow users to use the same ConfigMap to apply patches on the resources. More design details can be found in [Support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers](https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/merge-patch-and-strategic-in-resource-modifier.md) design. For instructions on how to use the feature, please refer to the [Resource Modifiers](https://velero.io/docs/v1.13/restore-resource-modifiers/) doc. #### Node-Agent Concurrency Velero data movement activities from fs-backups and CSI snapshot data movements run in Velero node-agent, so may be hosted by every node in the cluster and consume resources (i.e. CPU, memory, network bandwidth) from there. With v1.13, users are allowed to configure how many data movement activities (a.k.a, loads) run in each node globally or by node, so that users can better leverage the performance of Velero data movement activities and the resource consumption in the cluster. For more information, check the [Node-Agent Concurrency](https://velero.io/docs/v1.13/node-agent-concurrency/) document. @@ -57,8 +57,8 @@ To fix CVEs and keep pace with Golang, Velero made changes as follows: ### Breaking changes * Backup describe command: due to the backup describe output enhancement, some existing information (i.e. the output for native snapshot, CSI snapshot, and fs-backup) has been moved to the Backup Volumes section with some format changes. -* API type changes: changes the field [DataMoverConfig](https://github.com/velero-io/velero/blob/v1.13.0/pkg/apis/velero/v2alpha1/data_upload_types.go#L54) in DataUploadSpec from `*map[string][string]`` to `map[string]string` -* Velero install command: due to the issue [#7264](https://github.com/velero-io/velero/issues/7264), v1.13.0 introduces a break change that make the informer cache enabled by default to keep the actual behavior consistent with the helper message(the informer cache is disabled by default before the change). +* API type changes: changes the field [DataMoverConfig](https://github.com/vmware-tanzu/velero/blob/v1.13.0/pkg/apis/velero/v2alpha1/data_upload_types.go#L54) in DataUploadSpec from `*map[string][string]`` to `map[string]string` +* Velero install command: due to the issue [#7264](https://github.com/vmware-tanzu/velero/issues/7264), v1.13.0 introduces a break change that make the informer cache enabled by default to keep the actual behavior consistent with the helper message(the informer cache is disabled by default before the change). ### Limitations/Known issues diff --git a/changelogs/CHANGELOG-1.14.md b/changelogs/CHANGELOG-1.14.md index 86a62b6b7..209334fc2 100644 --- a/changelogs/CHANGELOG-1.14.md +++ b/changelogs/CHANGELOG-1.14.md @@ -1,7 +1,7 @@ ## v1.14 ### Download -https://github.com/velero-io/velero/releases/tag/v1.14.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.14.0 ### Container Image `velero/velero:v1.14.0` diff --git a/changelogs/CHANGELOG-1.15.md b/changelogs/CHANGELOG-1.15.md index 883921563..e52d6f7f4 100644 --- a/changelogs/CHANGELOG-1.15.md +++ b/changelogs/CHANGELOG-1.15.md @@ -1,7 +1,7 @@ ## v1.15 ### Download -https://github.com/velero-io/velero/releases/tag/v1.15.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.15.0 ### Container Image `velero/velero:v1.15.0` @@ -19,13 +19,13 @@ Data transfer activities for CSI Snapshot Data Movement are moved from node-agen - This enables users to to control resource (i.e., cpu, memory) allocations in a granular manner, e.g., control them per backup/restore of a volume. - This enhances the resilience, crash of one data movement activity won't affect others. - This prevents unnecessary full backup because of host path changes after workload pods restart. -- For more information, check the design https://github.com/velero-io/velero/blob/main/design/Implemented/vgdp-micro-service/vgdp-micro-service.md. +- For more information, check the design https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/vgdp-micro-service/vgdp-micro-service.md. #### Item Block concepts and ItemBlockAction (IBA) plugin Item Block concepts are introduced for resource backups to help to achieve multiple thread backups. Specifically, correlated resources are categorized in the same item block and item blocks could be processed concurrently in multiple threads. ItemBlockAction plugin is introduced to help Velero to categorize resources into item blocks. At present, Velero provides built-in IBAs for pods and PVCs and Velero also supports customized IBAs for any resources. In v1.15, Velero doesn't support multiple thread process of item blocks though item block concepts and IBA plugins are fully supported. The multiple thread support will be delivered in future releases. -For more information, check the design https://github.com/velero-io/velero/blob/main/design/backup-performance-improvements.md. +For more information, check the design https://github.com/vmware-tanzu/velero/blob/main/design/backup-performance-improvements.md. #### Node selection for repository maintenance job Repository maintenance are resource consuming tasks, Velero now allows you to configure the nodes to run repository maintenance jobs, so that you can run repository maintenance jobs in idle nodes or avoid them to run in nodes hosting critical workloads. @@ -50,9 +50,9 @@ For more information, check the document https://velero.io/docs/v1.15/backup-rep #### Performance improvements In 1.15, several performance related issues/enhancements are included, which makes significant performance improvements in specific scenarios: -- There was a memory leak of Velero server after plugin calls, now it is fixed, see issue https://github.com/velero-io/velero/issues/7925 -- The `client-burst/client-qps` parameters are automatically inherited to plugins, so that you can use the same velero server parameters to accelerate the plugin executions when large number of API server calls happen, see issue https://github.com/velero-io/velero/issues/7806 -- Maintenance of Kopia repository takes huge memory in scenarios that huge number of files have been backed up, Velero 1.15 has included the Kopia upstream enhancement to fix the problem, see issue https://github.com/velero-io/velero/issues/7510 +- There was a memory leak of Velero server after plugin calls, now it is fixed, see issue https://github.com/vmware-tanzu/velero/issues/7925 +- The `client-burst/client-qps` parameters are automatically inherited to plugins, so that you can use the same velero server parameters to accelerate the plugin executions when large number of API server calls happen, see issue https://github.com/vmware-tanzu/velero/issues/7806 +- Maintenance of Kopia repository takes huge memory in scenarios that huge number of files have been backed up, Velero 1.15 has included the Kopia upstream enhancement to fix the problem, see issue https://github.com/vmware-tanzu/velero/issues/7510 ### Runtime and dependencies Golang runtime: v1.22.8 @@ -65,7 +65,7 @@ Therefore, a user option is added in the same backup PVC configuration configMap ### Breaking changes #### Deprecation of Restic -Restic path for fs-backup is in deprecation process starting from 1.15. According to [Velero deprecation policy](https://github.com/velero-io/velero/blob/v1.15/GOVERNANCE.md#deprecation-policy), for 1.15, if Restic path is used the backup/restore of fs-backup still creates and succeeds, but you will see warnings in below scenarios: +Restic path for fs-backup is in deprecation process starting from 1.15. According to [Velero deprecation policy](https://github.com/vmware-tanzu/velero/blob/v1.15/GOVERNANCE.md#deprecation-policy), for 1.15, if Restic path is used the backup/restore of fs-backup still creates and succeeds, but you will see warnings in below scenarios: - When `--uploader-type=restic` is used in Velero installation - When Restic path is used to create backup/restore of fs-backup @@ -83,7 +83,7 @@ In 1.15, below Velero server parameters for repository maintenance jobs are move ``` #### Changing PVC selected-node feature is deprecated -In 1.15, the [Changing PVC selected-node feature](https://velero.io/docs/v1.15/restore-reference/#changing-pvc-selected-node) enters deprecation process and will be removed in future releases according to [Velero deprecation policy](https://github.com/velero-io/velero/blob/v1.15/GOVERNANCE.md#deprecation-policy). Usage of this feature for any purpose is not recommended. +In 1.15, the [Changing PVC selected-node feature](https://velero.io/docs/v1.15/restore-reference/#changing-pvc-selected-node) enters deprecation process and will be removed in future releases according to [Velero deprecation policy](https://github.com/vmware-tanzu/velero/blob/v1.15/GOVERNANCE.md#deprecation-policy). Usage of this feature for any purpose is not recommended. ### All Changes * add no-relabeling option to backupPVC configmap (#8288, @sseago) diff --git a/changelogs/CHANGELOG-1.16.md b/changelogs/CHANGELOG-1.16.md index b33ae4497..fa8793f16 100644 --- a/changelogs/CHANGELOG-1.16.md +++ b/changelogs/CHANGELOG-1.16.md @@ -1,7 +1,7 @@ ## v1.16 ### Download -https://github.com/velero-io/velero/releases/tag/v1.16.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.16.0 ### Container Image `velero/velero:v1.16.0` @@ -15,28 +15,28 @@ https://velero.io/docs/v1.16/upgrade-to-1.16/ ### Highlights #### Windows cluster support In v1.16, Velero supports to run in Windows clusters and backup/restore Windows workloads, either stateful or stateless: - * Hybrid build and all-in-one image: the build process is enhanced to build an all-in-one image for hybrid CPU architecture and hybrid platform. For more information, check the design https://github.com/velero-io/velero/blob/main/design/multiple-arch-build-with-windows.md + * Hybrid build and all-in-one image: the build process is enhanced to build an all-in-one image for hybrid CPU architecture and hybrid platform. For more information, check the design https://github.com/vmware-tanzu/velero/blob/main/design/multiple-arch-build-with-windows.md * Deployment in Windows clusters: Velero node-agent, data mover pods and maintenance jobs now support to run in both linux and Windows nodes * Data mover backup/restore Windows workloads: Velero built-in data mover supports Windows workloads throughout its full cycle, i.e., discovery, backup, restore, pre/post hook, etc. It automatically identifies Windows workloads and schedules data mover pods to the right group of nodes -Check the epic issue https://github.com/velero-io/velero/issues/8289 for more information. +Check the epic issue https://github.com/vmware-tanzu/velero/issues/8289 for more information. #### Parallel Item Block backup v1.16 now supports to back up item blocks in parallel. Specifically, during backup, correlated resources are grouped in item blocks and Velero backup engine creates a thread pool to back up the item blocks in parallel. This significantly improves the backup throughput, especially when there are large scale of resources. Pre/post hooks also belongs to item blocks, so will also run in parallel along with the item blocks. Users are allowed to configure the parallelism through the `--item-block-worker-count` Velero server parameter. If not configured, the default parallelism is 1. -For more information, check issue https://github.com/velero-io/velero/issues/8334. +For more information, check issue https://github.com/vmware-tanzu/velero/issues/8334. #### Data mover restore enhancement in scalability -In previous releases, for each volume of WaitForFirstConsumer mode, data mover restore is only allowed to happen in the node that the volume is attached. This severely degrades the parallelism and the balance of node resource(CPU, memory, network bandwidth) consumption for data mover restore (https://github.com/velero-io/velero/issues/8044). +In previous releases, for each volume of WaitForFirstConsumer mode, data mover restore is only allowed to happen in the node that the volume is attached. This severely degrades the parallelism and the balance of node resource(CPU, memory, network bandwidth) consumption for data mover restore (https://github.com/vmware-tanzu/velero/issues/8044). -In v1.16, users are allowed to configure data mover restores running and spreading evenly across all nodes in the cluster. The configuration is done through a new flag `ignoreDelayBinding` in node-agent configuration (https://github.com/velero-io/velero/issues/8242). +In v1.16, users are allowed to configure data mover restores running and spreading evenly across all nodes in the cluster. The configuration is done through a new flag `ignoreDelayBinding` in node-agent configuration (https://github.com/vmware-tanzu/velero/issues/8242). #### Data mover enhancements in observability In 1.16, some observability enhancements are added: - * Output various statuses of intermediate objects for failures of data mover backup/restore (https://github.com/velero-io/velero/issues/8267) - * Output the errors when Velero fails to delete intermediate objects during clean up (https://github.com/velero-io/velero/issues/8125) + * Output various statuses of intermediate objects for failures of data mover backup/restore (https://github.com/vmware-tanzu/velero/issues/8267) + * Output the errors when Velero fails to delete intermediate objects during clean up (https://github.com/vmware-tanzu/velero/issues/8125) The outputs are in the same node-agent log and enabled automatically. @@ -45,24 +45,24 @@ In previous releases, a unnecessary VolumeSnapshotContent object is retained for In 1.16, the retained VolumeSnapshotContent is removed from the backup, so no unnecessary CSI objects are synced or restored. -For more information, check issue https://github.com/velero-io/velero/issues/8725. +For more information, check issue https://github.com/vmware-tanzu/velero/issues/8725. #### Backup Repository Maintenance enhancement in resiliency and observability In v1.16, some enhancements of backup repository maintenance are added to improve the observability and resiliency: - * A new backup repository maintenance history section, called `RecentMaintenance`, is added to the BackupRepository CR. Specifically, for each BackupRepository, including start/completion time, completion status and error message. (https://github.com/velero-io/velero/issues/7810) - * Running maintenance jobs are now recaptured after Velero server restarts. (https://github.com/velero-io/velero/issues/7753) - * The maintenance job will not be launched for readOnly BackupStorageLocation. (https://github.com/velero-io/velero/issues/8238) - * The backup repository will not try to initialize a new repository for readOnly BackupStorageLocation. (https://github.com/velero-io/velero/issues/8091) - * Users now are allowed to configure the intervals of an effective maintenance in the way of `normalGC`, `fastGC` and `eagerGC`, through the `fullMaintenanceInterval` parameter in backupRepository configuration. (https://github.com/velero-io/velero/issues/8364) + * A new backup repository maintenance history section, called `RecentMaintenance`, is added to the BackupRepository CR. Specifically, for each BackupRepository, including start/completion time, completion status and error message. (https://github.com/vmware-tanzu/velero/issues/7810) + * Running maintenance jobs are now recaptured after Velero server restarts. (https://github.com/vmware-tanzu/velero/issues/7753) + * The maintenance job will not be launched for readOnly BackupStorageLocation. (https://github.com/vmware-tanzu/velero/issues/8238) + * The backup repository will not try to initialize a new repository for readOnly BackupStorageLocation. (https://github.com/vmware-tanzu/velero/issues/8091) + * Users now are allowed to configure the intervals of an effective maintenance in the way of `normalGC`, `fastGC` and `eagerGC`, through the `fullMaintenanceInterval` parameter in backupRepository configuration. (https://github.com/vmware-tanzu/velero/issues/8364) #### Volume Policy enhancement of filtering volumes by PVC labels -In v1.16, Volume Policy is extended to support filtering volumes by PVC labels. (https://github.com/velero-io/velero/issues/8256). +In v1.16, Volume Policy is extended to support filtering volumes by PVC labels. (https://github.com/vmware-tanzu/velero/issues/8256). #### Resource Status restore per object -In v1.16, users are allowed to define whether to restore resource status per object through an annotation `velero.io/restore-status` set on the object. (https://github.com/velero-io/velero/issues/8204). +In v1.16, users are allowed to define whether to restore resource status per object through an annotation `velero.io/restore-status` set on the object. (https://github.com/vmware-tanzu/velero/issues/8204). #### Velero Restore Helper binary is merged into Velero image -In v1.16, Velero banaries, i.e., velero, velero-helper and velero-restore-helper, are all included into the single Velero image. (https://github.com/velero-io/velero/issues/8484). +In v1.16, Velero banaries, i.e., velero, velero-helper and velero-restore-helper, are all included into the single Velero image. (https://github.com/vmware-tanzu/velero/issues/8484). ### Runtime and dependencies Golang runtime: 1.23.7 diff --git a/changelogs/CHANGELOG-1.17.md b/changelogs/CHANGELOG-1.17.md index 85fa75557..54e1c22dc 100644 --- a/changelogs/CHANGELOG-1.17.md +++ b/changelogs/CHANGELOG-1.17.md @@ -1,7 +1,7 @@ ## v1.17 ### Download -https://github.com/velero-io/velero/releases/tag/v1.17.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.17.0 ### Container Image `velero/velero:v1.17.0` @@ -19,11 +19,11 @@ In v1.17, Velero fs-backup is modernized to the micro-service architecture, whic - fs-backup is more robust, the running backup/restore could survive from node-agent restart; and the resource allocation is in a more granular manner, the failure of one backup/restore won't impact others. - The resource usage of node-agent is steady, especially, the node-agent pods won't request huge memory and hold it for a long time. -Check design https://github.com/velero-io/velero/blob/main/design/vgdp-micro-service-for-fs-backup/vgdp-micro-service-for-fs-backup.md for more details. +Check design https://github.com/vmware-tanzu/velero/blob/main/design/vgdp-micro-service-for-fs-backup/vgdp-micro-service-for-fs-backup.md for more details. #### fs-backup support Windows cluster In v1.17, Velero fs-backup supports to backup/restore Windows workloads. By leveraging the new micro-service architecture for fs-backup, data mover pods could run in Windows nodes and backup/restore Windows volumes. Together with CSI snapshot data movement for Windows which is delivered in 1.16, Velero now supports Windows workload backup/restore in full scenarios. -Check design https://github.com/velero-io/velero/blob/main/design/vgdp-micro-service-for-fs-backup/vgdp-micro-service-for-fs-backup.md for more details. +Check design https://github.com/vmware-tanzu/velero/blob/main/design/vgdp-micro-service-for-fs-backup/vgdp-micro-service-for-fs-backup.md for more details. #### Volume group snapshot support In v1.17, Velero supports [volume group snapshots](https://kubernetes.io/blog/2024/12/18/kubernetes-1-32-volume-group-snapshot-beta/) which is a beta feature in Kubernetes upstream, for both CSI snapshot backup and CSI snapshot data movement. This allows a snapshot to be taken from multiple volumes at the same point-in-time to achieve write order consistency, which is helpful to achieve better data consistency when multiple volumes being backed up are correlated. @@ -31,20 +31,20 @@ Check the document https://velero.io/docs/main/volume-group-snapshots/ for more #### Priority class support In v1.17, [Kubernetes priority class](https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#priorityclass) is supported for all modules across Velero. Specifically, users are allowed to configure priority class to Velero server, node-agent, data mover pods, backup repository maintenance jobs separately. -Check design https://github.com/velero-io/velero/blob/main/design/Implemented/priority-class-name-support_design.md for more details. +Check design https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/priority-class-name-support_design.md for more details. #### Scalability and Resiliency improvements of data movers ##### Reduce excessive number of data mover pods in Pending state In v1.17, Velero allows users to set a `PrepareQueueLength` in the node-agent configuration, data mover pods and volumes out of this number won't be created until data path quota is available, so that excessive number cluster resources won't be taken unnecessarily, which is particularly helpful for large scale environments. This improvement applies to all kinds of data movements, including fs-backup and CSI snapshot data movement. -Check design https://github.com/velero-io/velero/blob/main/design/node-agent-load-soothing.md for more details. +Check design https://github.com/vmware-tanzu/velero/blob/main/design/node-agent-load-soothing.md for more details. ##### Enhancement on node-agent restart handling for data movements In v1.17, data movements in all phases could survive from node-agent restart and resume themselves; when a data movement gets orphaned in special cases, e.g., cluster node absent, it could also be canceled appropriately after the restart. This improvement applies to all kinds of data movements, including fs-backup and CSI snapshot data movement. -Check issue https://github.com/velero-io/velero/issues/8534 for more details. +Check issue https://github.com/vmware-tanzu/velero/issues/8534 for more details. ##### CSI snapshot data movement restore node-selection and node-selection by storage class In v1.17, CSI snapshot data movement restore acquires the same node-selection capability as backup, that is, users could specify which nodes can/cannot run data mover pods for both backup and restore now. And users are also allowed to configure the node-selection per storage class, which is particularly helpful to the environments where a storage class are not usable by all cluster nodes. -Check issue https://github.com/velero-io/velero/issues/8186 and https://github.com/velero-io/velero/issues/8223 for more details. +Check issue https://github.com/vmware-tanzu/velero/issues/8186 and https://github.com/vmware-tanzu/velero/issues/8223 for more details. #### Include/exclude policy support for resource policy In v1.17, Velero resource policy supports `includeExcludePolicy` besides the existing `volumePolicy`. This allows users to set include/exclude filters for resources in a resource policy configmap, so that these filters are reusable among multiple backups. @@ -58,7 +58,7 @@ kopia: 0.21.1 ### Breaking changes #### Deprecation of Restic -According to [Velero deprecation policy](https://github.com/velero-io/velero/blob/main/GOVERNANCE.md#deprecation-policy), backup of fs-backup under Restic path is removed in v1.17, so `--uploader-type=restic` is not a valid installation configuration anymore. This means you cannot create a backup under Restic path, but you can still restore from the previous backups under Restic path until v1.19. +According to [Velero deprecation policy](https://github.com/vmware-tanzu/velero/blob/main/GOVERNANCE.md#deprecation-policy), backup of fs-backup under Restic path is removed in v1.17, so `--uploader-type=restic` is not a valid installation configuration anymore. This means you cannot create a backup under Restic path, but you can still restore from the previous backups under Restic path until v1.19. #### Repository maintenance job configurations are removed from Velero server parameter Since the repository maintenance job configurations are moved to repository maintenance job configMap, in v1.17 below Velero sever parameters are removed: diff --git a/changelogs/CHANGELOG-1.18.md b/changelogs/CHANGELOG-1.18.md index 358bee22e..66c486ddf 100644 --- a/changelogs/CHANGELOG-1.18.md +++ b/changelogs/CHANGELOG-1.18.md @@ -1,7 +1,7 @@ ## v1.18 ### Download -https://github.com/velero-io/velero/releases/tag/v1.18.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.18.0 ### Container Image `velero/velero:v1.18.0` @@ -16,7 +16,7 @@ https://velero.io/docs/v1.18/upgrade-to-1.18/ #### Concurrent backup In v1.18, Velero is capable to process multiple backups concurrently. This is a significant usability improvement, especially for multiple tenants or multiple users case, backups submitted from different users could run their backups simultaneously without interfering with each other. -Check design https://github.com/velero-io/velero/blob/main/design/Implemented/concurrent-backup-processing.md for more details. +Check design https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/concurrent-backup-processing.md for more details. #### Cache volume for data movers In v1.18, Velero allows users to configure cache volumes for data mover pods during restore for CSI snapshot data movement and fs-backup. This brings below benefits: @@ -24,7 +24,7 @@ In v1.18, Velero allows users to configure cache volumes for data mover pods dur - Solve the problem that multiple data mover pods fail to run concurrently in one node when the node's ephemeral disk is limited - Working together with backup repository's cache limit configuration, cache volume with appropriate size helps to improve the restore throughput -Check design https://github.com/velero-io/velero/blob/main/design/Implemented/backup-repo-cache-volume.md for more details. +Check design https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/backup-repo-cache-volume.md for more details. #### Incremental size for data movers In v1.18, Velero allows users to observe the incremental size of data movers backups for CSI snapshot data movement and fs-backup, so that users could visually see the data reduction due to incremental backup. @@ -53,7 +53,7 @@ kopia: 0.22.3 ### Breaking changes #### Deprecation of PVC selected node feature -According to [Velero deprecation policy](https://github.com/velero-io/velero/blob/main/GOVERNANCE.md#deprecation-policy), PVC selected node feature is deprecated in v1.18. Velero could appropriately handle PVC's selected-node annotation, so users don't need to do anything particularly. +According to [Velero deprecation policy](https://github.com/vmware-tanzu/velero/blob/main/GOVERNANCE.md#deprecation-policy), PVC selected node feature is deprecated in v1.18. Velero could appropriately handle PVC's selected-node annotation, so users don't need to do anything particularly. ### All Changes * Remove backup from running list when backup fails validation (#9498, @sseago) diff --git a/changelogs/CHANGELOG-1.2.md b/changelogs/CHANGELOG-1.2.md index 808111aa1..e3fd61641 100644 --- a/changelogs/CHANGELOG-1.2.md +++ b/changelogs/CHANGELOG-1.2.md @@ -2,7 +2,7 @@ #### 2019-11-07 ### Download -https://github.com/velero-io/velero/releases/tag/v1.2.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.2.0 ### Container Image `velero/velero:v1.2.0` diff --git a/changelogs/CHANGELOG-1.3.md b/changelogs/CHANGELOG-1.3.md index 6d1476431..6dbfb57d8 100644 --- a/changelogs/CHANGELOG-1.3.md +++ b/changelogs/CHANGELOG-1.3.md @@ -2,7 +2,7 @@ ### 2020-04-03 ### Download -https://github.com/velero-io/velero/releases/tag/v1.3.2 +https://github.com/vmware-tanzu/velero/releases/tag/v1.3.2 ### Container Image `velero/velero:v1.3.2` @@ -21,7 +21,7 @@ https://velero.io/docs/v1.3.2/upgrade-to-1.3/ ### 2020-03-10 ### Download -https://github.com/velero-io/velero/releases/tag/v1.3.1 +https://github.com/vmware-tanzu/velero/releases/tag/v1.3.1 ### Container Image `velero/velero:v1.3.1` @@ -44,7 +44,7 @@ Fixed a bug that caused failures when backing up CustomResourceDefinitions with #### 2020-03-02 ### Download -https://github.com/velero-io/velero/releases/tag/v1.3.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.3.0 ### Container Image `velero/velero:v1.3.0` @@ -83,10 +83,10 @@ For more information on manifest lists, see [Docker’s documentation](https://d We fixed a large number of bugs and made some smaller usability improvements in this release. Here are a few highlights: -- Support private registries with custom ports for the restic restore helper image ([PR #1999](https://github.com/velero-io/velero/pull/1999), [@cognoz](https://github.com/cognoz)) -- Use AWS profile from BackupStorageLocation when invoking restic ([PR #2096](https://github.com/velero-io/velero/pull/2096), [@dinesh](https://github.com/dinesh)) -- Allow restores from schedules in other clusters ([PR #2218](https://github.com/velero-io/velero/pull/2218), [@cpanato](https://github.com/cpanato)) -- Fix memory leak & race condition in restore code ([PR #2201](https://github.com/velero-io/velero/pull/2201), [@skriss](https://github.com/skriss)) +- Support private registries with custom ports for the restic restore helper image ([PR #1999](https://github.com/vmware-tanzu/velero/pull/1999), [@cognoz](https://github.com/cognoz)) +- Use AWS profile from BackupStorageLocation when invoking restic ([PR #2096](https://github.com/vmware-tanzu/velero/pull/2096), [@dinesh](https://github.com/dinesh)) +- Allow restores from schedules in other clusters ([PR #2218](https://github.com/vmware-tanzu/velero/pull/2218), [@cpanato](https://github.com/cpanato)) +- Fix memory leak & race condition in restore code ([PR #2201](https://github.com/vmware-tanzu/velero/pull/2201), [@skriss](https://github.com/skriss)) ### All Changes diff --git a/changelogs/CHANGELOG-1.4.md b/changelogs/CHANGELOG-1.4.md index 71d26a61d..354e68514 100644 --- a/changelogs/CHANGELOG-1.4.md +++ b/changelogs/CHANGELOG-1.4.md @@ -2,7 +2,7 @@ ### 2020-07-13 ### Download -https://github.com/velero-io/velero/releases/tag/v1.4.2 +https://github.com/vmware-tanzu/velero/releases/tag/v1.4.2 ### Container Image `velero/velero:v1.4.2` @@ -27,7 +27,7 @@ This tag was created in code, but has no associated docker image due to misconfi ### 2020-05-26 ### Download -https://github.com/velero-io/velero/releases/tag/v1.4.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.4.0 ### Container Image `velero/velero:v1.4.0` diff --git a/changelogs/CHANGELOG-1.5.md b/changelogs/CHANGELOG-1.5.md index d71ba0bf7..7013a85e7 100644 --- a/changelogs/CHANGELOG-1.5.md +++ b/changelogs/CHANGELOG-1.5.md @@ -2,7 +2,7 @@ ### 2020-09-16 ### Download -https://github.com/velero-io/velero/releases/tag/v1.5.1 +https://github.com/vmware-tanzu/velero/releases/tag/v1.5.1 ### Container Image `velero/velero:v1.5.1` @@ -57,7 +57,7 @@ Displays the Timestamps when issued a print or describe (#2748, @thejasbabu) * StorageGrid compatibility by removing explicit gzip accept header setting (#2712, @fvsqr) * restic: add support for setting SecurityContext (runAsUser, runAsGroup) for restore (#2621, @jaygridley) * Add backupValidationFailureTotal to metrics (#2714, @kathpeony) - * bump Kubernetes module dependencies to v0.18.4 to fix https://github.com/velero-io/velero/issues/2540 by adding code compatibility with kubernetes v1.18 (#2651, @laverya) + * bump Kubernetes module dependencies to v0.18.4 to fix https://github.com/vmware-tanzu/velero/issues/2540 by adding code compatibility with kubernetes v1.18 (#2651, @laverya) * Add a BSL controller to handle validation + update BSL status phase (validation removed from the server and no longer blocks when there's any invalid BSL) (#2674, @carlisia) * updated acceptable values on cron schedule from 0-7 to 0-6 (#2676, @dthrasher) * Improve velero download doc (#2660, @carlisia) diff --git a/changelogs/CHANGELOG-1.6.md b/changelogs/CHANGELOG-1.6.md index df1c24ab1..73cae45f0 100644 --- a/changelogs/CHANGELOG-1.6.md +++ b/changelogs/CHANGELOG-1.6.md @@ -2,7 +2,7 @@ ### 2021-04-12 ### Download -https://github.com/velero-io/velero/releases/tag/v1.6.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.6.0 ### Container Image `velero/velero:v1.6.0` diff --git a/changelogs/CHANGELOG-1.7.md b/changelogs/CHANGELOG-1.7.md index 5f769019a..fdff3c2b0 100644 --- a/changelogs/CHANGELOG-1.7.md +++ b/changelogs/CHANGELOG-1.7.md @@ -2,7 +2,7 @@ ### 2021-09-07 ### Download -https://github.com/velero-io/velero/releases/tag/v1.7.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.7.0 ### Container Image `velero/velero:v1.7.0` @@ -75,6 +75,6 @@ This command collects information about a Velero installation, such as pod logs * 🐛 Fix plugin name derivation from image name (#3711, @ashish-amarnath) * ✨ ⚠️ Remove CSI volumesnapshot artifact deletion -This change requires https://github.com/velero-io/velero-plugin-for-csi/pull/86 for Velero to continue +This change requires https://github.com/vmware-tanzu/velero-plugin-for-csi/pull/86 for Velero to continue deleting of CSI volumesnapshots when the corresponding backups are deleted. (#3734, @ashish-amarnath) * use unstructured to marshal selective fields for service restore action (#3789, @alaypatel07) diff --git a/changelogs/CHANGELOG-1.8.md b/changelogs/CHANGELOG-1.8.md index c45b56536..e317849d1 100644 --- a/changelogs/CHANGELOG-1.8.md +++ b/changelogs/CHANGELOG-1.8.md @@ -2,7 +2,7 @@ ### 2022-01-14 ### Download -https://github.com/velero-io/velero/releases/tag/v1.8.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.8.0 ### Container Image `velero/velero:v1.8.0` @@ -41,7 +41,7 @@ When a Backup Storage Location (BSL) is deleted, backup and Restic repository re #### Breaking changes -Starting in v1.8, Velero will only support Kubernetes v1 CRD meaning that Velero v1.8+ will only run on Kubernetes v1.16+. Before upgrading, make sure you are running a supported Kubernetes version. For more information, see our [compatibility matrix](https://github.com/velero-io/velero#velero-compatibility-matrix). +Starting in v1.8, Velero will only support Kubernetes v1 CRD meaning that Velero v1.8+ will only run on Kubernetes v1.16+. Before upgrading, make sure you are running a supported Kubernetes version. For more information, see our [compatibility matrix](https://github.com/vmware-tanzu/velero#velero-compatibility-matrix). #### Upload Progress Monitoring and Item Snapshotter Item Snapshotter plugin API was merged. This will support both Upload Progress diff --git a/changelogs/CHANGELOG-1.9.md b/changelogs/CHANGELOG-1.9.md index 7472288a5..9f887aaf5 100644 --- a/changelogs/CHANGELOG-1.9.md +++ b/changelogs/CHANGELOG-1.9.md @@ -2,7 +2,7 @@ ### 2022-06-13 ### Download -https://github.com/velero-io/velero/releases/tag/v1.9.0 +https://github.com/vmware-tanzu/velero/releases/tag/v1.9.0 ### Container Image `velero/velero:v1.9.0` @@ -20,7 +20,7 @@ https://velero.io/docs/v1.9/upgrade-to-1.9/ - No VolumeSnapshot will be left in the source namespace of the workload - Report metrics for CSI snapshots -More improvements please refer to [CSI plugin improvement](https://github.com/velero-io/velero/issues?q=is%3Aissue+label%3A%22CSI+plugin+-+GA+-+phase1%22+is%3Aclosed) +More improvements please refer to [CSI plugin improvement](https://github.com/vmware-tanzu/velero/issues?q=is%3Aissue+label%3A%22CSI+plugin+-+GA+-+phase1%22+is%3Aclosed) With these improvements we'll provide official support for CSI snapshots on AKS/EKS clusters. (with CSI plugin v0.3.0) diff --git a/cmd/velero/velero.go b/cmd/velero/velero.go index 6b150b844..07be4a884 100644 --- a/cmd/velero/velero.go +++ b/cmd/velero/velero.go @@ -22,8 +22,8 @@ import ( "k8s.io/klog/v2" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/velero" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/velero" ) func main() { diff --git a/design/2082-bsl-delete-associated-resources_design.md b/design/2082-bsl-delete-associated-resources_design.md index 907d10bcf..da5ac0bf0 100644 --- a/design/2082-bsl-delete-associated-resources_design.md +++ b/design/2082-bsl-delete-associated-resources_design.md @@ -20,7 +20,7 @@ Update the `velero backup-location delete ` command to delete associat ## Non Goals -[It was suggested](https://github.com/velero-io/velero/issues/2082#issuecomment-827951311) to fix bug #2697 alongside this issue. +[It was suggested](https://github.com/vmware-tanzu/velero/issues/2082#issuecomment-827951311) to fix bug #2697 alongside this issue. However, I think that should be fixed separately because although it is similar (restore objects are not being deleted), it is also quite different. One is adding a command feature update (this issue) and the other is a bug fix and each affect different parts of the code base. @@ -31,7 +31,7 @@ Update the `velero backup-location delete ` command to do the followin - find in the same Velero namespace from which the BSL was deleted the associated backup resources and Restic repositories, called "backups.velero.io" and "resticrepositories.velero.io" respectively - delete the resources found -The above logic will be added to [where BSLs are deleted](https://github.com/velero-io/velero/blob/main/pkg/cmd/cli/backuplocation/delete.go). +The above logic will be added to [where BSLs are deleted](https://github.com/vmware-tanzu/velero/blob/main/pkg/cmd/cli/backuplocation/delete.go). ## Alternative Considered diff --git a/design/Implemented/Extend-VolumePolicies-to-support-more-actions.md b/design/Implemented/Extend-VolumePolicies-to-support-more-actions.md index 2798dc5bd..e1503dba5 100644 --- a/design/Implemented/Extend-VolumePolicies-to-support-more-actions.md +++ b/design/Implemented/Extend-VolumePolicies-to-support-more-actions.md @@ -2,7 +2,7 @@ ## Abstract -Currently, the [VolumePolicies feature](https://github.com/velero-io/velero/blob/main/design/Implemented/handle-backup-of-volumes-by-resources-filters.md) which can be used to filter/handle volumes during backup only supports the skip action on matching conditions. Users need more actions to be supported. +Currently, the [VolumePolicies feature](https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/handle-backup-of-volumes-by-resources-filters.md) which can be used to filter/handle volumes during backup only supports the skip action on matching conditions. Users need more actions to be supported. ## Background @@ -58,17 +58,17 @@ volumePolicies: ``` ## High-Level Design - When the VolumePolicy action is set as `fs-backup` the backup workflow modifications would be: - - We call [backupItem() -> backupItemInternal()](https://github.com/velero-io/velero/blob/main/pkg/backup/item_backupper.go#L95) on all the items that are to be backed up - - Here when we encounter [Pod as an item ](https://github.com/velero-io/velero/blob/main/pkg/backup/item_backupper.go#L195) + - We call [backupItem() -> backupItemInternal()](https://github.com/vmware-tanzu/velero/blob/main/pkg/backup/item_backupper.go#L95) on all the items that are to be backed up + - Here when we encounter [Pod as an item ](https://github.com/vmware-tanzu/velero/blob/main/pkg/backup/item_backupper.go#L195) - We will have to modify the backup workflow to account for the `fs-backup` VolumePolicy action - When the VolumePolicy action is set as `snapshot` the backup workflow modifications would be: - - Once again, We call [backupItem() -> backupItemInternal()](https://github.com/velero-io/velero/blob/main/pkg/backup/item_backupper.go#L95) on all the items that are to be backed up - - Here when we encounter [Persistent Volume as an item](https://github.com/velero-io/velero/blob/d4128542590470b204a642ee43311921c11db880/pkg/backup/item_backupper.go#L253) - - And we call the [takePVSnapshot func](https://github.com/velero-io/velero/blob/d4128542590470b204a642ee43311921c11db880/pkg/backup/item_backupper.go#L508) + - Once again, We call [backupItem() -> backupItemInternal()](https://github.com/vmware-tanzu/velero/blob/main/pkg/backup/item_backupper.go#L95) on all the items that are to be backed up + - Here when we encounter [Persistent Volume as an item](https://github.com/vmware-tanzu/velero/blob/d4128542590470b204a642ee43311921c11db880/pkg/backup/item_backupper.go#L253) + - And we call the [takePVSnapshot func](https://github.com/vmware-tanzu/velero/blob/d4128542590470b204a642ee43311921c11db880/pkg/backup/item_backupper.go#L508) - We need to modify the takePVSnapshot function to account for the `snapshot` VolumePolicy action. - - In case of csi snapshots for PVC objects, these snapshot actions are taken by the velero-plugin-for-csi, we need to modify the [executeActions()](https://github.com/velero-io/velero/blob/512fe0dabdcb3bbf1ca68a9089056ae549663bcf/pkg/backup/item_backupper.go#L232) function to account for the `snapshot` VolumePolicy action. + - In case of csi snapshots for PVC objects, these snapshot actions are taken by the velero-plugin-for-csi, we need to modify the [executeActions()](https://github.com/vmware-tanzu/velero/blob/512fe0dabdcb3bbf1ca68a9089056ae549663bcf/pkg/backup/item_backupper.go#L232) function to account for the `snapshot` VolumePolicy action. **Note:** `Snapshot` action can either be a native snapshot or a csi snapshot, as is the case with the current flow where velero itself makes the decision based on the backup CR. @@ -80,9 +80,9 @@ volumePolicies: - Else continue with the annotation based legacy approach workflow. - Modifications needed for `snapshot` action: - - In the [takePVSnapshot function](https://github.com/velero-io/velero/blob/d4128542590470b204a642ee43311921c11db880/pkg/backup/item_backupper.go#L508) we will check the PV fits the volume policy criteria and see if the associated action is `snapshot` + - In the [takePVSnapshot function](https://github.com/vmware-tanzu/velero/blob/d4128542590470b204a642ee43311921c11db880/pkg/backup/item_backupper.go#L508) we will check the PV fits the volume policy criteria and see if the associated action is `snapshot` - If it is not snapshot then we skip the further workflow and avoid taking the snapshot of the PV - - Similarly, For csi snapshot of PVC object, we need to do similar changes in [executeAction() function](https://github.com/velero-io/velero/blob/512fe0dabdcb3bbf1ca68a9089056ae549663bcf/pkg/backup/item_backupper.go#L348). we will check the PVC fits the volume policy criteria and see if the associated action is `snapshot` via csi plugin + - Similarly, For csi snapshot of PVC object, we need to do similar changes in [executeAction() function](https://github.com/vmware-tanzu/velero/blob/512fe0dabdcb3bbf1ca68a9089056ae549663bcf/pkg/backup/item_backupper.go#L348). we will check the PVC fits the volume policy criteria and see if the associated action is `snapshot` via csi plugin - If it is not snapshot then we skip the csi BIA execute action and avoid taking the snapshot of the PVC by not invoking the csi plugin action for the PVC **Note:** @@ -338,7 +338,7 @@ In the future, we envision the following actions that can be implemented: ## Related to Design -[Handle backup of volumes by resources filters](https://github.com/velero-io/velero/blob/main/design/Implemented/handle-backup-of-volumes-by-resources-filters.md) +[Handle backup of volumes by resources filters](https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/handle-backup-of-volumes-by-resources-filters.md) ## Alternatives Considered Same as the earlier design as this is an extension of the original VolumePolicies design \ No newline at end of file diff --git a/design/Implemented/clean_artifacts_in_csi_flow.md b/design/Implemented/clean_artifacts_in_csi_flow.md index 2f1b18181..2d42bb2a9 100644 --- a/design/Implemented/clean_artifacts_in_csi_flow.md +++ b/design/Implemented/clean_artifacts_in_csi_flow.md @@ -371,4 +371,4 @@ In this design, no new information is added in backup and restore. As a result, ## Open Issues Please notice the CSI snapshot backup and restore mechanism not supporting all file-store-based volume, e.g. Azure Files, EFS or vSphere CNS File Volume. Only block-based volumes are supported. -Refer to [this comment](https://github.com/velero-io/velero/issues/3151#issuecomment-2623507686) for more details. +Refer to [this comment](https://github.com/vmware-tanzu/velero/issues/3151#issuecomment-2623507686) for more details. diff --git a/design/Implemented/cluster-scope-resource-filter.md b/design/Implemented/cluster-scope-resource-filter.md index a5ae5ea75..37267c5ac 100644 --- a/design/Implemented/cluster-scope-resource-filter.md +++ b/design/Implemented/cluster-scope-resource-filter.md @@ -382,7 +382,7 @@ type BackupSpec struct { ``` ## Alternatives Considered -Proposal from Jibu Data [Issue 5120](https://github.com/velero-io/velero/issues/5120#issue-1304534563) +Proposal from Jibu Data [Issue 5120](https://github.com/vmware-tanzu/velero/issues/5120#issue-1304534563) ## Security Considerations No security impact. @@ -399,4 +399,4 @@ Plan to deprecate `IncludedResources`, `ExcludedResources` and `IncludeClusterRe ## Open Issues `LabelSelector/OrLabelSelectors` apply to namespace-scoped resources. It may be reasonable to make them also working on cluster-scoped resources. -An issue is created to trace this topic [resource label selector not work for cluster-scoped resources](https://github.com/velero-io/velero/issues/5787) +An issue is created to trace this topic [resource label selector not work for cluster-scoped resources](https://github.com/vmware-tanzu/velero/issues/5787) diff --git a/design/Implemented/custom-ca-support.md b/design/Implemented/custom-ca-support.md index b1a3936ad..05bf9e769 100644 --- a/design/Implemented/custom-ca-support.md +++ b/design/Implemented/custom-ca-support.md @@ -73,8 +73,8 @@ This same approach can be taken for CA bundles. The bundle can be stored in a secret which is referenced on the BSL and written to a temp file prior to invoking Restic. -[1](https://github.com/velero-io/velero/blob/main/pkg/restic/repository_manager.go#L238-L245) -[2](https://github.com/velero-io/velero/blob/main/pkg/restic/common.go#L168-L203) +[1](https://github.com/vmware-tanzu/velero/blob/main/pkg/restic/repository_manager.go#L238-L245) +[2](https://github.com/vmware-tanzu/velero/blob/main/pkg/restic/common.go#L168-L203) ## Detailed Design @@ -126,7 +126,7 @@ would look like: $ velero client config set cacert PATH ``` -[1]: https://github.com/velero-io/velero-plugin-for-aws/blob/main/velero-plugin-for-aws/object_store.go#L135 -[2]: https://github.com/velero-io/velero/blob/main/pkg/restic/command.go#L47 +[1]: https://github.com/vmware-tanzu/velero-plugin-for-aws/blob/main/velero-plugin-for-aws/object_store.go#L135 +[2]: https://github.com/vmware-tanzu/velero/blob/main/pkg/restic/command.go#L47 [3]: https://github.com/restic/restic/blob/main/internal/backend/http_transport.go#L81 -[4]: https://github.com/velero-io/velero-plugin-for-aws/blob/main/velero-plugin-for-aws/object_store.go#L154 +[4]: https://github.com/vmware-tanzu/velero-plugin-for-aws/blob/main/velero-plugin-for-aws/object_store.go#L154 diff --git a/design/Implemented/existing-resource-policy_design.md b/design/Implemented/existing-resource-policy_design.md index 0c4bd84d3..7d119b8e7 100644 --- a/design/Implemented/existing-resource-policy_design.md +++ b/design/Implemented/existing-resource-policy_design.md @@ -8,12 +8,12 @@ As of Today, Velero will skip over the restoration of resources that already exi - Fetches the `service` from the cluster - If the `service` exists then: - Checks whether the `service` instance in the cluster is equal to the `service` instance present in backup - - If not equal then skips the restore of the `service` and adds a restore warning (except for [ServiceAccount objects](https://github.com/velero-io/velero/blob/574baeb3c920f97b47985ec3957debdc70bcd5f8/pkg/restore/restore.go#L1246)) + - If not equal then skips the restore of the `service` and adds a restore warning (except for [ServiceAccount objects](https://github.com/vmware-tanzu/velero/blob/574baeb3c920f97b47985ec3957debdc70bcd5f8/pkg/restore/restore.go#L1246)) - If equal then skips the restore of the `service` and mentions that the restore of resource `service` is skipped in logs It is desired to add the functionality to specify whether or not to overwrite the instance of resource `service` in cluster with the one present in backup during the restore process. -Related issue: https://github.com/velero-io/velero/issues/4066 +Related issue: https://github.com/vmware-tanzu/velero/issues/4066 ## Goals - Add support for `ExistingResourcePolicy` to restore API for Kubernetes resources. @@ -31,7 +31,7 @@ Related issue: https://github.com/velero-io/velero/issues/4066 ### A. Production Cluster - Backup Cluster: Let's say you have a Backup Cluster which is identical to the Production Cluster. After some operations/usage/time the Production Cluster had changed itself, there might be new deployments, some secrets might have been updated. Now, this means that the Backup cluster will no longer be identical to the Production Cluster. In order to keep the Backup Cluster up to date/identical to the Production Cluster with respect to Kubernetes resources except PV data we would like to use Velero for scheduling new backups which would in turn help us update the Backup Cluster via Velero restore. -Reference: https://github.com/velero-io/velero/issues/4066#issuecomment-954320686 +Reference: https://github.com/vmware-tanzu/velero/issues/4066#issuecomment-954320686 ### B. Help identify resource delta: Here delta resources mean the resources restored by a previous backup, but they are no longer in the latest backup. Let's follow a sequence of steps to understand this scenario: @@ -43,7 +43,7 @@ Here delta resources mean the resources restored by a previous backup, but they - So the Delta here is (|Cluster B - Backup2|), Delete P1 and Update P2. - During Restore time we would want the Restore to help us identify this resource delta. -Reference: https://github.com/velero-io/velero/pull/4613#issuecomment-1027260446 +Reference: https://github.com/vmware-tanzu/velero/pull/4613#issuecomment-1027260446 ## High-Level Design ### Approach 1: Add a new spec field `existingResourcePolicy` to the Restore API @@ -238,7 +238,7 @@ IncludedResources []string } ``` -The restore workflow changes will be done [here](https://github.com/velero-io/velero/blob/b40bbda2d62af2f35d1406b9af4d387d4b396839/pkg/restore/restore.go#L1245) +The restore workflow changes will be done [here](https://github.com/vmware-tanzu/velero/blob/b40bbda2d62af2f35d1406b9af4d387d4b396839/pkg/restore/restore.go#L1245) ### CLI changes for Approach 1 We would introduce a new CLI flag called `existing-resource-policy` of string type. This flag would be used to accept the diff --git a/design/Implemented/general-progress-monitoring.md b/design/Implemented/general-progress-monitoring.md index 6f64a0d4b..35c2ed2ae 100644 --- a/design/Implemented/general-progress-monitoring.md +++ b/design/Implemented/general-progress-monitoring.md @@ -526,24 +526,24 @@ updates. Here is a list of some of these items: 1. Consts for the "Uploading" and "UploadingPartiallyFailed" phases have already been defined. These will need to be removed when the "WaitingForPluginOperations" and "WaitingForPluginOperationsPartiallyFailed" phases are defined. - - https://github.com/velero-io/velero/pull/3805 + - https://github.com/vmware-tanzu/velero/pull/3805 1. Remove the ItemSnapshotter plugin APIs (and related code) since the revised design will reuse VolumeSnapshotter and BackupItemAction plugins. - - https://github.com/velero-io/velero/pull/4077 - - https://github.com/velero-io/velero/pull/4417 + - https://github.com/vmware-tanzu/velero/pull/4077 + - https://github.com/vmware-tanzu/velero/pull/4417 1. UploadProgressFeatureFlag shouldn't be needed anymore. The current design won't really need a feature flag here -- the new features will be added to V2 of the VolumeSnapshotter, BackupItemAction, and RestoreItemAction plugins, and it will only be used if there are plugins which return operation IDs. - - https://github.com/velero-io/velero/pull/4416 + - https://github.com/vmware-tanzu/velero/pull/4416 1. Adds -itemsnapshots.gz file to backup (when provided) -- this is still part of the revised design, so it should stay. - - https://github.com/velero-io/velero/pull/4429 + - https://github.com/vmware-tanzu/velero/pull/4429 1. Upload Progress Monitoring and Item Snapshotter basic support: This PR is not yet merged, so nothing will need to be reverted. While the implementation here will be useful in informing the implementation of the new design, several things have changed in the design proposal since the PR was written. - - https://github.com/velero-io/velero/pull/4467 + - https://github.com/vmware-tanzu/velero/pull/4467 # Implementation tasks diff --git a/design/Implemented/include-exclude-in-resource-policy.md b/design/Implemented/include-exclude-in-resource-policy.md index ead936ddb..ddba2a874 100644 --- a/design/Implemented/include-exclude-in-resource-policy.md +++ b/design/Implemented/include-exclude-in-resource-policy.md @@ -4,7 +4,7 @@ This enhancement will allow the user to set include and exclude filters for reso these filters are reusable and the user will not need to set them each time they create a backup. ## Background -As mentioned in issue [#8610](https://github.com/velero-io/velero/issues/8610). When there's a long list of resources +As mentioned in issue [#8610](https://github.com/vmware-tanzu/velero/issues/8610). When there's a long list of resources to include or exclude in a backup, it can be cumbersome to set them each time a backup is created. There's a requirement to set these filters in a separate data structure so that they can be reused in multiple backups. diff --git a/design/Implemented/json-substitution-action-design.md b/design/Implemented/json-substitution-action-design.md index f48834e76..102503beb 100644 --- a/design/Implemented/json-substitution-action-design.md +++ b/design/Implemented/json-substitution-action-design.md @@ -150,7 +150,7 @@ Compatibility with existing StorageClass mapping RestoreItemAction and similar p ## Implementation - Changes in Restore CRD. Add a new field to the RestoreSpec to reference the configmap. -- One example of where code will be modified: https://github.com/velero-io/velero/blob/eeee4e06d209df7f08bfabda326b27aaf0054759/pkg/restore/restore.go#L1266 On the obj before Creation, we can apply the conditions to check if the resource is filtered out using given parameters. Then using JsonPatch provided, we can update the resource. +- One example of where code will be modified: https://github.com/vmware-tanzu/velero/blob/eeee4e06d209df7f08bfabda326b27aaf0054759/pkg/restore/restore.go#L1266 On the obj before Creation, we can apply the conditions to check if the resource is filtered out using given parameters. Then using JsonPatch provided, we can update the resource. - For Jsonpatch - https://github.com/evanphx/json-patch library is used. - JSON Patch RFC https://datatracker.ietf.org/doc/html/rfc6902 diff --git a/design/Implemented/merge-patch-and-strategic-in-resource-modifier.md b/design/Implemented/merge-patch-and-strategic-in-resource-modifier.md index a5f34317a..a8127bc49 100644 --- a/design/Implemented/merge-patch-and-strategic-in-resource-modifier.md +++ b/design/Implemented/merge-patch-and-strategic-in-resource-modifier.md @@ -49,7 +49,7 @@ This proposal is to add support for JSON Merge Patch and Strategic Merge Patch i - New fields `MergePatches` and `StrategicPatches` will be added to the `ResourceModifierRule` struct to support all three patch types. - Only one of the three patch types can be specified in a single `ResourceModifierRule`. - Add wildcard support for `groupResource` in `conditions` struct. -- The workflow to create Resource Modifier ConfigMap and reference it in RestoreSpec will remain the same as described in document [Resource Modifiers](https://github.com/velero-io/velero/blob/main/site/content/docs/main/restore-resource-modifiers.md). +- The workflow to create Resource Modifier ConfigMap and reference it in RestoreSpec will remain the same as described in document [Resource Modifiers](https://github.com/vmware-tanzu/velero/blob/main/site/content/docs/main/restore-resource-modifiers.md). ### How to choose the right patch type - [JSON Merge Patch](https://datatracker.ietf.org/doc/html/rfc7386) is a naively simple format, with limited usability. Probably it is a good choice if you are building something small, with very simple JSON Schema. @@ -187,7 +187,7 @@ Compatible with current Resource Modifiers. ## Future enhancements - add a Velero subcommand to generate/validate the patchData for Strategic Merge Patch and JSON Merge Patch. -- add jq support for more complex conditions or patches, to meet the situations that the current conditions or patches can not handle. like [this issue](https://github.com/velero-io/velero/issues/6344) +- add jq support for more complex conditions or patches, to meet the situations that the current conditions or patches can not handle. like [this issue](https://github.com/vmware-tanzu/velero/issues/6344) ## Open Issues N/A diff --git a/design/Implemented/move-gh-org.md b/design/Implemented/move-gh-org.md index 0a2102257..0d76a748a 100644 --- a/design/Implemented/move-gh-org.md +++ b/design/Implemented/move-gh-org.md @@ -17,7 +17,7 @@ Currently, the Velero repository sits under the Heptio GitHub organization. With #### Pre move - [ ] PR: Blog post communicating the move. https://github.com/heptio/velero/issues/1841. Who: TBD. -- [ ] PR: Find/replace in all Go, script, yaml, documentation, and website files: `github.com/heptio/velero -> github.com/velero-io/velero`. Who: a Velero developer; TBD +- [ ] PR: Find/replace in all Go, script, yaml, documentation, and website files: `github.com/heptio/velero -> github.com/vmware-tanzu/velero`. Who: a Velero developer; TBD - [ ] PR: Update website with the correct GH links. Who: a Velero developer; TBD - [ ] PR: Change deployment and grpc-push scripts with the new location path. Who: a Velero developer; TBD - [ ] Delete branches not to be carried over (https://github.com/heptio/velero/branches/all). Who: Any of the current repo owners; TBD @@ -32,7 +32,7 @@ Currently, the Velero repository sits under the Heptio GitHub organization. With #### Post move -- [ ] Each individual developer should point their origin to the new location: `git remote set-url origin git@github.com:velero-io/velero.git` +- [ ] Each individual developer should point their origin to the new location: `git remote set-url origin git@github.com:vmware-tanzu/velero.git` - [ ] Transfer ZenHub. Who: Any of the new repo owners; TBD - [ ] Update Netlify deploy settings. Any of the new repo owners; TBD - [ ] GH app: Netlify integration. Who: Any of the new repo owners; TBD diff --git a/design/Implemented/multiple-csi-volumesnapshotclass-support.md b/design/Implemented/multiple-csi-volumesnapshotclass-support.md index a1fa1557e..089557193 100644 --- a/design/Implemented/multiple-csi-volumesnapshotclass-support.md +++ b/design/Implemented/multiple-csi-volumesnapshotclass-support.md @@ -95,7 +95,7 @@ The Velero CSI plugin chooses the VolumeSnapshotClass in the cluster that has th We can add support for - velero backup create my-backup --annotations "velero.io/csi:csi.cloud.disk.driver=csi-diskdriver-snapclass" ### Stage 2 Approach -The above annotations route is to get started and for initial design closure/ implementation, north star is to either introduce CSI specific fields (considering that CSI might be a very core part of velero going forward) in the backup/restore CR OR leverage the pluginInputs field as being tracked in: https://github.com/velero-io/velero/pull/5981 +The above annotations route is to get started and for initial design closure/ implementation, north star is to either introduce CSI specific fields (considering that CSI might be a very core part of velero going forward) in the backup/restore CR OR leverage the pluginInputs field as being tracked in: https://github.com/vmware-tanzu/velero/pull/5981 Refer section Alternatives 2. **Through generic property bag in the velero contracts**: in the design doc for more details on the pluginInputs field. diff --git a/design/Implemented/multiple-label-selectors_design.md b/design/Implemented/multiple-label-selectors_design.md index d4d9e144b..9c301f3b5 100644 --- a/design/Implemented/multiple-label-selectors_design.md +++ b/design/Implemented/multiple-label-selectors_design.md @@ -14,7 +14,7 @@ backup for resources consisting of a label from a set of labels (label1 OR label create multiple backups per label rule. It would be really useful if Velero Backup API could respect a set of labels (OR Rule) for a single backup request. -Related Issue: https://github.com/velero-io/velero/issues/1508 +Related Issue: https://github.com/vmware-tanzu/velero/issues/1508 ## Goals - Enable support for backing up resources based on multiple labels (OR Logic) in a single backup config. @@ -130,9 +130,9 @@ OrLabelSelectors []\*metav1.LabelSelector ``` The logic to collect resources to be backed up for a particular backup will be updated in the `backup/item_collector.go` -around [here](https://github.com/velero-io/velero/blob/574baeb3c920f97b47985ec3957debdc70bcd5f8/pkg/backup/item_collector.go#L294). +around [here](https://github.com/vmware-tanzu/velero/blob/574baeb3c920f97b47985ec3957debdc70bcd5f8/pkg/backup/item_collector.go#L294). -And for filtering the resources to be restored, the changes will go [here](https://github.com/velero-io/velero/blob/d1063bda7e513150fd9ae09c3c3c8b1115cb1965/pkg/restore/restore.go#L1769) +And for filtering the resources to be restored, the changes will go [here](https://github.com/vmware-tanzu/velero/blob/d1063bda7e513150fd9ae09c3c3c8b1115cb1965/pkg/restore/restore.go#L1769) **Note:** - This feature will not be exposed via Velero CLI. \ No newline at end of file diff --git a/design/Implemented/plugin-backup-and-restore-progress-design.md b/design/Implemented/plugin-backup-and-restore-progress-design.md index f3eefd0b5..46544f01b 100644 --- a/design/Implemented/plugin-backup-and-restore-progress-design.md +++ b/design/Implemented/plugin-backup-and-restore-progress-design.md @@ -154,7 +154,7 @@ In order to know the CR created for the particular backup of a volume, Velero ad - `velero.io/pv-name` with value as volume that is undergoing backup Backup name being unique won't cause issues like duplicates in identifying the CR. -Labels will be set with the value returned from `GetValidName` function. (https://github.com/velero-io/velero/blob/main/pkg/label/label.go#L35). +Labels will be set with the value returned from `GetValidName` function. (https://github.com/vmware-tanzu/velero/blob/main/pkg/label/label.go#L35). If Plugin supports showing progress of the operation it is performing, it does following: - finds the VolumePluginBackup CR related to this backup operation by using `tags` passed in CreateSnapshot call @@ -281,7 +281,7 @@ In order to know the CR created for the particular restore of a volume, Velero a - `velero.io/snapshot-id` with value as snapshot id that need to be restored - `velero.io/provider` with value as `Provider` in `VolumeSnapshotLocation` -Labels will be set with the value returned from `GetValidName` function. (https://github.com/velero-io/velero/blob/main/pkg/label/label.go#L35). +Labels will be set with the value returned from `GetValidName` function. (https://github.com/vmware-tanzu/velero/blob/main/pkg/label/label.go#L35). Plugin will be able to identify CR by using snapshotID that it received as parameter of CreateVolumeFromSnapshot API, and plugin's Provider name. It updates the progress of restore operation regularly if plugin supports feature of showing progress. @@ -376,7 +376,7 @@ In order to know the CR created for the particular backup of a volume, volume sn Backup name being unique won't cause issues like duplicates in identifying the CR. -Plugin need to sanitize the value that can be set for above labels. Label need to be set with the value returned from `GetValidName` function. (https://github.com/velero-io/velero/blob/main/pkg/label/label.go#L35). +Plugin need to sanitize the value that can be set for above labels. Label need to be set with the value returned from `GetValidName` function. (https://github.com/vmware-tanzu/velero/blob/main/pkg/label/label.go#L35). Though no restrictions are required on the name of CR, as a general practice, volume snapshotter can name this CR with the value same as return value of CreateSnapshot. diff --git a/design/Implemented/plugin-versioning.md b/design/Implemented/plugin-versioning.md index 99e3eaae0..43b236f96 100644 --- a/design/Implemented/plugin-versioning.md +++ b/design/Implemented/plugin-versioning.md @@ -92,7 +92,7 @@ type ObjectStore interface { If a method is being added to the `ObjectStore` API, a file would be added to `pkg/plugin/velero/objectstore/v2/` and may contain a new API definition as follows: ``` -import "github.com/velero-io/velero/pkg/plugin/velero/objectstore/v1" +import "github.com/vmware-tanzu/velero/pkg/plugin/velero/objectstore/v1" type ObjectStore interface { // Import all the methods from the previous version of the API if they are to be included as is @@ -147,15 +147,15 @@ The message definitions can be shared however, so these could be extracted from ### Plugin Framework To allow plugins to register which versions of the API they implement, the plugin framework will need to be adapted to accept new versions. -Currently, the plugin manager stores a [`map[string]RestartableProcess`](https://github.com/velero-io/velero/blob/main/pkg/plugin/clientmgmt/manager.go#L69), where the string key is the binary name for the plugin process (e.g. "velero-plugin-for-aws"). -Each `RestartableProcess` contains a [`map[kindAndName]interface{}`](https://github.com/velero-io/velero/blob/main/pkg/plugin/clientmgmt/restartable_process.go#L60) which represents each of the unique plugin implementations provided by that binary. -[`kindAndName`](https://github.com/velero-io/velero/blob/main/pkg/plugin/clientmgmt/registry.go#L42) is a struct which combines the plugin kind (`ObjectStore`, `VolumeSnapshotter`) and the plugin name ("velero.io/aws", "velero.io/azure"). +Currently, the plugin manager stores a [`map[string]RestartableProcess`](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/clientmgmt/manager.go#L69), where the string key is the binary name for the plugin process (e.g. "velero-plugin-for-aws"). +Each `RestartableProcess` contains a [`map[kindAndName]interface{}`](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/clientmgmt/restartable_process.go#L60) which represents each of the unique plugin implementations provided by that binary. +[`kindAndName`](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/clientmgmt/registry.go#L42) is a struct which combines the plugin kind (`ObjectStore`, `VolumeSnapshotter`) and the plugin name ("velero.io/aws", "velero.io/azure"). Each plugin version registration must be unique (to allow for multiple versions to be implemented within the same plugin binary). This will be achieved by adding a specific registration method for each version to the Server interface in the plugin framework. For example, if adding a V2 `RestoreItemAction` plugin, the Server interface would be modified to add the `RegisterRestoreItemActionV2` method. -This would require [adding a new plugin Kind const](https://github.com/velero-io/velero/blob/main/pkg/plugin/framework/plugin_kinds.go#L28-L46) to represent the new plugin version, e.g. `PluginKindRestoreItemActionV2`. -It also requires the creation of a new implementation of the go-plugin interface ([example](https://github.com/velero-io/velero/blob/main/pkg/plugin/framework/object_store.go)) to support that version and use the generated gRPC code from the proto definition (including a client and server implementation). +This would require [adding a new plugin Kind const](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/framework/plugin_kinds.go#L28-L46) to represent the new plugin version, e.g. `PluginKindRestoreItemActionV2`. +It also requires the creation of a new implementation of the go-plugin interface ([example](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/framework/object_store.go)) to support that version and use the generated gRPC code from the proto definition (including a client and server implementation). The Server will also need to be adapted to recognize this new plugin Kind and to serve the new implementation. Existing plugin Kind consts and registration methods will be left unchanged and will correspond to the current version of the plugin APIs (assumed to be v1). @@ -241,7 +241,7 @@ In cases where the methods signatures remain the same, the adaptation layer will Examples where an adaptation may be safe: - A method signature is being changed to add a new parameter but the parameter could be optional (for example, adding a context parameter). The adaptation could call through to the method provided in the previous version but omit the parameter. - A method signature is being changed to remove a parameter, but it is safe to pass a default value to the previous version. The adaptation could call through to the method provided in the previous version but use a default value for the parameter. -- A new method is being added but does not impact any existing behaviour of Velero (for example, a new method which will allow Velero to [wait for additional items to be ready](https://github.com/velero-io/velero/blob/main/design/Implemented/wait-for-additional-items.md)). The adaptation would return a value which allows the existing behaviour to be performed. +- A new method is being added but does not impact any existing behaviour of Velero (for example, a new method which will allow Velero to [wait for additional items to be ready](https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/wait-for-additional-items.md)). The adaptation would return a value which allows the existing behaviour to be performed. - A method is being deleted as it is no longer used. The adaptation would call through to any methods which are still included but would omit the deleted method in the adaptation. Examples where an adaptation may not be safe: diff --git a/design/Implemented/pv-cloning.md b/design/Implemented/pv-cloning.md index 8140a0641..f840bda84 100644 --- a/design/Implemented/pv-cloning.md +++ b/design/Implemented/pv-cloning.md @@ -32,11 +32,11 @@ It will also update the `spec.volumeName` of the related persistent volume claim ## Detailed Design -In `pkg/restore/restore.go`, around [line 872](https://github.com/velero-io/velero/blob/main/pkg/restore/restore.go#L872), Velero has special-case code for persistent volumes. +In `pkg/restore/restore.go`, around [line 872](https://github.com/vmware-tanzu/velero/blob/main/pkg/restore/restore.go#L872), Velero has special-case code for persistent volumes. This code will be updated to check for the two preconditions described in the previous section. If the preconditions are met, the object will be given a new name. The persistent volume will also be annotated with the original name, e.g. `velero.io/original-pv-name=NAME`. -Importantly, the name change will occur **before** [line 890](https://github.com/velero-io/velero/blob/main/pkg/restore/restore.go#L890), where Velero checks to see if it should restore the persistent volume. +Importantly, the name change will occur **before** [line 890](https://github.com/vmware-tanzu/velero/blob/main/pkg/restore/restore.go#L890), where Velero checks to see if it should restore the persistent volume. Additionally, the old and new persistent volume names will be recorded in a new field that will be added to the `context` struct, `renamedPVs map[string]string`. In the special-case code for persistent volume claims starting on [line 987](https://github.com/heptio/velero/blob/main/pkg/restore/restore.go#L987), Velero will check to see if the claimed persistent volume has been renamed by looking in `ctx.renamedPVs`. diff --git a/design/Implemented/pv_backup_info.md b/design/Implemented/pv_backup_info.md index ff080a797..90cd998cb 100644 --- a/design/Implemented/pv_backup_info.md +++ b/design/Implemented/pv_backup_info.md @@ -9,7 +9,7 @@ This new additional metadata file is needed when: * Retrieve the PV's snapshot information for backup. ## Background -There is already a [PR](https://github.com/velero-io/velero/pull/6496) to track the skipped PVC in the backup. This design will depend on it and go further to get a summary of PVC and PV information, then persist into a metadata file in the backup repository. +There is already a [PR](https://github.com/vmware-tanzu/velero/pull/6496) to track the skipped PVC in the backup. This design will depend on it and go further to get a summary of PVC and PV information, then persist into a metadata file in the backup repository. In the restore process, the Velero server needs to decide how the PV resource should be restored according to how the PV is backed up. The current logic is to check whether it's backed up by Velero-native snapshot, by file-system backup, or having `DeletionPolicy` set as `Delete`. @@ -28,7 +28,7 @@ Another thing that needs noticing is when describing the backup, there is no gen ## High-Level Design Create _backup-name_-volumes-info.json metadata file in the backup's repository. This file will be encoded to contain all the PVC and PV information included in the backup. The information covers whether the PV or PVC's data is skipped during backup, how its data is backed up, and the backed-up detail information. -Please notice that the new metadata file includes all skipped volume information. This is used to address [the second phase needs of skipped volumes information](https://github.com/velero-io/velero/issues/5834#issuecomment-1526624211). +Please notice that the new metadata file includes all skipped volume information. This is used to address [the second phase needs of skipped volumes information](https://github.com/vmware-tanzu/velero/issues/5834#issuecomment-1526624211). The `restoreItem` function can decode the _backup-name_-volumes-info.json file to determine how to handle the PV resource. @@ -169,13 +169,13 @@ After introducing the VolumeInfo array, the following logic will be added. _backup-name_-volumes-info.json file is deleted during backup deletion. ## Alternatives Considered -The restore process needs more information about how the PVs are backed up to determine whether this PV should be restored. The released branches also need a similar function, but backporting a new feature into previous releases may not be a good idea, so according to [Anshul Ahuja's suggestion](https://github.com/velero-io/velero/issues/6595#issuecomment-1731081580), adding more cases here to support checking PV backed-up by CSI plugin and CSI snapshot data mover: https://github.com/velero-io/velero/blob/5ff5073cc3f364bafcfbd26755e2a92af68ba180/pkg/restore/restore.go#L1206-L1324. +The restore process needs more information about how the PVs are backed up to determine whether this PV should be restored. The released branches also need a similar function, but backporting a new feature into previous releases may not be a good idea, so according to [Anshul Ahuja's suggestion](https://github.com/vmware-tanzu/velero/issues/6595#issuecomment-1731081580), adding more cases here to support checking PV backed-up by CSI plugin and CSI snapshot data mover: https://github.com/vmware-tanzu/velero/blob/5ff5073cc3f364bafcfbd26755e2a92af68ba180/pkg/restore/restore.go#L1206-L1324. ## Security Considerations There should be no security impact introduced by this design. ## Compatibility -After this design is implemented, there should be no impact on the existing [skipped PVC summary feature](https://github.com/velero-io/velero/pull/6496). +After this design is implemented, there should be no impact on the existing [skipped PVC summary feature](https://github.com/vmware-tanzu/velero/pull/6496). To support older version backup, which doesn't have the VolumeInfo metadata file, the old logic, which is checking the Velero native snapshots list, PodVolumeBackup list, and PVC DeletionPolicy, is still kept, and supporting CSI snapshots and snapshot data mover logic will be added too. diff --git a/design/Implemented/pv_restore_info.md b/design/Implemented/pv_restore_info.md index 91df863af..d2e49655c 100644 --- a/design/Implemented/pv_restore_info.md +++ b/design/Implemented/pv_restore_info.md @@ -139,5 +139,5 @@ The data structures referenced by volume info is shared between both restore and we must make sure there will only be incremental changes to the metadata, such that no break change will be introduced to the client. ## Open Issues -https://github.com/velero-io/velero/issues/7546 -https://github.com/velero-io/velero/issues/6478 +https://github.com/vmware-tanzu/velero/issues/7546 +https://github.com/vmware-tanzu/velero/issues/6478 diff --git a/design/Implemented/repo_maintenance_job_config.md b/design/Implemented/repo_maintenance_job_config.md index cda8a9a5c..195b5b9dc 100644 --- a/design/Implemented/repo_maintenance_job_config.md +++ b/design/Implemented/repo_maintenance_job_config.md @@ -20,7 +20,7 @@ This design reuses the data structure introduced by design [Velero Generic Data - Let user can choose repository maintenance Job running on which nodes. ## Non Goals -- There was an [issue](https://github.com/velero-io/velero/issues/7911) to require the whole Job's PodSpec should be configurable. That's not in the scope of this design. +- There was an [issue](https://github.com/vmware-tanzu/velero/issues/7911) to require the whole Job's PodSpec should be configurable. That's not in the scope of this design. - Please notice this new configuration is dedicated for the repository maintenance. Repository itself configuration is not covered. @@ -43,7 +43,7 @@ Propose to deprecate the `velero server` parameters `--maintenance-job-cpu-reque That means those parameters will be deleted in release-1.17. After deletion, those resources-related parameters are replaced by the ConfigMap specified by `velero server` CLI's parameter `--repo-maintenance-job-configmap`. `--keep-latest-maintenance-jobs` is deleted from `velero server` CLI. It turns into a non-configurable internal parameter, and its value is 3. -Please check [issue 7923](https://github.com/velero-io/velero/issues/7923) for more information why deleting this parameter. +Please check [issue 7923](https://github.com/vmware-tanzu/velero/issues/7923) for more information why deleting this parameter. ## Design This design introduces a new ConfigMap specified by `velero server` CLI parameter `--repo-maintenance-job-configmap` as the source of the repository maintenance job configuration. The specified ConfigMap is read from the namespace where Velero is installed. @@ -92,7 +92,7 @@ The other keys in the map is the combination of three elements of a BackupReposi * The BackupRepository referenced BackupStorageLocation's name. * The BackupRepository's type. Possible values are `kopia` and `restic`. -Those three keys can identify a [unique BackupRepository](https://github.com/velero-io/velero/blob/2fc6300f2239f250b40b0488c35feae59520f2d3/pkg/repository/backup_repo_op.go#L32-L37). +Those three keys can identify a [unique BackupRepository](https://github.com/vmware-tanzu/velero/blob/2fc6300f2239f250b40b0488c35feae59520f2d3/pkg/repository/backup_repo_op.go#L32-L37). If there is a key match with BackupRepository, the key's value is applied to the BackupRepository's maintenance jobs. By this way, it's possible to let user configure before the BackupRepository is created. diff --git a/design/Implemented/resource-status-restore.md b/design/Implemented/resource-status-restore.md index 9d394c1b8..f57e86a4f 100644 --- a/design/Implemented/resource-status-restore.md +++ b/design/Implemented/resource-status-restore.md @@ -76,7 +76,7 @@ metadata: We are targeting the implementation of this design for Velero 1.16 release. -Current restoreStatus logic resides here: https://github.com/velero-io/velero/blob/32a8c62920ad96c70f1465252c0197b83d5fa6b6/pkg/restore/restore.go#L1652 +Current restoreStatus logic resides here: https://github.com/vmware-tanzu/velero/blob/32a8c62920ad96c70f1465252c0197b83d5fa6b6/pkg/restore/restore.go#L1652 The modified logic would look somewhat like: diff --git a/design/Implemented/restore-finalizing-phase_design.md b/design/Implemented/restore-finalizing-phase_design.md index 7e84a2e61..0d4d0170d 100644 --- a/design/Implemented/restore-finalizing-phase_design.md +++ b/design/Implemented/restore-finalizing-phase_design.md @@ -9,7 +9,7 @@ Currently, the restore process enters a terminal phase once all item restoration To address this, a new finalization phase should be added to the existing restore workflow. in this phase, all plugin operations and item restoration has been fully completed, which provides a clean opportunity to perform any wrap-up work before termination, improving the overall restore process. Wrap-up tasks in Velero can serve several purposes: -- Post-restore modification - Velero can modify the restored data that was temporarily changed for some purpose but required to be changed back finally or data that was newly created but missing some information. For example, [issue6435](https://github.com/velero-io/velero/issues/6435) indicates that some custom settings(like labels, reclaim policy) on restored PVs was lost because those restored PVs was newly dynamically provisioned. Velero can address it by patching the PVs' custom settings back in the finalization phase. +- Post-restore modification - Velero can modify the restored data that was temporarily changed for some purpose but required to be changed back finally or data that was newly created but missing some information. For example, [issue6435](https://github.com/vmware-tanzu/velero/issues/6435) indicates that some custom settings(like labels, reclaim policy) on restored PVs was lost because those restored PVs was newly dynamically provisioned. Velero can address it by patching the PVs' custom settings back in the finalization phase. - Clean up unused data - Velero can identify and delete any data that are no longer needed after a successful restore in the finalization phase. - Post-restore validation - Velero can validate the state of restored data and report any errors to help users locate the issue in the finalization phase. diff --git a/design/Implemented/restore-with-EnableAPIGroupVersions-feature.md b/design/Implemented/restore-with-EnableAPIGroupVersions-feature.md index 65891a898..e5580f948 100644 --- a/design/Implemented/restore-with-EnableAPIGroupVersions-feature.md +++ b/design/Implemented/restore-with-EnableAPIGroupVersions-feature.md @@ -8,7 +8,7 @@ This document proposes a solution to select an API group version to restore from ## Background -It is possible that between the time a backup has been made and a restore occurs that the target Kubernetes version has incremented more than one version. In such a case where at least a versions of Kubernetes was skipped, the preferred source cluster's API group versions for resources may no longer be supported by the target cluster. With [PR#2373](https://github.com/velero-io/velero/pull/2373), all supported API group versions were backed up if the EnableAPIGroupVersions feature flag was set for Velero. The next step (outlined by this design proposal) will be to see if any of the backed up versions are supported in the target cluster and if so, choose one to restore for each backed up resource. +It is possible that between the time a backup has been made and a restore occurs that the target Kubernetes version has incremented more than one version. In such a case where at least a versions of Kubernetes was skipped, the preferred source cluster's API group versions for resources may no longer be supported by the target cluster. With [PR#2373](https://github.com/vmware-tanzu/velero/pull/2373), all supported API group versions were backed up if the EnableAPIGroupVersions feature flag was set for Velero. The next step (outlined by this design proposal) will be to see if any of the backed up versions are supported in the target cluster and if so, choose one to restore for each backed up resource. ## Goals @@ -50,19 +50,19 @@ There are six objectives to achieve the above stated goals: ### Objective 1: Determine if the APIGroupVersionsFeatureFlag is enabled and Backup Objects use Status.FormatVersion 1.1.0 -For restore to be able to choose from multiple supported backed up versions, the feature flag must have been enabled during the restore processes. Backup objects must also have [Status.FormatVersion == "1.1.0"](https://github.com/velero-io/velero/blob/a1e182e723a8c5f6d4175d8db2361233a94d2502/pkg/backup/backup.go#L58). +For restore to be able to choose from multiple supported backed up versions, the feature flag must have been enabled during the restore processes. Backup objects must also have [Status.FormatVersion == "1.1.0"](https://github.com/vmware-tanzu/velero/blob/a1e182e723a8c5f6d4175d8db2361233a94d2502/pkg/backup/backup.go#L58). The reason for checking for the feature flag during restore is to ensure the user would like to restore a version that might not be the source cluster preferred version. This check is done via `features.IsEnabled(velerov1api.APIGroupVersionsFeatureFlag)`. The reason for checking `Status.FormatVersion` is to ensure the changes made by this proposed design is backward compatible. Only with Velero version 1.4 and forward was Format Version 1.1.0 used to structure the backup directories. Format Version 1.1.0 is required for the restore process proposed in this design doc to work. Before v1.4, the backed up files were in a directory structure that will not be recognized by the proposed code changes. In this case, restore should not attempt to restore from multiple versions as they will not exist. -The [`Status.FormatVersion`](https://github.com/velero-io/velero/blob/6808acd92e30848056a21faf373af03ddb8a3b71/pkg/apis/velero/v1/backup.go#L235) is stored in a `restoreContext` struct field called [`backup`](https://github.com/velero-io/velero/blob/6808acd92e30848056a21faf373af03ddb8a3b71/pkg/restore/restore.go#L229). The full chain is `ctx.backup.Status.FormatVersion`. +The [`Status.FormatVersion`](https://github.com/vmware-tanzu/velero/blob/6808acd92e30848056a21faf373af03ddb8a3b71/pkg/apis/velero/v1/backup.go#L235) is stored in a `restoreContext` struct field called [`backup`](https://github.com/vmware-tanzu/velero/blob/6808acd92e30848056a21faf373af03ddb8a3b71/pkg/restore/restore.go#L229). The full chain is `ctx.backup.Status.FormatVersion`. The above two checks can be done inside a new method on the `*restoreContext` object with the method signature `meetsAPIGVRestoreReqs() bool`. This method can remain in the `restore` package, but for organizational purposes, it can be moved to a file called `prioritize_group_version.go`. ### Objective 2: List the backed up API group versions -Currently, in `pkg/restore/restore.go`, in the `execute(...)` method, around [line 363](https://github.com/velero-io/velero/blob/7a103b9eda878769018386ecae78da4e4f8dde83/pkg/restore/restore.go#L363), the resources and their backed up items are saved in a map called `backupResources`. +Currently, in `pkg/restore/restore.go`, in the `execute(...)` method, around [line 363](https://github.com/vmware-tanzu/velero/blob/7a103b9eda878769018386ecae78da4e4f8dde83/pkg/restore/restore.go#L363), the resources and their backed up items are saved in a map called `backupResources`. At this point, the feature flag and format versions can be checked (described in Objective #1). If the requirements are met, the `backedupResources` map can be sent to a method (to be created) with the signature `ctx.chooseAPIVersionsToRestore(backupResources)`. The `ctx` object has the type `*restore.Context`. @@ -158,7 +158,7 @@ To see example cases with version priorities, see a blog post written by Rafael ### Objective 6: Modify the paths to the backup files in the tarball -The method doing the bulk of the restoration work is `ctx.restoreResource(...)`. Inside this method, around [line 714](https://github.com/velero-io/velero/blob/7a103b9eda878769018386ecae78da4e4f8dde83/pkg/restore/restore.go#L714) in `pkg/restore/restore.go`, the path to backup json file for the item being restored is set. +The method doing the bulk of the restoration work is `ctx.restoreResource(...)`. Inside this method, around [line 714](https://github.com/vmware-tanzu/velero/blob/7a103b9eda878769018386ecae78da4e4f8dde83/pkg/restore/restore.go#L714) in `pkg/restore/restore.go`, the path to backup json file for the item being restored is set. After the groupResource is instantiated at pkg/restore/restore.go:733, and before the `for` loop that ranges through the `items`, the `ctx.chosenGRVsToRestore` map can be checked. If the groupResource exists in the map, the path saved to `resource` variable can be updated. diff --git a/design/Implemented/retry-patching-configuration_design.md b/design/Implemented/retry-patching-configuration_design.md index 0c2296774..5975db6dd 100644 --- a/design/Implemented/retry-patching-configuration_design.md +++ b/design/Implemented/retry-patching-configuration_design.md @@ -7,7 +7,7 @@ If a patch call fails to update status to completion, it should be retried up to This design proposes a way to configure timeout for this retry time limit. ## Background -Original Issue: https://github.com/velero-io/velero/issues/7207 +Original Issue: https://github.com/vmware-tanzu/velero/issues/7207 Velero was performing a restore when the API server was rolling out to a new version. It had trouble connecting to the API server, but eventually, the restore was successful. @@ -17,7 +17,7 @@ After the connection was restored, it didn't attempt to update, causing the rest This can lead to incorrect decisions for other components that rely on the backup/restore CR status to determine completion. ## Goals -- Make timeout configurable for retry patching by reusing existing [`--resource-timeout` server flag](https://github.com/velero-io/velero/blob/d9ca14747925630664c9e4f85a682b5fc356806d/pkg/cmd/server/server.go#L245) +- Make timeout configurable for retry patching by reusing existing [`--resource-timeout` server flag](https://github.com/vmware-tanzu/velero/blob/d9ca14747925630664c9e4f85a682b5fc356806d/pkg/cmd/server/server.go#L245) ## Non Goals - Create a new timeout flag @@ -97,7 +97,7 @@ func RetryOnErrorMaxBackOff(maxDuration time.Duration, fn func() error) error { ``` ## Alternatives Considered - - Requeuing InProgress backups that is not known by current velero instance to still be in progress as failed (attempted in [#7863](https://github.com/velero-io/velero/pull/7863)) + - Requeuing InProgress backups that is not known by current velero instance to still be in progress as failed (attempted in [#7863](https://github.com/vmware-tanzu/velero/pull/7863)) - It was deemed as making backup restore flow hard to enhance for future reconciler updates such as adding cancel or adding parallel backups. ## Security Considerations @@ -107,5 +107,5 @@ None Retry should only trigger a restore or backup that is already in progress and not patching successfully by current instance. Prior InProgress backups/restores will not be re-processed and will remain stuck InProgress until there is another velero server (re)start. ## Implementation -There is a past implementation in [#7845](https://github.com/velero-io/velero/pull/7845/) where implementation for this design will be based upon. +There is a past implementation in [#7845](https://github.com/vmware-tanzu/velero/pull/7845/) where implementation for this design will be based upon. diff --git a/design/Implemented/schedule-skip-immediately-config_design.md b/design/Implemented/schedule-skip-immediately-config_design.md index f8dd8ea83..223e6b15a 100644 --- a/design/Implemented/schedule-skip-immediately-config_design.md +++ b/design/Implemented/schedule-skip-immediately-config_design.md @@ -6,7 +6,7 @@ New Schedules also create new backup immediately. This design allows user to *skip **immediately due** backup run upon unpausing or schedule creation*. ## Background -Currently, the default behavior of schedule when `.Status.LastBackup` is nil or is due immediately after unpausing, a backup will be created. This may not be a desired by all users (https://github.com/velero-io/velero/issues/6517) +Currently, the default behavior of schedule when `.Status.LastBackup` is nil or is due immediately after unpausing, a backup will be created. This may not be a desired by all users (https://github.com/vmware-tanzu/velero/issues/6517) User want ability to skip the first immediately due backup when schedule is unpaused and or created. diff --git a/design/Implemented/secrets.md b/design/Implemented/secrets.md index 56be05237..b1999c037 100644 --- a/design/Implemented/secrets.md +++ b/design/Implemented/secrets.md @@ -138,12 +138,12 @@ If we instead wanted to use an unique file each time, we could work around the o Once the credentials have been serialized, this path will be made available to the plugins. Instead of setting the necessary environment variable for the plugin process, the `config` map for the BSL will be modified to include an addiitional entry with the path to the credentials file: `credentialsFile`. -This will be passed through when [initializing the BSL](https://github.com/velero-io/velero/blob/main/pkg/plugin/velero/object_store.go#L27-L30) and it will be the responsibility of the plugin to use the passed credentials when starting a session. -For an example of how this would affect the AWS plugin, see [this PR](https://github.com/velero-io/velero-plugin-for-aws/pull/69). +This will be passed through when [initializing the BSL](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/velero/object_store.go#L27-L30) and it will be the responsibility of the plugin to use the passed credentials when starting a session. +For an example of how this would affect the AWS plugin, see [this PR](https://github.com/vmware-tanzu/velero-plugin-for-aws/pull/69). The restic controllers will also need to be updated to use the correct credentials. The BackupStorageLocation for a given PVB/PVR will be fetched and the `Credential` field from that BSL will be serialized. -The existing setup for the restic commands use the credentials from the environment variables with [some repo provider specific overrides](https://github.com/velero-io/velero/blob/main/pkg/controller/pod_volume_backup_controller.go#L260-L273). +The existing setup for the restic commands use the credentials from the environment variables with [some repo provider specific overrides](https://github.com/vmware-tanzu/velero/blob/main/pkg/controller/pod_volume_backup_controller.go#L260-L273). Instead of relying on the existing environment variables, if there are credentials for a particular BSL, the environment will be specifically created for each `RepoIdentifier`. This will use a lot of the existing logic with the exception that it will be modified to work with a serialized secret rather than find the secret file from an environment variable. Currently, GCP is the only provider that relies on the existing environment variables with no specific overrides. @@ -214,16 +214,16 @@ Prior to using any secret for a BSL, it will need to be serialized to disk. Using the details in the `Credential` field in the BSL, the contents of the Secret will be read and serialized to a file. Each plugin process would still have the same set of environment variables set, however the value used for each of these variables would instead be the path to the serialized secret. -To set the environment variables for a plugin process, the plugin manager must be modified so that when creating an ObjectStore, we pass in the entire BSL object, rather than [just the provider](https://github.com/velero-io/velero/blob/main/pkg/plugin/clientmgmt/manager.go#L132-L158). -The plugin manager currently stores a map of [plugin executables to an associated `RestartableProcess`](https://github.com/velero-io/velero/blob/main/pkg/plugin/clientmgmt/manager.go#L59-L70). -New restartable processes are created only [with the executable that the process would run](https://github.com/velero-io/velero/blob/main/pkg/plugin/clientmgmt/manager.go#L122). -This could be modified to also take the necessary environment variables so that when [underlying go-plugin process is created](https://github.com/velero-io/velero/blob/main/pkg/plugin/clientmgmt/client_builder.go#L78), these environment variables could be provided and would be set on the plugin process. +To set the environment variables for a plugin process, the plugin manager must be modified so that when creating an ObjectStore, we pass in the entire BSL object, rather than [just the provider](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/clientmgmt/manager.go#L132-L158). +The plugin manager currently stores a map of [plugin executables to an associated `RestartableProcess`](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/clientmgmt/manager.go#L59-L70). +New restartable processes are created only [with the executable that the process would run](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/clientmgmt/manager.go#L122). +This could be modified to also take the necessary environment variables so that when [underlying go-plugin process is created](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/clientmgmt/client_builder.go#L78), these environment variables could be provided and would be set on the plugin process. Taking this approach would not require any changes from plugins as the credentials information would be made available to them in the same way. However, it is quite a significant change in how we initialize and invoke plugins. We would also need to ensure that the restic controllers are updated in the same way so that correct credentials are used (when creating a `ResticRepository` or processing `PodVolumeBackup`/`PodVolumeRestore`). -This could be achieved by modifying the existing function to [run a restic command](https://github.com/velero-io/velero/blob/main/pkg/restic/repository_manager.go#L237-L290). +This could be achieved by modifying the existing function to [run a restic command](https://github.com/vmware-tanzu/velero/blob/main/pkg/restic/repository_manager.go#L237-L290). This function already sets environment variables for the restic process depending on which storage provider is being used. #### Include the details of the secret in `config` map passed to a plugin diff --git a/design/Implemented/supporting-volumeattributes-resource-policy.md b/design/Implemented/supporting-volumeattributes-resource-policy.md index d8f606d7f..a4f4d1bfc 100644 --- a/design/Implemented/supporting-volumeattributes-resource-policy.md +++ b/design/Implemented/supporting-volumeattributes-resource-policy.md @@ -1,7 +1,7 @@ # Adding Support For VolumeAttributes in Resource Policy ## Abstract -Currently [Velero Resource policies](https://velero.io/docs/main/resource-filtering/#creating-resource-policies) are only supporting "Driver" to be filtered for [CSI volume conditions](https://github.com/velero-io/velero/blob/8e23752a6ea83f101bd94a69dcf17f519a805388/internal/resourcepolicies/volume_resources_validator.go#L28) +Currently [Velero Resource policies](https://velero.io/docs/main/resource-filtering/#creating-resource-policies) are only supporting "Driver" to be filtered for [CSI volume conditions](https://github.com/vmware-tanzu/velero/blob/8e23752a6ea83f101bd94a69dcf17f519a805388/internal/resourcepolicies/volume_resources_validator.go#L28) If user want to skip certain CSI volumes based on other volume attributes like protocol or SKU, etc, they can't do it with the current Velero resource policies. It would be convenient if Velero resource policies could be extended to filter on volume attributes along with existing driver filter in the resource policies `conditions` to handle the backup of volumes just by `some specific volumes attributes conditions`. @@ -37,7 +37,7 @@ parameters: ``` ## High-Level Design -Modifying the existing Resource Policies code for [csiVolumeSource](https://github.com/velero-io/velero/blob/8e23752a6ea83f101bd94a69dcf17f519a805388/internal/resourcepolicies/volume_resources_validator.go#L28C6-L28C22) to add the new `VolumeAttributes` filter for CSI volumes and adding validations in existing [csiCondition](https://github.com/velero-io/velero/blob/8e23752a6ea83f101bd94a69dcf17f519a805388/internal/resourcepolicies/volume_resources.go#L150) to match with volume attributes in the conditions from Resource Policy config map and original persistent volume. +Modifying the existing Resource Policies code for [csiVolumeSource](https://github.com/vmware-tanzu/velero/blob/8e23752a6ea83f101bd94a69dcf17f519a805388/internal/resourcepolicies/volume_resources_validator.go#L28C6-L28C22) to add the new `VolumeAttributes` filter for CSI volumes and adding validations in existing [csiCondition](https://github.com/vmware-tanzu/velero/blob/8e23752a6ea83f101bd94a69dcf17f519a805388/internal/resourcepolicies/volume_resources.go#L150) to match with volume attributes in the conditions from Resource Policy config map and original persistent volume. ## Detailed Design The volume resources policies should contain a list of policies which is the combination of conditions and related `action`, when target volumes meet the conditions, the related `action` will take effection. diff --git a/design/Implemented/velero-debug.md b/design/Implemented/velero-debug.md index bde147585..7da56e48f 100644 --- a/design/Implemented/velero-debug.md +++ b/design/Implemented/velero-debug.md @@ -3,7 +3,7 @@ ## Abstract To simplify the communication between velero users and developers, this document proposes the `velero debug` command to generate a tarball including the logs needed for debugging. -Github issue: https://github.com/velero-io/velero/issues/675 +Github issue: https://github.com/vmware-tanzu/velero/issues/675 ## Background Gathering information to troubleshoot a Velero deployment is currently spread across multiple commands, and is not very efficient. Logs for the Velero server itself are accessed via a kubectl logs command, while information on specific backups or restores are accessed via a Velero subcommand. Restic logs are even more complicated to retrieve, since one must gather logs for every instance of the daemonset, and there’s currently no good mechanism to locate which node a particular restic backup ran against. diff --git a/design/Implemented/vgdp-affinity-enhancement.md b/design/Implemented/vgdp-affinity-enhancement.md index b0edeca44..dc9e458c7 100644 --- a/design/Implemented/vgdp-affinity-enhancement.md +++ b/design/Implemented/vgdp-affinity-enhancement.md @@ -191,7 +191,7 @@ The other VGDP instances will run on nodes, which instance type is `Standard_B4m } ``` -Velero data mover supports to use different StorageClass to create backupPVC by [design](https://github.com/velero-io/velero/pull/7982). +Velero data mover supports to use different StorageClass to create backupPVC by [design](https://github.com/vmware-tanzu/velero/pull/7982). In this example, if the backup target PVC's StorageClass is `kibishii-storage-class`, its backupPVC should use StorageClass `worker-storagepolicy`. Because the final StorageClass is `worker-storagepolicy`, the backupPod uses the loadAffinity specified by `loadAffinity`'s elements with `StorageClass` field set to `worker-storagepolicy`. backupPod will be assigned to nodes, which instance type is `Standard_B2ms`. diff --git a/design/Implemented/vgdp-micro-service-for-fs-backup/vgdp-micro-service-for-fs-backup.md b/design/Implemented/vgdp-micro-service-for-fs-backup/vgdp-micro-service-for-fs-backup.md index bba5e67ca..0766bc9d4 100644 --- a/design/Implemented/vgdp-micro-service-for-fs-backup/vgdp-micro-service-for-fs-backup.md +++ b/design/Implemented/vgdp-micro-service-for-fs-backup/vgdp-micro-service-for-fs-backup.md @@ -654,9 +654,9 @@ CLI is not changed. [2]: ../volume-snapshot-data-movement/volume-snapshot-data-movement.md [3]: ../vgdp-micro-service/vgdp-micro-service.md [4]: ../node-agent-concurrency.md -[5]: https://github.com/velero-io/velero/issues/8955 -[6]: https://github.com/velero-io/velero/issues/8956 -[7]: https://github.com/velero-io/velero/issues/8289 +[5]: https://github.com/vmware-tanzu/velero/issues/8955 +[6]: https://github.com/vmware-tanzu/velero/issues/8956 +[7]: https://github.com/vmware-tanzu/velero/issues/8289 [8]: https://kubernetes.io/docs/tasks/configure-pod-container/create-hostprocess-pod/ -[9]: https://github.com/velero-io/velero/issues/7725 -[10]: https://github.com/velero-io/velero/issues/8423 \ No newline at end of file +[9]: https://github.com/vmware-tanzu/velero/issues/7725 +[10]: https://github.com/vmware-tanzu/velero/issues/8423 \ No newline at end of file diff --git a/design/Implemented/volume-group-snapshot.md b/design/Implemented/volume-group-snapshot.md index d10cb6941..83bc5a574 100644 --- a/design/Implemented/volume-group-snapshot.md +++ b/design/Implemented/volume-group-snapshot.md @@ -308,7 +308,7 @@ Backup workflow: } ``` -- Changes to the Existing [PVC ItemBlockAction plugin](https://github.com/velero-io/velero/blob/512199723ff95d5016b32e91e3bf06b65f57d608/pkg/itemblock/actions/pvc_action.go#L64) (Update the GetRelatedItems function): +- Changes to the Existing [PVC ItemBlockAction plugin](https://github.com/vmware-tanzu/velero/blob/512199723ff95d5016b32e91e3bf06b65f57d608/pkg/itemblock/actions/pvc_action.go#L64) (Update the GetRelatedItems function): ```go // Retrieve the VGS label key from the Backup spec. vgsLabelKey := backup.Spec.VolumeGroupSnapshotLabelKey @@ -338,7 +338,7 @@ Backup workflow: } ``` -- Updates to [CSI PVC plugin](https://github.com/velero-io/velero/blob/512199723ff95d5016b32e91e3bf06b65f57d608/pkg/backup/actions/csi/pvc_action.go#L200) (Update the Execute method): +- Updates to [CSI PVC plugin](https://github.com/vmware-tanzu/velero/blob/512199723ff95d5016b32e91e3bf06b65f57d608/pkg/backup/actions/csi/pvc_action.go#L200) (Update the Execute method): ```go func (p *pvcBackupItemAction) Execute( item runtime.Unstructured, diff --git a/design/Implemented/volume-snapshot-data-movement/volume-snapshot-data-movement.md b/design/Implemented/volume-snapshot-data-movement/volume-snapshot-data-movement.md index 25a3a5456..8f46276b8 100644 --- a/design/Implemented/volume-snapshot-data-movement/volume-snapshot-data-movement.md +++ b/design/Implemented/volume-snapshot-data-movement/volume-snapshot-data-movement.md @@ -931,7 +931,7 @@ For 3, Velero leverage on DMs to decide how to save the log, but they will not g DMs need to be configured during installation so that they can be installed. Plugin DMs may have their own configuration, for VGDM, the only requirement is to install Velero node-agent. Moreover, the DMP is also required during the installation. -From release-1.14, the `github.com/velero-io/velero-plugin-for-csi` repository, which is the Velero CSI plugin, is merged into the `github.com/velero-io/velero` repository. +From release-1.14, the `github.com/vmware-tanzu/velero-plugin-for-csi` repository, which is the Velero CSI plugin, is merged into the `github.com/vmware-tanzu/velero` repository. The reason to merge the CSI plugin is: * The VolumeSnapshot data mover depends on the CSI plugin, it's reasonabe to integrate them. * This change reduces the Velero deploying complexity. diff --git a/design/Implemented/wait-for-additional-items.md b/design/Implemented/wait-for-additional-items.md index 852c0a2f4..8cff712b0 100644 --- a/design/Implemented/wait-for-additional-items.md +++ b/design/Implemented/wait-for-additional-items.md @@ -44,7 +44,7 @@ When each `RestoreItemAction` `Execute()` call returns, the restored. After restoring these items, Velero needs to be able to wait for them to be ready before moving on to the next item. Right after looping over the additional items at -https://github.com/velero-io/velero/blob/main/pkg/restore/restore.go#L960-L991 +https://github.com/vmware-tanzu/velero/blob/main/pkg/restore/restore.go#L960-L991 we still have a reference to the additional items (`GroupResource` and namespaced name), as well as a reference to the `RestoreItemAction` @@ -53,7 +53,7 @@ plugin which required it. At this point, if the `RestoreItemActionExecuteOutput` `WaitForAdditionalItems` field is set to `true` we need to call a func similar to `crdAvailable` which we will call `itemsAvailable` -https://github.com/velero-io/velero/blob/main/pkg/restore/restore.go#L623 +https://github.com/vmware-tanzu/velero/blob/main/pkg/restore/restore.go#L623 This func should also be defined within restore.go Instead of the one minute CRD timeout, we'll use a timeout specific to @@ -182,7 +182,7 @@ use an explicit `AreAdditionalItemsReady` func. Since this will break backwards compatibility with current `RestoreItemAction` plugins, implementation of this feature should wait until Velero plugin versioning, as described in -https://github.com/velero-io/velero/issues/3285 is +https://github.com/vmware-tanzu/velero/issues/3285 is implemented. With plugin versioning in place, existing (non-versioned or 1.0-versioned) `RestoreItemAction` plugins which do not define `AreAdditionalItemsReady` would be able to coexist with a diff --git a/design/Implemented/wildcard-namespace-support-design.md b/design/Implemented/wildcard-namespace-support-design.md index c9076e662..45c4d4641 100644 --- a/design/Implemented/wildcard-namespace-support-design.md +++ b/design/Implemented/wildcard-namespace-support-design.md @@ -7,7 +7,7 @@ Velero currently treats namespace patterns with glob characters as literal strin ## Background -Requested in [#1874](https://github.com/velero-io/velero/issues/1874) for more flexible namespace selection. +Requested in [#1874](https://github.com/vmware-tanzu/velero/issues/1874) for more flexible namespace selection. ## Goals diff --git a/design/cli-install-changes.md b/design/cli-install-changes.md index c9f278190..3464ce0e5 100644 --- a/design/cli-install-changes.md +++ b/design/cli-install-changes.md @@ -276,9 +276,9 @@ The value for these flags will be stored as annotations. #### Handling CA certs -In anticipation of a new configuration implementation to handle custom CA certs (as per design doc https://github.com/velero-io/velero/blob/main/design/custom-ca-support.md), a new flag `velero storage-location create/set --cacert-file mapStringString` is proposed. It sets the configuration to use for creating a secret containing a custom certificate for an S3 location of a plugin provider. Format is provider:path-to-file. +In anticipation of a new configuration implementation to handle custom CA certs (as per design doc https://github.com/vmware-tanzu/velero/blob/main/design/custom-ca-support.md), a new flag `velero storage-location create/set --cacert-file mapStringString` is proposed. It sets the configuration to use for creating a secret containing a custom certificate for an S3 location of a plugin provider. Format is provider:path-to-file. -See discussion https://github.com/velero-io/velero/pull/2259#discussion_r384700723 for more clarification. +See discussion https://github.com/vmware-tanzu/velero/pull/2259#discussion_r384700723 for more clarification. #### Renaming "provider" to "location-plugin" @@ -344,7 +344,7 @@ Another new behavior that must be added: the server needs to identify when there As it is today, a valid VSL would not be required to create backups, unless the backup included a PV. -To make it easier for the user to identify if their Velero server is ready to create backups or not, a `velero status` command should be added. This issue has been created some time ago for this purpose: https://github.com/velero-io/velero/issues/1094. +To make it easier for the user to identify if their Velero server is ready to create backups or not, a `velero status` command should be added. This issue has been created some time ago for this purpose: https://github.com/vmware-tanzu/velero/issues/1094. ## Alternatives Considered diff --git a/design/new-prepost-backuprestore-plugin-hooks.md b/design/new-prepost-backuprestore-plugin-hooks.md index 15fd02728..65e305147 100644 --- a/design/new-prepost-backuprestore-plugin-hooks.md +++ b/design/new-prepost-backuprestore-plugin-hooks.md @@ -8,7 +8,7 @@ The proposed plugin hooks are to be executed only once: pre-backup (before backu ### PreBackup and PostBackup Actions -For the backup, the sequence of events of Velero backup are the following (these sequence depicted is prior upcoming changes for [upload progress #3533](https://github.com/velero-io/velero/issues/3533) ): +For the backup, the sequence of events of Velero backup are the following (these sequence depicted is prior upcoming changes for [upload progress #3533](https://github.com/vmware-tanzu/velero/issues/3533) ): ``` New Backup Request @@ -40,16 +40,16 @@ New Backup Request ``` These plugin hooks will be invoked: -- PreBackupAction: plugin actions are executed after the backup object is created and validated but before the backup is being processed, more precisely _before_ function [c.backupper.Backup](https://github.com/velero-io/velero/blob/74476db9d791fa91bba0147eac8ec189820adb3d/pkg/controller/backup_controller.go#L590). If the PreBackupActions return an err, the backup object is not processed and the Backup phase will be set as `FailedPreBackupActions`. +- PreBackupAction: plugin actions are executed after the backup object is created and validated but before the backup is being processed, more precisely _before_ function [c.backupper.Backup](https://github.com/vmware-tanzu/velero/blob/74476db9d791fa91bba0147eac8ec189820adb3d/pkg/controller/backup_controller.go#L590). If the PreBackupActions return an err, the backup object is not processed and the Backup phase will be set as `FailedPreBackupActions`. -- PostBackupAction: plugin actions are executed after the backup is finished and persisted, more precisely _after_ function [c.runBackup](https://github.com/velero-io/velero/blob/74476db9d791fa91bba0147eac8ec189820adb3d/pkg/controller/backup_controller.go#L274). +- PostBackupAction: plugin actions are executed after the backup is finished and persisted, more precisely _after_ function [c.runBackup](https://github.com/vmware-tanzu/velero/blob/74476db9d791fa91bba0147eac8ec189820adb3d/pkg/controller/backup_controller.go#L274). The proposed plugin hooks will execute actions that will have statuses on their own: `Backup.Status.PreBackupActionsStatuses` and `Backup.Status.PostBackupActionsStatuses` which will be an array of a proposed struct `ActionStatus` with PluginName, StartTimestamp, CompletionTimestamp and Phase. ### PreRestore and PostRestore Actions -For the restore, the sequence of events of Velero restore are the following (these sequence depicted is prior upcoming changes for [upload progress #3533](https://github.com/velero-io/velero/issues/3533) ): +For the restore, the sequence of events of Velero restore are the following (these sequence depicted is prior upcoming changes for [upload progress #3533](https://github.com/vmware-tanzu/velero/issues/3533) ): ``` New Restore Request |--> Validation of the request @@ -84,9 +84,9 @@ New Restore Request These plugin hooks will be invoked: -- PreRestoreAction: plugin actions are executed after the restore object is created and validated and before the backup object is fetched, more precisely in function `runValidatedRestore` _after_ function [info.backupStore.GetBackupVolumeSnapshots](https://github.com/velero-io/velero/blob/7c75cd6cf854064c9a454e53ba22cc5881d3f1f0/pkg/controller/restore_controller.go#L460). If the PreRestoreActions return an err, the restore object is not processed and the Restore phase will be set a `FailedPreRestoreActions`. +- PreRestoreAction: plugin actions are executed after the restore object is created and validated and before the backup object is fetched, more precisely in function `runValidatedRestore` _after_ function [info.backupStore.GetBackupVolumeSnapshots](https://github.com/vmware-tanzu/velero/blob/7c75cd6cf854064c9a454e53ba22cc5881d3f1f0/pkg/controller/restore_controller.go#L460). If the PreRestoreActions return an err, the restore object is not processed and the Restore phase will be set a `FailedPreRestoreActions`. -- PostRestoreAction: plugin actions are executed after the restore finishes processing all items and volumes snapshots are restored and logs persisted, more precisely in function `processRestore` _after_ setting [`restore.Status.CompletionTimestamp`](https://github.com/velero-io/velero/blob/7c75cd6cf854064c9a454e53ba22cc5881d3f1f0/pkg/controller/restore_controller.go#L273). +- PostRestoreAction: plugin actions are executed after the restore finishes processing all items and volumes snapshots are restored and logs persisted, more precisely in function `processRestore` _after_ setting [`restore.Status.CompletionTimestamp`](https://github.com/vmware-tanzu/velero/blob/7c75cd6cf854064c9a454e53ba22cc5881d3f1f0/pkg/controller/restore_controller.go#L273). The proposed plugin hooks will execute actions that will have statuses on their own: `Restore.Status.PreRestoreActionsStatuses` and `Restore.Status.PostRestoreActionsStatuses` which will be an array of a proposed struct `ActionStatus` with PluginName, StartTimestamp, CompletionTimestamp and Phase. @@ -148,7 +148,7 @@ The PostBackupAction plugin API will resemble the BackupItemAction plugin design By this stage, the backup has already been executed, with items backed up and volumes snapshots processed and persisted. The `PostBackupAction` interface will only have an `Execute()` method since the plugin will be executed only once per Backup, not per item. -If there are any PostBackupAction plugins registered, they will be executed after the backup is finished and persisted, more precisely _after_ function [c.runBackup](https://github.com/velero-io/velero/blob/74476db9d791fa91bba0147eac8ec189820adb3d/pkg/controller/backup_controller.go#L274). +If there are any PostBackupAction plugins registered, they will be executed after the backup is finished and persisted, more precisely _after_ function [c.runBackup](https://github.com/vmware-tanzu/velero/blob/74476db9d791fa91bba0147eac8ec189820adb3d/pkg/controller/backup_controller.go#L274). The Velero restore controller package will be modified for `PreRestoreAction` and `PostRestoreAction`. @@ -156,13 +156,13 @@ The PreRestoreAction plugin API will resemble the RestoreItemAction plugin desig It will not receive any resource list items because the restore has not yet been running at that stage. In addition, the `PreRestoreAction` interface will only have an `Execute()` method since the plugin will be executed only once per Restore creation, not per item. -The Velero restore controller will be modified so that if there are any PreRestoreAction plugins registered, they will be executed after the restore object is created and validated and before the backup object is fetched, more precisely in function `runValidatedRestore` _after_ function [info.backupStore.GetBackupVolumeSnapshots](https://github.com/velero-io/velero/blob/7c75cd6cf854064c9a454e53ba22cc5881d3f1f0/pkg/controller/restore_controller.go#L460). If the PreRestoreActions return an err, the restore object is not processed and the Restore phase will be set a `FailedPreRestoreActions`. +The Velero restore controller will be modified so that if there are any PreRestoreAction plugins registered, they will be executed after the restore object is created and validated and before the backup object is fetched, more precisely in function `runValidatedRestore` _after_ function [info.backupStore.GetBackupVolumeSnapshots](https://github.com/vmware-tanzu/velero/blob/7c75cd6cf854064c9a454e53ba22cc5881d3f1f0/pkg/controller/restore_controller.go#L460). If the PreRestoreActions return an err, the restore object is not processed and the Restore phase will be set a `FailedPreRestoreActions`. The PostRestoreAction plugin API will resemble the RestoreItemAction plugin design, but with the fundamental difference that it will receive only as input the Velero `Restore` object without any resource list items. At this stage, the restore has already been executed. The `PostRestoreAction` interface will only have an `Execute()` method since the plugin will be executed only once per Restore, not per item. -If any PostRestoreAction plugins are registered, they will be executed after the restore finishes processing all items and volumes snapshots are restored and logs persisted, more precisely in function `processRestore` _after_ setting [`restore.Status.CompletionTimestamp`](https://github.com/velero-io/velero/blob/7c75cd6cf854064c9a454e53ba22cc5881d3f1f0/pkg/controller/restore_controller.go#L273). +If any PostRestoreAction plugins are registered, they will be executed after the restore finishes processing all items and volumes snapshots are restored and logs persisted, more precisely in function `processRestore` _after_ setting [`restore.Status.CompletionTimestamp`](https://github.com/vmware-tanzu/velero/blob/7c75cd6cf854064c9a454e53ba22cc5881d3f1f0/pkg/controller/restore_controller.go#L273). ## Detailed Design diff --git a/design/restore-progress.md b/design/restore-progress.md index 3ce38414e..d86b2cfa6 100644 --- a/design/restore-progress.md +++ b/design/restore-progress.md @@ -217,4 +217,4 @@ TBD ## Open Issues -https://github.com/velero-io/velero/issues/21 \ No newline at end of file +https://github.com/vmware-tanzu/velero/issues/21 \ No newline at end of file diff --git a/go.mod b/go.mod index a4f26fd35..25b753d8c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/velero-io/velero +module github.com/vmware-tanzu/velero go 1.26.0 diff --git a/hack/issue-template-gen/main.go b/hack/issue-template-gen/main.go index 5950f84c5..dcdcf782e 100644 --- a/hack/issue-template-gen/main.go +++ b/hack/issue-template-gen/main.go @@ -24,7 +24,7 @@ import ( "os" "text/template" - "github.com/velero-io/velero/pkg/cmd/cli/bug" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/bug" ) func main() { diff --git a/hack/release-tools/brew-update.sh b/hack/release-tools/brew-update.sh index 5241340eb..dfb1f52be 100755 --- a/hack/release-tools/brew-update.sh +++ b/hack/release-tools/brew-update.sh @@ -13,7 +13,7 @@ then fi # GitHub URL which contains the source code archive for the tagged release -URL=https://github.com/velero-io/velero/archive/$VELERO_VERSION.tar.gz +URL=https://github.com/vmware-tanzu/velero/archive/$VELERO_VERSION.tar.gz # Update brew so we're sure we have the latest Velero formula brew update diff --git a/hack/release-tools/gen-docs.sh b/hack/release-tools/gen-docs.sh index 956153805..595de2ee6 100755 --- a/hack/release-tools/gen-docs.sh +++ b/hack/release-tools/gen-docs.sh @@ -100,7 +100,7 @@ rm $DATA_DOCS_DIRECTORY/$NEW_DOCS_TOC.yml && cp $DATA_DOCS_DIRECTORY/$MAIN_BRANC if [[ $(uname) == "Darwin" ]]; then echo "[OS X] updating version-specific links" find $DOCS_DIRECTORY/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i '' "s|https://velero.io/docs/$MAIN_BRANCH|https://velero.io/docs/$VELERO_VERSION|g" - find $DOCS_DIRECTORY/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i '' "s|https://github.com/velero-io/velero/blob/$MAIN_BRANCH|https://github.com/velero-io/velero/blob/$VELERO_VERSION|g" + find $DOCS_DIRECTORY/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i '' "s|https://github.com/vmware-tanzu/velero/blob/$MAIN_BRANCH|https://github.com/vmware-tanzu/velero/blob/$VELERO_VERSION|g" find $DOCS_DIRECTORY/${NEW_DOCS_VERSION} -type f -name "_index.md" | xargs sed -i '' "s|version: $MAIN_BRANCH|version: $NEW_DOCS_VERSION|g" echo "[OS X] Updating latest version in $CONFIG_FILE" @@ -121,7 +121,7 @@ ${NEW_DOCS_VERSION}: ${NEW_DOCS_TOC} else echo "[Linux] updating version-specific links" find $DOCS_DIRECTORY/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i'' "s|https://velero.io/docs/$MAIN_BRANCH|https://velero.io/docs/$VELERO_VERSION|g" - find $DOCS_DIRECTORY/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i'' "s|https://github.com/velero-io/velero/blob/$MAIN_BRANCH|https://github.com/velero-io/velero/blob/$VELERO_VERSION|g" + find $DOCS_DIRECTORY/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i'' "s|https://github.com/vmware-tanzu/velero/blob/$MAIN_BRANCH|https://github.com/vmware-tanzu/velero/blob/$VELERO_VERSION|g" echo "[Linux] Updating latest version in $CONFIG_FILE" sed -i'' "s/latest: ${PREVIOUS_DOCS_VERSION}/latest: ${NEW_DOCS_VERSION}/" $CONFIG_FILE diff --git a/hack/update-1fmt.sh b/hack/update-1fmt.sh index 002f3d27f..a23261cb2 100755 --- a/hack/update-1fmt.sh +++ b/hack/update-1fmt.sh @@ -47,7 +47,7 @@ else fi echo "${ACTION} goimports" -output=$(goimports "${MODE}" -local github.com/velero-io/velero ${files}) +output=$(goimports "${MODE}" -local github.com/vmware-tanzu/velero ${files}) if [[ -n "${output}" ]]; then VERIFY_IMPORTS_FAILED=1 echo "${output}" diff --git a/hack/update-2proto.sh b/hack/update-2proto.sh index cd7e85cb0..07cc732f5 100755 --- a/hack/update-2proto.sh +++ b/hack/update-2proto.sh @@ -23,7 +23,7 @@ protoc \ -I pkg/plugin/proto/ \ -I /usr/include \ --go_out=pkg/plugin/generated/ \ - --go_opt=module=github.com/velero-io/velero/pkg/plugin/generated \ + --go_opt=module=github.com/vmware-tanzu/velero/pkg/plugin/generated \ --go-grpc_out=pkg/plugin/generated \ --go-grpc_opt=paths=source_relative \ --go-grpc_opt=require_unimplemented_servers=false \ diff --git a/internal/credentials/file_store.go b/internal/credentials/file_store.go index 53d15cf68..d1f1fb10a 100644 --- a/internal/credentials/file_store.go +++ b/internal/credentials/file_store.go @@ -25,8 +25,8 @@ import ( corev1api "k8s.io/api/core/v1" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/util/filesystem" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) // FileStore defines operations for interacting with credentials diff --git a/internal/credentials/file_store_test.go b/internal/credentials/file_store_test.go index ae84bd9be..d748ca29e 100644 --- a/internal/credentials/file_store_test.go +++ b/internal/credentials/file_store_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" corev1api "k8s.io/api/core/v1" - "github.com/velero-io/velero/pkg/builder" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/builder" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestNamespacedFileStore(t *testing.T) { diff --git a/internal/credentials/secret_store.go b/internal/credentials/secret_store.go index d6307f23b..f4d2111a5 100644 --- a/internal/credentials/secret_store.go +++ b/internal/credentials/secret_store.go @@ -21,7 +21,7 @@ import ( corev1api "k8s.io/api/core/v1" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) // SecretStore defines operations for interacting with credentials diff --git a/internal/delete/actions/csi/volumesnapshotcontent_action.go b/internal/delete/actions/csi/volumesnapshotcontent_action.go index 791cdb5c3..9473686e0 100644 --- a/internal/delete/actions/csi/volumesnapshotcontent_action.go +++ b/internal/delete/actions/csi/volumesnapshotcontent_action.go @@ -29,10 +29,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" crclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/client" - plugincommon "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - kubeutil "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/client" + plugincommon "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" ) // volumeSnapshotContentDeleteItemAction is a restore item action plugin for Velero diff --git a/internal/delete/actions/csi/volumesnapshotcontent_action_test.go b/internal/delete/actions/csi/volumesnapshotcontent_action_test.go index c5c6fc734..e8a0b5865 100644 --- a/internal/delete/actions/csi/volumesnapshotcontent_action_test.go +++ b/internal/delete/actions/csi/volumesnapshotcontent_action_test.go @@ -32,11 +32,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" crclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) // fakeClientWithErrors wraps a real client and injects errors for specific operations. diff --git a/internal/delete/delete_item_action_handler.go b/internal/delete/delete_item_action_handler.go index 2e4f7588b..ba242c0ca 100644 --- a/internal/delete/delete_item_action_handler.go +++ b/internal/delete/delete_item_action_handler.go @@ -19,7 +19,7 @@ package delete import ( "io" - "github.com/velero-io/velero/pkg/plugin/framework" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -27,11 +27,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/archive" - "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util/filesystem" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/archive" + "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) // Context provides the necessary environment to run DeleteItemAction plugins diff --git a/internal/delete/delete_item_action_handler_test.go b/internal/delete/delete_item_action_handler_test.go index 4d20fc3e0..6743cd1f9 100644 --- a/internal/delete/delete_item_action_handler_test.go +++ b/internal/delete/delete_item_action_handler_test.go @@ -29,12 +29,12 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/test" - kubeutil "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/test" + kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" ) func TestInvokeDeleteItemActionsRunForCorrectItems(t *testing.T) { diff --git a/internal/hook/item_hook_handler.go b/internal/hook/item_hook_handler.go index bb0fe1c9f..52dd815ab 100644 --- a/internal/hook/item_hook_handler.go +++ b/internal/hook/item_hook_handler.go @@ -34,13 +34,13 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/podexec" - "github.com/velero-io/velero/pkg/restorehelper" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/collections" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/podexec" + "github.com/vmware-tanzu/velero/pkg/restorehelper" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/collections" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) type HookPhase string @@ -147,7 +147,7 @@ func (i *InitContainerRestoreHookHandler) HandleRestoreHooks( labels := labels.Set(metadata.GetLabels()) // Apply the hook according to the target namespace in which the pod will be restored - // more details see https://github.com/velero-io/velero/issues/4720 + // more details see https://github.com/vmware-tanzu/velero/issues/4720 if namespaceMapping != nil { if n, ok := namespaceMapping[namespace]; ok { namespace = n diff --git a/internal/hook/item_hook_handler_test.go b/internal/hook/item_hook_handler_test.go index 747af28f7..37f1500a3 100644 --- a/internal/hook/item_hook_handler_test.go +++ b/internal/hook/item_hook_handler_test.go @@ -32,12 +32,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/kuberesource" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/collections" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/collections" ) func TestHandleHooksSkips(t *testing.T) { diff --git a/internal/hook/wait_exec_hook_handler.go b/internal/hook/wait_exec_hook_handler.go index 85c804f20..92a905c8c 100644 --- a/internal/hook/wait_exec_hook_handler.go +++ b/internal/hook/wait_exec_hook_handler.go @@ -27,10 +27,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/cache" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/podexec" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/podexec" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) type WaitExecHookHandler interface { diff --git a/internal/hook/wait_exec_hook_handler_test.go b/internal/hook/wait_exec_hook_handler_test.go index bc3da65f4..fb102b16f 100644 --- a/internal/hook/wait_exec_hook_handler_test.go +++ b/internal/hook/wait_exec_hook_handler_test.go @@ -32,10 +32,10 @@ import ( "k8s.io/client-go/tools/cache" fcache "k8s.io/client-go/tools/cache/testing" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/boolptr" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" ) type fakeListWatchFactory struct { diff --git a/internal/resourcemodifiers/resource_modifiers.go b/internal/resourcemodifiers/resource_modifiers.go index 8ee1e0e20..cc780df03 100644 --- a/internal/resourcemodifiers/resource_modifiers.go +++ b/internal/resourcemodifiers/resource_modifiers.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/yaml" - "github.com/velero-io/velero/pkg/util/collections" + "github.com/vmware-tanzu/velero/pkg/util/collections" ) const ( diff --git a/internal/resourcepolicies/resource_policies.go b/internal/resourcepolicies/resource_policies.go index e605b1e15..ce32dba19 100644 --- a/internal/resourcepolicies/resource_policies.go +++ b/internal/resourcepolicies/resource_policies.go @@ -28,7 +28,7 @@ import ( corev1api "k8s.io/api/core/v1" crclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) type VolumeActionType string diff --git a/internal/restartabletest/restartable_delegate.go b/internal/restartabletest/restartable_delegate.go index 0d9633b88..41d56cf31 100644 --- a/internal/restartabletest/restartable_delegate.go +++ b/internal/restartabletest/restartable_delegate.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" ) type MockRestartableProcess struct { diff --git a/internal/storage/storagelocation.go b/internal/storage/storagelocation.go index 370c85118..d5fe548c0 100644 --- a/internal/storage/storagelocation.go +++ b/internal/storage/storagelocation.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // DefaultBackupLocationInfo holds server default backup storage location information diff --git a/internal/storage/storagelocation_test.go b/internal/storage/storagelocation_test.go index fad95988d..44eabff48 100644 --- a/internal/storage/storagelocation_test.go +++ b/internal/storage/storagelocation_test.go @@ -23,10 +23,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util" ) func TestIsReadyToValidate(t *testing.T) { diff --git a/internal/velero/images.go b/internal/velero/images.go index 18903e1cc..cefbd1441 100644 --- a/internal/velero/images.go +++ b/internal/velero/images.go @@ -19,7 +19,7 @@ package velero import ( "fmt" - "github.com/velero-io/velero/pkg/buildinfo" + "github.com/vmware-tanzu/velero/pkg/buildinfo" ) // Use Dockerhub as the default registry if the build process didn't supply a registry diff --git a/internal/velero/images_test.go b/internal/velero/images_test.go index ecdf2d995..5a68a4fd1 100644 --- a/internal/velero/images_test.go +++ b/internal/velero/images_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/velero-io/velero/pkg/buildinfo" + "github.com/vmware-tanzu/velero/pkg/buildinfo" ) func TestImageTag(t *testing.T) { diff --git a/internal/velero/serverstatusrequest.go b/internal/velero/serverstatusrequest.go index f4013774a..c9c8acc0a 100644 --- a/internal/velero/serverstatusrequest.go +++ b/internal/velero/serverstatusrequest.go @@ -17,9 +17,9 @@ limitations under the License. package velero import ( - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/framework" - "github.com/velero-io/velero/pkg/plugin/framework/common" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" ) type PluginLister interface { diff --git a/internal/volume/snapshotlocation.go b/internal/volume/snapshotlocation.go index 5fb52aa00..ad23fa1f4 100644 --- a/internal/volume/snapshotlocation.go +++ b/internal/volume/snapshotlocation.go @@ -19,8 +19,8 @@ package volume import ( "github.com/pkg/errors" - "github.com/velero-io/velero/internal/credentials" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/internal/credentials" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // UpdateVolumeSnapshotLocationWithCredentialConfig adds the credentials file path to the config diff --git a/internal/volume/utils.go b/internal/volume/utils.go index fd613d3f0..fbb3ec67b 100644 --- a/internal/volume/utils.go +++ b/internal/volume/utils.go @@ -20,7 +20,7 @@ import ( "regexp" ) -// it has to have the same value as "github.com/velero-io/velero/pkg/restore".ItemRestoreResultCreated +// it has to have the same value as "github.com/vmware-tanzu/velero/pkg/restore".ItemRestoreResultCreated const itemRestoreResultCreated = "created" // RestoredPVCFromRestoredResourceList returns a set of PVCs that were restored from the given restoredResourceList. diff --git a/internal/volume/volumes_information.go b/internal/volume/volumes_information.go index f3ebe0548..4d5961bdb 100644 --- a/internal/volume/volumes_information.go +++ b/internal/volume/volumes_information.go @@ -29,13 +29,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/label" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/features" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/kuberesource" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/kuberesource" ) type Method string diff --git a/internal/volume/volumes_information_test.go b/internal/volume/volumes_information_test.go index ba6143dda..b39ba82f8 100644 --- a/internal/volume/volumes_information_test.go +++ b/internal/volume/volumes_information_test.go @@ -31,14 +31,14 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/features" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/logging" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/logging" ) func TestGenerateVolumeInfoForSkippedPV(t *testing.T) { diff --git a/internal/volumehelper/volume_policy_helper.go b/internal/volumehelper/volume_policy_helper.go index 84ab0768e..339b80011 100644 --- a/internal/volumehelper/volume_policy_helper.go +++ b/internal/volumehelper/volume_policy_helper.go @@ -12,13 +12,13 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" crclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/resourcepolicies" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/util/boolptr" - kubeutil "github.com/velero-io/velero/pkg/util/kube" - podvolumeutil "github.com/velero-io/velero/pkg/util/podvolume" - vhutil "github.com/velero-io/velero/pkg/util/volumehelper" + "github.com/vmware-tanzu/velero/internal/resourcepolicies" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" + podvolumeutil "github.com/vmware-tanzu/velero/pkg/util/podvolume" + vhutil "github.com/vmware-tanzu/velero/pkg/util/volumehelper" ) type volumeHelperImpl struct { diff --git a/internal/volumehelper/volume_policy_helper_test.go b/internal/volumehelper/volume_policy_helper_test.go index 979803c3f..5e52ae73b 100644 --- a/internal/volumehelper/volume_policy_helper_test.go +++ b/internal/volumehelper/volume_policy_helper_test.go @@ -29,12 +29,12 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/utils/ptr" - "github.com/velero-io/velero/internal/resourcepolicies" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/kuberesource" - velerotest "github.com/velero-io/velero/pkg/test" - podvolumeutil "github.com/velero-io/velero/pkg/util/podvolume" + "github.com/vmware-tanzu/velero/internal/resourcepolicies" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + podvolumeutil "github.com/vmware-tanzu/velero/pkg/util/podvolume" ) func TestVolumeHelperImpl_ShouldPerformSnapshot(t *testing.T) { diff --git a/pkg/apis/velero/v1/pod_volume_backup_types.go b/pkg/apis/velero/v1/pod_volume_backup_types.go index 2eea3b545..b246906fb 100644 --- a/pkg/apis/velero/v1/pod_volume_backup_types.go +++ b/pkg/apis/velero/v1/pod_volume_backup_types.go @@ -20,7 +20,7 @@ import ( corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/velero-io/velero/pkg/apis/velero/shared" + "github.com/vmware-tanzu/velero/pkg/apis/velero/shared" ) // PodVolumeBackupSpec is the specification for a PodVolumeBackup. diff --git a/pkg/apis/velero/v1/pod_volume_restore_type.go b/pkg/apis/velero/v1/pod_volume_restore_type.go index ae84f1c5d..c1d75b71c 100644 --- a/pkg/apis/velero/v1/pod_volume_restore_type.go +++ b/pkg/apis/velero/v1/pod_volume_restore_type.go @@ -20,7 +20,7 @@ import ( corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/velero-io/velero/pkg/apis/velero/shared" + "github.com/vmware-tanzu/velero/pkg/apis/velero/shared" ) // PodVolumeRestoreSpec is the specification for a PodVolumeRestore. diff --git a/pkg/apis/velero/v2alpha1/data_download_types.go b/pkg/apis/velero/v2alpha1/data_download_types.go index 93e194ff5..4ea7128ec 100644 --- a/pkg/apis/velero/v2alpha1/data_download_types.go +++ b/pkg/apis/velero/v2alpha1/data_download_types.go @@ -19,7 +19,7 @@ package v2alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/velero-io/velero/pkg/apis/velero/shared" + "github.com/vmware-tanzu/velero/pkg/apis/velero/shared" ) // DataDownloadSpec is the specification for a DataDownload. diff --git a/pkg/apis/velero/v2alpha1/data_upload_types.go b/pkg/apis/velero/v2alpha1/data_upload_types.go index b40475c1b..751da4555 100644 --- a/pkg/apis/velero/v2alpha1/data_upload_types.go +++ b/pkg/apis/velero/v2alpha1/data_upload_types.go @@ -19,7 +19,7 @@ package v2alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/velero-io/velero/pkg/apis/velero/shared" + "github.com/vmware-tanzu/velero/pkg/apis/velero/shared" ) // DataUploadSpec is the specification for a DataUpload. diff --git a/pkg/archive/extractor.go b/pkg/archive/extractor.go index 42c65be39..aae9a7a85 100644 --- a/pkg/archive/extractor.go +++ b/pkg/archive/extractor.go @@ -26,7 +26,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/velero-io/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) // Extractor unzips/extracts a backup tarball to a local diff --git a/pkg/archive/extractor_test.go b/pkg/archive/extractor_test.go index dde69d4aa..a4daf02ca 100644 --- a/pkg/archive/extractor_test.go +++ b/pkg/archive/extractor_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) func TestUnzipAndExtractBackup(t *testing.T) { diff --git a/pkg/archive/filesystem.go b/pkg/archive/filesystem.go index c3a196930..73b0d1dcf 100644 --- a/pkg/archive/filesystem.go +++ b/pkg/archive/filesystem.go @@ -22,8 +22,8 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/util/filesystem" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) // GetItemFilePath returns an item's file path once extracted from a Velero backup archive. diff --git a/pkg/archive/filesystem_test.go b/pkg/archive/filesystem_test.go index 08e526466..bf7f16c76 100644 --- a/pkg/archive/filesystem_test.go +++ b/pkg/archive/filesystem_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/test" ) func TestGetItemFilePath(t *testing.T) { diff --git a/pkg/archive/parser.go b/pkg/archive/parser.go index 4f682d333..166e03114 100644 --- a/pkg/archive/parser.go +++ b/pkg/archive/parser.go @@ -25,8 +25,8 @@ import ( "github.com/sirupsen/logrus" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/util/filesystem" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) var ErrNotExist = errors.New("does not exist") diff --git a/pkg/archive/parser_test.go b/pkg/archive/parser_test.go index 3ea837bb5..1af8077e8 100644 --- a/pkg/archive/parser_test.go +++ b/pkg/archive/parser_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/test" ) func TestParse(t *testing.T) { diff --git a/pkg/backup/actions/backup_pv_action.go b/pkg/backup/actions/backup_pv_action.go index b1c9a4826..c3f378fac 100644 --- a/pkg/backup/actions/backup_pv_action.go +++ b/pkg/backup/actions/backup_pv_action.go @@ -25,9 +25,9 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util/actionhelpers" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util/actionhelpers" ) // PVCAction inspects a PersistentVolumeClaim for the PersistentVolume diff --git a/pkg/backup/actions/backup_pv_action_test.go b/pkg/backup/actions/backup_pv_action_test.go index 5b0fc3a47..41af9e9bf 100644 --- a/pkg/backup/actions/backup_pv_action_test.go +++ b/pkg/backup/actions/backup_pv_action_test.go @@ -26,11 +26,11 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestBackupPVAction(t *testing.T) { diff --git a/pkg/backup/actions/csi/pvc_action.go b/pkg/backup/actions/csi/pvc_action.go index fa6414f39..7f5fd2afa 100644 --- a/pkg/backup/actions/csi/pvc_action.go +++ b/pkg/backup/actions/csi/pvc_action.go @@ -44,21 +44,21 @@ import ( "k8s.io/apimachinery/pkg/api/resource" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - veleroclient "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/label" - plugincommon "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/utils/volumehelper" - "github.com/velero-io/velero/pkg/plugin/velero" - biav2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2" - uploaderUtil "github.com/velero-io/velero/pkg/uploader/util" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/csi" - kubeutil "github.com/velero-io/velero/pkg/util/kube" - podvolumeutil "github.com/velero-io/velero/pkg/util/podvolume" - vhutil "github.com/velero-io/velero/pkg/util/volumehelper" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + veleroclient "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/label" + plugincommon "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/utils/volumehelper" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + biav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2" + uploaderUtil "github.com/vmware-tanzu/velero/pkg/uploader/util" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/csi" + kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" + podvolumeutil "github.com/vmware-tanzu/velero/pkg/util/podvolume" + vhutil "github.com/vmware-tanzu/velero/pkg/util/volumehelper" ) // TODO: Replace hardcoded VolumeSnapshot finalizer strings with constants from diff --git a/pkg/backup/actions/csi/pvc_action_test.go b/pkg/backup/actions/csi/pvc_action_test.go index 9d9818571..629c5e9cd 100644 --- a/pkg/backup/actions/csi/pvc_action_test.go +++ b/pkg/backup/actions/csi/pvc_action_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/velero-io/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/kuberesource" volumegroupsnapshotv1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" "github.com/stretchr/testify/assert" @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/utils/pointer" - "github.com/velero-io/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/label" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" @@ -50,13 +50,13 @@ import ( "k8s.io/apimachinery/pkg/util/wait" crclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/apis/velero/shared" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/apis/velero/shared" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) const testDriver = "csi.example.com" diff --git a/pkg/backup/actions/csi/volumesnapshot_action.go b/pkg/backup/actions/csi/volumesnapshot_action.go index 5eefde544..0e0e9a840 100644 --- a/pkg/backup/actions/csi/volumesnapshot_action.go +++ b/pkg/backup/actions/csi/volumesnapshot_action.go @@ -30,16 +30,16 @@ import ( "k8s.io/apimachinery/pkg/runtime" crclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/label" - plugincommon "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - biav2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/csi" - kubeutil "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/label" + plugincommon "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + biav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/csi" + kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" ) // volumeSnapshotBackupItemAction is a backup item action plugin to backup diff --git a/pkg/backup/actions/csi/volumesnapshot_action_test.go b/pkg/backup/actions/csi/volumesnapshot_action_test.go index 1684c2371..1db5cd475 100644 --- a/pkg/backup/actions/csi/volumesnapshot_action_test.go +++ b/pkg/backup/actions/csi/volumesnapshot_action_test.go @@ -28,12 +28,12 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestVSExecute(t *testing.T) { diff --git a/pkg/backup/actions/csi/volumesnapshotclass_action.go b/pkg/backup/actions/csi/volumesnapshotclass_action.go index b54a59271..8200b465f 100644 --- a/pkg/backup/actions/csi/volumesnapshotclass_action.go +++ b/pkg/backup/actions/csi/volumesnapshotclass_action.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - csiutil "github.com/velero-io/velero/pkg/util/csi" - kubeutil "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + csiutil "github.com/vmware-tanzu/velero/pkg/util/csi" + kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" ) // volumeSnapshotClassBackupItemAction is a backup item action plugin to diff --git a/pkg/backup/actions/csi/volumesnapshotclass_action_test.go b/pkg/backup/actions/csi/volumesnapshotclass_action_test.go index 92999361a..3bd90a8aa 100644 --- a/pkg/backup/actions/csi/volumesnapshotclass_action_test.go +++ b/pkg/backup/actions/csi/volumesnapshotclass_action_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) func TestVSClassExecute(t *testing.T) { diff --git a/pkg/backup/actions/csi/volumesnapshotcontent_action.go b/pkg/backup/actions/csi/volumesnapshotcontent_action.go index e0e2d9d32..d4cd6d46c 100644 --- a/pkg/backup/actions/csi/volumesnapshotcontent_action.go +++ b/pkg/backup/actions/csi/volumesnapshotcontent_action.go @@ -25,11 +25,11 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - csiutil "github.com/velero-io/velero/pkg/util/csi" - kubeutil "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + csiutil "github.com/vmware-tanzu/velero/pkg/util/csi" + kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" ) // volumeSnapshotContentBackupItemAction is a backup item action plugin to backup diff --git a/pkg/backup/actions/csi/volumesnapshotcontent_action_test.go b/pkg/backup/actions/csi/volumesnapshotcontent_action_test.go index f858d6054..e24623d9a 100644 --- a/pkg/backup/actions/csi/volumesnapshotcontent_action_test.go +++ b/pkg/backup/actions/csi/volumesnapshotcontent_action_test.go @@ -25,11 +25,11 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestVSCExecute(t *testing.T) { diff --git a/pkg/backup/actions/pod_action.go b/pkg/backup/actions/pod_action.go index 8a2c81018..8ed5e3b44 100644 --- a/pkg/backup/actions/pod_action.go +++ b/pkg/backup/actions/pod_action.go @@ -22,9 +22,9 @@ import ( corev1api "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util/actionhelpers" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util/actionhelpers" ) // PodAction implements ItemAction. diff --git a/pkg/backup/actions/pod_action_test.go b/pkg/backup/actions/pod_action_test.go index a363043ec..d0d30b653 100644 --- a/pkg/backup/actions/pod_action_test.go +++ b/pkg/backup/actions/pod_action_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestPodActionAppliesTo(t *testing.T) { diff --git a/pkg/backup/actions/remap_crd_version_action.go b/pkg/backup/actions/remap_crd_version_action.go index c7ad51bdc..3f8c2f79d 100644 --- a/pkg/backup/actions/remap_crd_version_action.go +++ b/pkg/backup/actions/remap_crd_version_action.go @@ -30,10 +30,10 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - velerodiscovery "github.com/velero-io/velero/pkg/discovery" + velerodiscovery "github.com/vmware-tanzu/velero/pkg/discovery" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/velero" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // RemapCRDVersionAction inspects CustomResourceDefinition and decides if it is a v1 diff --git a/pkg/backup/actions/remap_crd_version_action_test.go b/pkg/backup/actions/remap_crd_version_action_test.go index 4eb03f5bd..8f21fb151 100644 --- a/pkg/backup/actions/remap_crd_version_action_test.go +++ b/pkg/backup/actions/remap_crd_version_action_test.go @@ -31,11 +31,11 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - velerodiscovery "github.com/velero-io/velero/pkg/discovery" + velerodiscovery "github.com/vmware-tanzu/velero/pkg/discovery" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - velerotest "github.com/velero-io/velero/pkg/test" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestRemapCRDVersionAction(t *testing.T) { diff --git a/pkg/backup/actions/service_account_action.go b/pkg/backup/actions/service_account_action.go index 810de51c1..b563f7a03 100644 --- a/pkg/backup/actions/service_account_action.go +++ b/pkg/backup/actions/service_account_action.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - velerodiscovery "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util/actionhelpers" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerodiscovery "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util/actionhelpers" ) // ServiceAccountAction implements ItemAction. diff --git a/pkg/backup/actions/service_account_action_test.go b/pkg/backup/actions/service_account_action_test.go index c5164d40b..90d09005b 100644 --- a/pkg/backup/actions/service_account_action_test.go +++ b/pkg/backup/actions/service_account_action_test.go @@ -28,10 +28,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/actionhelpers" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/actionhelpers" ) func newV1ClusterRoleBindingList(rbacCRBList []rbacv1.ClusterRoleBinding) []actionhelpers.ClusterRoleBinding { diff --git a/pkg/backup/backup.go b/pkg/backup/backup.go index 0c75cf447..9edaf6a85 100644 --- a/pkg/backup/backup.go +++ b/pkg/backup/backup.go @@ -42,28 +42,28 @@ import ( "k8s.io/apimachinery/pkg/util/wait" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/hook" - "github.com/velero-io/velero/internal/volume" - "github.com/velero-io/velero/internal/volumehelper" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/itemblock" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/persistence" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - "github.com/velero-io/velero/pkg/plugin/framework" - "github.com/velero-io/velero/pkg/plugin/velero" - biav2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2" - ibav1 "github.com/velero-io/velero/pkg/plugin/velero/itemblockaction/v1" - vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1" - "github.com/velero-io/velero/pkg/podexec" - "github.com/velero-io/velero/pkg/podvolume" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/collections" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/internal/hook" + "github.com/vmware-tanzu/velero/internal/volume" + "github.com/vmware-tanzu/velero/internal/volumehelper" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/itemblock" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/persistence" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + biav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2" + ibav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/itemblockaction/v1" + vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1" + "github.com/vmware-tanzu/velero/pkg/podexec" + "github.com/vmware-tanzu/velero/pkg/podvolume" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/collections" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) // BackupVersion is the current backup major version for Velero. @@ -327,7 +327,7 @@ func (kb *kubernetesBackupper) BackupWithResolvers( // check if there are any namespaces included in the backup which are managed by argoCD // We will check for the existence of a ArgoCD label in the includedNamespaces and add a warning // so that users are at least aware about the existence of argoCD managed ns in their backup - // Related Issue: https://github.com/velero-io/velero/issues/7905 + // Related Issue: https://github.com/vmware-tanzu/velero/issues/7905 if len(nsManagedByArgoCD) > 0 { log.Warnf("backup operation may encounter complications and potentially produce undesirable results due to the inclusion of namespaces %v managed by ArgoCD in the backup.", nsManagedByArgoCD) } diff --git a/pkg/backup/backup_test.go b/pkg/backup/backup_test.go index c4215eaf9..f9351245c 100644 --- a/pkg/backup/backup_test.go +++ b/pkg/backup/backup_test.go @@ -41,26 +41,26 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/internal/resourcepolicies" - "github.com/velero-io/velero/internal/volume" - "github.com/velero-io/velero/pkg/apis/velero/shared" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/features" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/persistence" - persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks" - "github.com/velero-io/velero/pkg/plugin/velero" - biav2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2" - ibav1 "github.com/velero-io/velero/pkg/plugin/velero/itemblockaction/v1" - vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1" - "github.com/velero-io/velero/pkg/podvolume" - "github.com/velero-io/velero/pkg/test" - kubeutil "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/internal/resourcepolicies" + "github.com/vmware-tanzu/velero/internal/volume" + "github.com/vmware-tanzu/velero/pkg/apis/velero/shared" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/persistence" + persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + biav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2" + ibav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/itemblockaction/v1" + vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1" + "github.com/vmware-tanzu/velero/pkg/podvolume" + "github.com/vmware-tanzu/velero/pkg/test" + kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" ) func TestBackedUpItemsMatchesTarballContents(t *testing.T) { @@ -1180,7 +1180,7 @@ func TestBackupResourceCohabitation(t *testing.T) { // TestBackupUsesNewCohabitatingResourcesForEachBackup ensures that when two backups are // run that each include cohabiting resources, one copy of the relevant resources is // 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/velero-io/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) { h := newHarness(t, nil) defer h.itemBlockPool.Stop() diff --git a/pkg/backup/delete_helpers.go b/pkg/backup/delete_helpers.go index 4641ed597..fa4cbb744 100644 --- a/pkg/backup/delete_helpers.go +++ b/pkg/backup/delete_helpers.go @@ -21,8 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/label" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/label" ) // NewDeleteBackupRequest creates a DeleteBackupRequest for the backup identified by name and uid. diff --git a/pkg/backup/item_backupper.go b/pkg/backup/item_backupper.go index 9a5476cd9..2ca266e91 100644 --- a/pkg/backup/item_backupper.go +++ b/pkg/backup/item_backupper.go @@ -37,23 +37,23 @@ import ( "k8s.io/apimachinery/pkg/util/sets" kbClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/hook" - "github.com/velero-io/velero/internal/resourcepolicies" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/archive" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/features" - "github.com/velero-io/velero/pkg/itemblock" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1" - "github.com/velero-io/velero/pkg/podvolume" - "github.com/velero-io/velero/pkg/util/boolptr" - csiutil "github.com/velero-io/velero/pkg/util/csi" - "github.com/velero-io/velero/pkg/util/volumehelper" + "github.com/vmware-tanzu/velero/internal/hook" + "github.com/vmware-tanzu/velero/internal/resourcepolicies" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/archive" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/itemblock" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1" + "github.com/vmware-tanzu/velero/pkg/podvolume" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + csiutil "github.com/vmware-tanzu/velero/pkg/util/csi" + "github.com/vmware-tanzu/velero/pkg/util/volumehelper" ) const ( diff --git a/pkg/backup/item_backupper_test.go b/pkg/backup/item_backupper_test.go index 0e56e5aca..be91b6d34 100644 --- a/pkg/backup/item_backupper_test.go +++ b/pkg/backup/item_backupper_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/velero-io/velero/internal/resourcepolicies" - "github.com/velero-io/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/internal/resourcepolicies" + "github.com/vmware-tanzu/velero/pkg/kuberesource" "github.com/stretchr/testify/assert" corev1api "k8s.io/api/core/v1" @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/builder" ) func Test_resourceKey(t *testing.T) { diff --git a/pkg/backup/item_collector.go b/pkg/backup/item_collector.go index 17b71a8c1..3dace71fd 100644 --- a/pkg/backup/item_collector.go +++ b/pkg/backup/item_collector.go @@ -35,11 +35,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/tools/pager" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util/collections" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util/collections" ) // itemCollector collects items from the Kubernetes API according to @@ -150,7 +150,7 @@ func (nt *nsTracker) init( // Skip the backup when the backup's namespace filter has // default value, and the namespace doesn't match backup // LabelSelector and OrLabelSelector. - // https://github.com/velero-io/velero/issues/7105 + // https://github.com/vmware-tanzu/velero/issues/7105 if nt.namespaceFilter.IncludeEverything() && (nt.singleLabelSelector != nil || len(nt.orLabelSelector) > 0) { continue diff --git a/pkg/backup/item_collector_test.go b/pkg/backup/item_collector_test.go index 2349994ee..54e2ed4c3 100644 --- a/pkg/backup/item_collector_test.go +++ b/pkg/backup/item_collector_test.go @@ -28,11 +28,11 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/collections" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/collections" ) func TestSortCoreGroup(t *testing.T) { diff --git a/pkg/backup/itemblock.go b/pkg/backup/itemblock.go index 81febefd4..dee553f72 100644 --- a/pkg/backup/itemblock.go +++ b/pkg/backup/itemblock.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/velero-io/velero/pkg/itemblock" + "github.com/vmware-tanzu/velero/pkg/itemblock" ) type BackupItemBlock struct { diff --git a/pkg/backup/request.go b/pkg/backup/request.go index eb712387e..ca2e638c2 100644 --- a/pkg/backup/request.go +++ b/pkg/backup/request.go @@ -22,13 +22,13 @@ import ( "github.com/gobwas/glob" "k8s.io/apimachinery/pkg/labels" - "github.com/velero-io/velero/internal/hook" - "github.com/velero-io/velero/internal/resourcepolicies" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/plugin/framework" - "github.com/velero-io/velero/pkg/util/collections" + "github.com/vmware-tanzu/velero/internal/hook" + "github.com/vmware-tanzu/velero/internal/resourcepolicies" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + "github.com/vmware-tanzu/velero/pkg/util/collections" ) type itemKey struct { diff --git a/pkg/backup/snapshots.go b/pkg/backup/snapshots.go index a06e74413..c77e1cd6e 100644 --- a/pkg/backup/snapshots.go +++ b/pkg/backup/snapshots.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/util/sets" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/features" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/util/boolptr" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" ) // GetBackupCSIResources is used to get CSI snapshot related resources. diff --git a/pkg/backup/volume_snapshotter_cache.go b/pkg/backup/volume_snapshotter_cache.go index 0c72a03f2..620ebc337 100644 --- a/pkg/backup/volume_snapshotter_cache.go +++ b/pkg/backup/volume_snapshotter_cache.go @@ -3,8 +3,8 @@ package backup import ( "sync" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1" ) type VolumeSnapshotterCache struct { diff --git a/pkg/builder/backup_builder.go b/pkg/builder/backup_builder.go index a5e368c1b..d5b955e43 100644 --- a/pkg/builder/backup_builder.go +++ b/pkg/builder/backup_builder.go @@ -23,13 +23,13 @@ import ( corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/velero-io/velero/internal/resourcepolicies" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/internal/resourcepolicies" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" "github.com/sirupsen/logrus" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/logging" ) /* diff --git a/pkg/builder/backup_storage_location_builder.go b/pkg/builder/backup_storage_location_builder.go index d1d5ef25a..33becd2a7 100644 --- a/pkg/builder/backup_storage_location_builder.go +++ b/pkg/builder/backup_storage_location_builder.go @@ -22,7 +22,7 @@ import ( corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // BackupStorageLocationBuilder builds BackupStorageLocation objects. diff --git a/pkg/builder/container_builder.go b/pkg/builder/container_builder.go index 64275cc7c..762462c86 100644 --- a/pkg/builder/container_builder.go +++ b/pkg/builder/container_builder.go @@ -23,7 +23,7 @@ import ( corev1api "k8s.io/api/core/v1" apimachineryRuntime "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/label" ) // ContainerBuilder builds Container objects diff --git a/pkg/builder/container_builder_test.go b/pkg/builder/container_builder_test.go index b8f57eb15..b23cbddfd 100644 --- a/pkg/builder/container_builder_test.go +++ b/pkg/builder/container_builder_test.go @@ -89,8 +89,8 @@ func TestGetName(t *testing.T) { }, { name: "pull by digest", - image: "quay.io/velero-io/velero@sha256:a75f9e8c3ced3943515f249597be389f8233e1258d289b11184796edceaa7dab", - expected: "velero-io-velero", + image: "quay.io/vmware-tanzu/velero@sha256:a75f9e8c3ced3943515f249597be389f8233e1258d289b11184796edceaa7dab", + expected: "vmware-tanzu-velero", }, } diff --git a/pkg/builder/data_download_builder.go b/pkg/builder/data_download_builder.go index f219275cb..20cea868f 100644 --- a/pkg/builder/data_download_builder.go +++ b/pkg/builder/data_download_builder.go @@ -19,8 +19,8 @@ package builder import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/velero-io/velero/pkg/apis/velero/shared" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/apis/velero/shared" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" ) // DataDownloadBuilder builds DataDownload objects. diff --git a/pkg/builder/data_upload_builder.go b/pkg/builder/data_upload_builder.go index 0ef01f66d..c8fa34956 100644 --- a/pkg/builder/data_upload_builder.go +++ b/pkg/builder/data_upload_builder.go @@ -19,8 +19,8 @@ package builder import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/velero-io/velero/pkg/apis/velero/shared" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/apis/velero/shared" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" ) // DataUploadBuilder builds DataUpload objects diff --git a/pkg/builder/delete_backup_request_builder.go b/pkg/builder/delete_backup_request_builder.go index aa3fd1f9c..c0dfdbdbf 100644 --- a/pkg/builder/delete_backup_request_builder.go +++ b/pkg/builder/delete_backup_request_builder.go @@ -19,7 +19,7 @@ package builder import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // DeleteBackupRequestBuilder builds DeleteBackupRequest objects diff --git a/pkg/builder/download_request_builder.go b/pkg/builder/download_request_builder.go index cca81db11..05d5c0daa 100644 --- a/pkg/builder/download_request_builder.go +++ b/pkg/builder/download_request_builder.go @@ -19,7 +19,7 @@ package builder import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // DownloadRequestBuilder builds DownloadRequest objects. diff --git a/pkg/builder/item_operation_builder.go b/pkg/builder/item_operation_builder.go index b76de79b2..210752b82 100644 --- a/pkg/builder/item_operation_builder.go +++ b/pkg/builder/item_operation_builder.go @@ -22,8 +22,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // OperationStatusBuilder builds OperationStatus objects diff --git a/pkg/builder/pod_volume_backup_builder.go b/pkg/builder/pod_volume_backup_builder.go index dbcc72c9a..9db8beacd 100644 --- a/pkg/builder/pod_volume_backup_builder.go +++ b/pkg/builder/pod_volume_backup_builder.go @@ -19,7 +19,7 @@ package builder import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // PodVolumeBackupBuilder builds PodVolumeBackup objects diff --git a/pkg/builder/pod_volume_restore_builder.go b/pkg/builder/pod_volume_restore_builder.go index 02108cb4a..50f277eac 100644 --- a/pkg/builder/pod_volume_restore_builder.go +++ b/pkg/builder/pod_volume_restore_builder.go @@ -19,7 +19,7 @@ package builder import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // PodVolumeRestoreBuilder builds PodVolumeRestore objects. diff --git a/pkg/builder/restore_builder.go b/pkg/builder/restore_builder.go index 168136552..bad4327e9 100644 --- a/pkg/builder/restore_builder.go +++ b/pkg/builder/restore_builder.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // RestoreBuilder builds Restore objects. diff --git a/pkg/builder/schedule_builder.go b/pkg/builder/schedule_builder.go index ef9e03a1a..7c9a9b1d9 100644 --- a/pkg/builder/schedule_builder.go +++ b/pkg/builder/schedule_builder.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // ScheduleBuilder builds Schedule objects. diff --git a/pkg/builder/server_status_request_builder.go b/pkg/builder/server_status_request_builder.go index 80fc8078c..bc8876718 100644 --- a/pkg/builder/server_status_request_builder.go +++ b/pkg/builder/server_status_request_builder.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // ServerStatusRequestBuilder builds ServerStatusRequest objects. diff --git a/pkg/builder/testcr_builder.go b/pkg/builder/testcr_builder.go index 02da95b73..85bc83b1c 100644 --- a/pkg/builder/testcr_builder.go +++ b/pkg/builder/testcr_builder.go @@ -19,7 +19,7 @@ package builder import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // CustomResourceBuilder builds objects based on velero APIVersion CRDs. diff --git a/pkg/builder/volume_snapshot_location_builder.go b/pkg/builder/volume_snapshot_location_builder.go index 848dff401..af94471e3 100644 --- a/pkg/builder/volume_snapshot_location_builder.go +++ b/pkg/builder/volume_snapshot_location_builder.go @@ -21,7 +21,7 @@ import ( corev1api "k8s.io/api/core/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // VolumeSnapshotLocationBuilder builds VolumeSnapshotLocation objects. diff --git a/pkg/cbtservice/mocks/Service.go b/pkg/cbtservice/mocks/Service.go index 68016f393..f7a9567a8 100644 --- a/pkg/cbtservice/mocks/Service.go +++ b/pkg/cbtservice/mocks/Service.go @@ -8,7 +8,7 @@ import ( "context" mock "github.com/stretchr/testify/mock" - "github.com/velero-io/velero/pkg/cbtservice" + "github.com/vmware-tanzu/velero/pkg/cbtservice" ) // NewService creates a new instance of Service. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. diff --git a/pkg/client/client.go b/pkg/client/client.go index f37091b03..dccdc05fc 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -24,7 +24,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "github.com/velero-io/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 diff --git a/pkg/client/factory.go b/pkg/client/factory.go index 0590dff02..51dfb62c3 100644 --- a/pkg/client/factory.go +++ b/pkg/client/factory.go @@ -35,8 +35,8 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" ) //go:generate mockery --name Factory diff --git a/pkg/cmd/cli/backup/backup.go b/pkg/cmd/cli/backup/backup.go index 147336bec..34a0f9e97 100644 --- a/pkg/cmd/cli/backup/backup.go +++ b/pkg/cmd/cli/backup/backup.go @@ -19,7 +19,7 @@ package backup import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/client" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/backup/backup_test.go b/pkg/cmd/cli/backup/backup_test.go index 1b8e8ecf7..0c316ca8c 100644 --- a/pkg/cmd/cli/backup/backup_test.go +++ b/pkg/cmd/cli/backup/backup_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" ) func TestNewBackupCommand(t *testing.T) { diff --git a/pkg/cmd/cli/backup/create.go b/pkg/cmd/cli/backup/create.go index c15a95cc9..31564aae8 100644 --- a/pkg/cmd/cli/backup/create.go +++ b/pkg/cmd/cli/backup/create.go @@ -28,14 +28,14 @@ import ( "k8s.io/client-go/tools/cache" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/flag" - "github.com/velero-io/velero/pkg/cmd/util/output" - "github.com/velero-io/velero/pkg/util/collections" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" + "github.com/vmware-tanzu/velero/pkg/util/collections" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) func NewCreateCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/backup/create_test.go b/pkg/cmd/cli/backup/create_test.go index 5709e912e..c8fd15baa 100644 --- a/pkg/cmd/cli/backup/create_test.go +++ b/pkg/cmd/cli/backup/create_test.go @@ -33,12 +33,12 @@ import ( controllerclient "sigs.k8s.io/controller-runtime/pkg/client" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - cmdtest "github.com/velero-io/velero/pkg/cmd/test" - "github.com/velero-io/velero/pkg/test" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" + "github.com/vmware-tanzu/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestCreateOptions_BuildBackup(t *testing.T) { diff --git a/pkg/cmd/cli/backup/delete.go b/pkg/cmd/cli/backup/delete.go index afacf53f8..692b82dbf 100644 --- a/pkg/cmd/cli/backup/delete.go +++ b/pkg/cmd/cli/backup/delete.go @@ -27,13 +27,13 @@ import ( kubeerrs "k8s.io/apimachinery/pkg/util/errors" controllerclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/cli" - "github.com/velero-io/velero/pkg/cmd/util/confirm" - "github.com/velero-io/velero/pkg/label" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/cli" + "github.com/vmware-tanzu/velero/pkg/cmd/util/confirm" + "github.com/vmware-tanzu/velero/pkg/label" ) // NewDeleteCommand creates a new command that deletes a backup. diff --git a/pkg/cmd/cli/backup/delete_test.go b/pkg/cmd/cli/backup/delete_test.go index a0954127f..3278e8153 100644 --- a/pkg/cmd/cli/backup/delete_test.go +++ b/pkg/cmd/cli/backup/delete_test.go @@ -26,12 +26,12 @@ import ( "github.com/stretchr/testify/require" controllerclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - "github.com/velero-io/velero/pkg/cmd/cli" - cmdtest "github.com/velero-io/velero/pkg/cmd/test" - velerotest "github.com/velero-io/velero/pkg/test" - veleroexec "github.com/velero-io/velero/pkg/util/exec" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + "github.com/vmware-tanzu/velero/pkg/cmd/cli" + cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) func TestDeleteCommand(t *testing.T) { diff --git a/pkg/cmd/cli/backup/describe.go b/pkg/cmd/cli/backup/describe.go index 35b910085..b0ef4a93e 100644 --- a/pkg/cmd/cli/backup/describe.go +++ b/pkg/cmd/cli/backup/describe.go @@ -26,11 +26,11 @@ import ( "k8s.io/apimachinery/pkg/labels" controllerclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/output" - "github.com/velero-io/velero/pkg/label" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" + "github.com/vmware-tanzu/velero/pkg/label" ) func NewDescribeCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/backup/describe_test.go b/pkg/cmd/cli/backup/describe_test.go index 9a22d6da7..5d5486473 100644 --- a/pkg/cmd/cli/backup/describe_test.go +++ b/pkg/cmd/cli/backup/describe_test.go @@ -27,12 +27,12 @@ import ( "k8s.io/client-go/rest" controllerclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - cmdtest "github.com/velero-io/velero/pkg/cmd/test" - "github.com/velero-io/velero/pkg/features" - "github.com/velero-io/velero/pkg/test" - veleroexec "github.com/velero-io/velero/pkg/util/exec" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" + "github.com/vmware-tanzu/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/test" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) func TestNewDescribeCommand(t *testing.T) { diff --git a/pkg/cmd/cli/backup/download.go b/pkg/cmd/cli/backup/download.go index 2c2d1b0cc..8bb973ff0 100644 --- a/pkg/cmd/cli/backup/download.go +++ b/pkg/cmd/cli/backup/download.go @@ -28,11 +28,11 @@ import ( "github.com/spf13/pflag" controllerclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/cacert" - "github.com/velero-io/velero/pkg/cmd/util/downloadrequest" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/cacert" + "github.com/vmware-tanzu/velero/pkg/cmd/util/downloadrequest" ) func NewDownloadCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/backup/download_test.go b/pkg/cmd/cli/backup/download_test.go index 921cc9174..999799ff3 100644 --- a/pkg/cmd/cli/backup/download_test.go +++ b/pkg/cmd/cli/backup/download_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - cmdtest "github.com/velero-io/velero/pkg/cmd/test" - velerotest "github.com/velero-io/velero/pkg/test" - veleroexec "github.com/velero-io/velero/pkg/util/exec" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) func TestNewDownloadCommand(t *testing.T) { diff --git a/pkg/cmd/cli/backup/get.go b/pkg/cmd/cli/backup/get.go index 81a6d3028..159fac30d 100644 --- a/pkg/cmd/cli/backup/get.go +++ b/pkg/cmd/cli/backup/get.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/labels" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/output" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" ) func NewGetCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/backup/get_test.go b/pkg/cmd/cli/backup/get_test.go index c0d587eb0..28c41a6de 100644 --- a/pkg/cmd/cli/backup/get_test.go +++ b/pkg/cmd/cli/backup/get_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/require" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - cmdtest "github.com/velero-io/velero/pkg/cmd/test" - velerotest "github.com/velero-io/velero/pkg/test" - veleroexec "github.com/velero-io/velero/pkg/util/exec" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) func TestNewGetCommand(t *testing.T) { diff --git a/pkg/cmd/cli/backup/logs.go b/pkg/cmd/cli/backup/logs.go index 62ec71942..a0149acf1 100644 --- a/pkg/cmd/cli/backup/logs.go +++ b/pkg/cmd/cli/backup/logs.go @@ -27,11 +27,11 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/cacert" - "github.com/velero-io/velero/pkg/cmd/util/downloadrequest" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/cacert" + "github.com/vmware-tanzu/velero/pkg/cmd/util/downloadrequest" ) type LogsOptions struct { diff --git a/pkg/cmd/cli/backup/logs_test.go b/pkg/cmd/cli/backup/logs_test.go index 598ca06f4..87e100732 100644 --- a/pkg/cmd/cli/backup/logs_test.go +++ b/pkg/cmd/cli/backup/logs_test.go @@ -33,12 +33,12 @@ import ( "github.com/stretchr/testify/require" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - cmdtest "github.com/velero-io/velero/pkg/cmd/test" - "github.com/velero-io/velero/pkg/cmd/util/cacert" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" + "github.com/vmware-tanzu/velero/pkg/cmd/util/cacert" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestNewLogsCommand(t *testing.T) { diff --git a/pkg/cmd/cli/backuplocation/backup_location.go b/pkg/cmd/cli/backuplocation/backup_location.go index 3b8d28fb0..f008b2a1e 100644 --- a/pkg/cmd/cli/backuplocation/backup_location.go +++ b/pkg/cmd/cli/backuplocation/backup_location.go @@ -19,7 +19,7 @@ package backuplocation import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/client" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/backuplocation/backup_location_test.go b/pkg/cmd/cli/backuplocation/backup_location_test.go index 735cbbfd3..7fc73d63d 100644 --- a/pkg/cmd/cli/backuplocation/backup_location_test.go +++ b/pkg/cmd/cli/backuplocation/backup_location_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" ) func TestNewCommand(t *testing.T) { diff --git a/pkg/cmd/cli/backuplocation/create.go b/pkg/cmd/cli/backuplocation/create.go index 191bc64d0..343bc790a 100644 --- a/pkg/cmd/cli/backuplocation/create.go +++ b/pkg/cmd/cli/backuplocation/create.go @@ -31,13 +31,13 @@ import ( kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/storage" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/flag" - "github.com/velero-io/velero/pkg/cmd/util/output" + "github.com/vmware-tanzu/velero/internal/storage" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" ) func NewCreateCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/backuplocation/create_test.go b/pkg/cmd/cli/backuplocation/create_test.go index aa0f88f9e..25d5b2cd6 100644 --- a/pkg/cmd/cli/backuplocation/create_test.go +++ b/pkg/cmd/cli/backuplocation/create_test.go @@ -30,9 +30,9 @@ import ( corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - veleroflag "github.com/velero-io/velero/pkg/cmd/util/flag" - velerotest "github.com/velero-io/velero/pkg/test" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + veleroflag "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestBuildBackupStorageLocationSetsNamespace(t *testing.T) { diff --git a/pkg/cmd/cli/backuplocation/delete.go b/pkg/cmd/cli/backuplocation/delete.go index 4ffde572c..f2c3bcc3d 100644 --- a/pkg/cmd/cli/backuplocation/delete.go +++ b/pkg/cmd/cli/backuplocation/delete.go @@ -27,11 +27,11 @@ import ( kubeerrs "k8s.io/apimachinery/pkg/util/errors" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/cli" - "github.com/velero-io/velero/pkg/cmd/util/confirm" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/cli" + "github.com/vmware-tanzu/velero/pkg/cmd/util/confirm" ) // NewDeleteCommand creates and returns a new cobra command for deleting backup-locations. diff --git a/pkg/cmd/cli/backuplocation/delete_test.go b/pkg/cmd/cli/backuplocation/delete_test.go index 9c524e1a3..70ff7568b 100644 --- a/pkg/cmd/cli/backuplocation/delete_test.go +++ b/pkg/cmd/cli/backuplocation/delete_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - "github.com/velero-io/velero/pkg/cmd/cli" - cmdtest "github.com/velero-io/velero/pkg/cmd/test" - velerotest "github.com/velero-io/velero/pkg/test" - veleroexec "github.com/velero-io/velero/pkg/util/exec" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + "github.com/vmware-tanzu/velero/pkg/cmd/cli" + cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) func TestNewDeleteCommand(t *testing.T) { diff --git a/pkg/cmd/cli/backuplocation/get.go b/pkg/cmd/cli/backuplocation/get.go index 58090212f..fd7c057c2 100644 --- a/pkg/cmd/cli/backuplocation/get.go +++ b/pkg/cmd/cli/backuplocation/get.go @@ -24,10 +24,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/output" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" ) func NewGetCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/backuplocation/get_test.go b/pkg/cmd/cli/backuplocation/get_test.go index 6887a674e..d45231fce 100644 --- a/pkg/cmd/cli/backuplocation/get_test.go +++ b/pkg/cmd/cli/backuplocation/get_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - cmdtest "github.com/velero-io/velero/pkg/cmd/test" - velerotest "github.com/velero-io/velero/pkg/test" - veleroexec "github.com/velero-io/velero/pkg/util/exec" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) func TestNewGetCommand(t *testing.T) { diff --git a/pkg/cmd/cli/backuplocation/set.go b/pkg/cmd/cli/backuplocation/set.go index 1ece5ff82..8aa018e29 100644 --- a/pkg/cmd/cli/backuplocation/set.go +++ b/pkg/cmd/cli/backuplocation/set.go @@ -28,13 +28,13 @@ import ( kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/storage" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/flag" - "github.com/velero-io/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/internal/storage" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" ) func NewSetCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/backuplocation/set_test.go b/pkg/cmd/cli/backuplocation/set_test.go index efd24c7f1..0ebf8a8d3 100644 --- a/pkg/cmd/cli/backuplocation/set_test.go +++ b/pkg/cmd/cli/backuplocation/set_test.go @@ -28,12 +28,12 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - cmdtest "github.com/velero-io/velero/pkg/cmd/test" - veleroflag "github.com/velero-io/velero/pkg/cmd/util/flag" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/boolptr" - veleroexec "github.com/velero-io/velero/pkg/util/exec" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" + veleroflag "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) func TestNewSetCommand(t *testing.T) { diff --git a/pkg/cmd/cli/bug/bug.go b/pkg/cmd/cli/bug/bug.go index 54836a3b6..33fbb38b7 100644 --- a/pkg/cmd/cli/bug/bug.go +++ b/pkg/cmd/cli/bug/bug.go @@ -31,16 +31,16 @@ import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/buildinfo" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/buildinfo" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/features" ) const ( // kubectlTimeout is how long we wait in seconds for `kubectl version` // before killing the process kubectlTimeout = 5 * time.Second - issueURL = "https://github.com/velero-io/velero/issues/new" + issueURL = "https://github.com/vmware-tanzu/velero/issues/new" // 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 // the result of running `velero bug`. @@ -95,7 +95,7 @@ Please provide the output of the following commands (Pasting long output into a **Vote on this issue!** -This is an invitation to the Velero community to vote on issues, you can see the project's [top voted issues listed here](https://github.com/velero-io/velero/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc). +This is an invitation to the Velero community to vote on issues, you can see the project's [top voted issues listed here](https://github.com/vmware-tanzu/velero/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc). Use the "reaction smiley face" up to the right of this comment to vote. - :+1: for "I would like to see this bug fixed as soon as possible" diff --git a/pkg/cmd/cli/client/client.go b/pkg/cmd/cli/client/client.go index 75f996c6a..5d0650b10 100644 --- a/pkg/cmd/cli/client/client.go +++ b/pkg/cmd/cli/client/client.go @@ -19,7 +19,7 @@ package client import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/cmd/cli/client/config" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/client/config" ) func NewCommand() *cobra.Command { diff --git a/pkg/cmd/cli/client/config/get.go b/pkg/cmd/cli/client/config/get.go index a1c70382b..f69a8cadf 100644 --- a/pkg/cmd/cli/client/config/get.go +++ b/pkg/cmd/cli/client/config/get.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" ) func NewGetCommand() *cobra.Command { diff --git a/pkg/cmd/cli/client/config/set.go b/pkg/cmd/cli/client/config/set.go index afcb34c96..229ca1553 100644 --- a/pkg/cmd/cli/client/config/set.go +++ b/pkg/cmd/cli/client/config/set.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" ) func NewSetCommand() *cobra.Command { diff --git a/pkg/cmd/cli/create/create.go b/pkg/cmd/cli/create/create.go index 07ed10eef..e158d1560 100644 --- a/pkg/cmd/cli/create/create.go +++ b/pkg/cmd/cli/create/create.go @@ -19,12 +19,12 @@ package create import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd/cli/backup" - "github.com/velero-io/velero/pkg/cmd/cli/backuplocation" - "github.com/velero-io/velero/pkg/cmd/cli/restore" - "github.com/velero-io/velero/pkg/cmd/cli/schedule" - "github.com/velero-io/velero/pkg/cmd/cli/snapshotlocation" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/backup" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/backuplocation" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/restore" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/schedule" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/snapshotlocation" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/datamover/backup.go b/pkg/cmd/cli/datamover/backup.go index 8b266bc0a..2b647bb24 100644 --- a/pkg/cmd/cli/datamover/backup.go +++ b/pkg/cmd/cli/datamover/backup.go @@ -30,22 +30,22 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" - "github.com/velero-io/velero/internal/credentials" - "github.com/velero-io/velero/pkg/buildinfo" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd/util/signals" - "github.com/velero-io/velero/pkg/datamover" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/repository" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/filesystem" - "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/internal/credentials" + "github.com/vmware-tanzu/velero/pkg/buildinfo" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd/util/signals" + "github.com/vmware-tanzu/velero/pkg/datamover" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/repository" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/logging" ctrl "sigs.k8s.io/controller-runtime" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" ctlcache "sigs.k8s.io/controller-runtime/pkg/cache" ctlclient "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/cmd/cli/datamover/backup_test.go b/pkg/cmd/cli/datamover/backup_test.go index fc91f3910..2dd1e681d 100644 --- a/pkg/cmd/cli/datamover/backup_test.go +++ b/pkg/cmd/cli/datamover/backup_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/mock" ctlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/credentials" - cacheMock "github.com/velero-io/velero/pkg/cmd/cli/datamover/mocks" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/internal/credentials" + cacheMock "github.com/vmware-tanzu/velero/pkg/cmd/cli/datamover/mocks" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) func fakeCreateDataPathServiceWithErr(_ *dataMoverBackup) (dataPathService, error) { diff --git a/pkg/cmd/cli/datamover/data_mover.go b/pkg/cmd/cli/datamover/data_mover.go index e56bdb6b6..265d57bd8 100644 --- a/pkg/cmd/cli/datamover/data_mover.go +++ b/pkg/cmd/cli/datamover/data_mover.go @@ -18,7 +18,7 @@ import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/client" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/datamover/restore.go b/pkg/cmd/cli/datamover/restore.go index d6091c9f1..b2efdbc34 100644 --- a/pkg/cmd/cli/datamover/restore.go +++ b/pkg/cmd/cli/datamover/restore.go @@ -31,19 +31,19 @@ import ( "k8s.io/klog/v2" ctrl "sigs.k8s.io/controller-runtime" - "github.com/velero-io/velero/internal/credentials" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/buildinfo" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd/util/signals" - "github.com/velero-io/velero/pkg/datamover" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/repository" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/filesystem" - "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/internal/credentials" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/buildinfo" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd/util/signals" + "github.com/vmware-tanzu/velero/pkg/datamover" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/repository" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/logging" ctlcache "sigs.k8s.io/controller-runtime/pkg/cache" ctlclient "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/cmd/cli/datamover/restore_test.go b/pkg/cmd/cli/datamover/restore_test.go index 8fbc44fec..664c2bdbc 100644 --- a/pkg/cmd/cli/datamover/restore_test.go +++ b/pkg/cmd/cli/datamover/restore_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - cacheMock "github.com/velero-io/velero/pkg/cmd/cli/datamover/mocks" - velerotest "github.com/velero-io/velero/pkg/test" + cacheMock "github.com/vmware-tanzu/velero/pkg/cmd/cli/datamover/mocks" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func fakeCreateDataPathRestoreWithErr(_ *dataMoverRestore) (dataPathService, error) { diff --git a/pkg/cmd/cli/debug/debug.go b/pkg/cmd/cli/debug/debug.go index a2f92a313..400eddde1 100644 --- a/pkg/cmd/cli/debug/debug.go +++ b/pkg/cmd/cli/debug/debug.go @@ -35,9 +35,9 @@ import ( "k8s.io/client-go/tools/clientcmd" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" ) //go:embed cshd-scripts/velero.cshd diff --git a/pkg/cmd/cli/delete/delete.go b/pkg/cmd/cli/delete/delete.go index 389247a59..1eb910307 100644 --- a/pkg/cmd/cli/delete/delete.go +++ b/pkg/cmd/cli/delete/delete.go @@ -19,11 +19,11 @@ package delete import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd/cli/backup" - "github.com/velero-io/velero/pkg/cmd/cli/backuplocation" - "github.com/velero-io/velero/pkg/cmd/cli/restore" - "github.com/velero-io/velero/pkg/cmd/cli/schedule" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/backup" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/backuplocation" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/restore" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/schedule" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/delete_options.go b/pkg/cmd/cli/delete_options.go index b6b923945..78c7ae337 100644 --- a/pkg/cmd/cli/delete_options.go +++ b/pkg/cmd/cli/delete_options.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/pflag" controllerclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd/util/confirm" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd/util/confirm" ) // DeleteOptions contains parameters used for deleting a restore. diff --git a/pkg/cmd/cli/describe/describe.go b/pkg/cmd/cli/describe/describe.go index b7c93d78f..9f45260fa 100644 --- a/pkg/cmd/cli/describe/describe.go +++ b/pkg/cmd/cli/describe/describe.go @@ -19,10 +19,10 @@ package describe import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd/cli/backup" - "github.com/velero-io/velero/pkg/cmd/cli/restore" - "github.com/velero-io/velero/pkg/cmd/cli/schedule" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/backup" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/restore" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/schedule" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/get/get.go b/pkg/cmd/cli/get/get.go index e12abe08c..24ad16afb 100644 --- a/pkg/cmd/cli/get/get.go +++ b/pkg/cmd/cli/get/get.go @@ -19,13 +19,13 @@ package get import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd/cli/backup" - "github.com/velero-io/velero/pkg/cmd/cli/backuplocation" - "github.com/velero-io/velero/pkg/cmd/cli/plugin" - "github.com/velero-io/velero/pkg/cmd/cli/restore" - "github.com/velero-io/velero/pkg/cmd/cli/schedule" - "github.com/velero-io/velero/pkg/cmd/cli/snapshotlocation" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/backup" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/backuplocation" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/plugin" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/restore" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/schedule" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/snapshotlocation" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/install/install.go b/pkg/cmd/cli/install/install.go index 01ef58f75..8115e1353 100644 --- a/pkg/cmd/cli/install/install.go +++ b/pkg/cmd/cli/install/install.go @@ -28,16 +28,16 @@ import ( "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/velero-io/velero/internal/velero" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/flag" - "github.com/velero-io/velero/pkg/cmd/util/output" - "github.com/velero-io/velero/pkg/install" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/uploader" - kubeutil "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/internal/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" + "github.com/vmware-tanzu/velero/pkg/install" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/uploader" + kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" ) // Options collects all the options for installing Velero into a Kubernetes cluster. diff --git a/pkg/cmd/cli/install/install_test.go b/pkg/cmd/cli/install/install_test.go index 2a0572db2..1e0e7a4cf 100644 --- a/pkg/cmd/cli/install/install_test.go +++ b/pkg/cmd/cli/install/install_test.go @@ -27,8 +27,8 @@ import ( corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - velerotest "github.com/velero-io/velero/pkg/test" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestPriorityClassNameFlag(t *testing.T) { diff --git a/pkg/cmd/cli/nodeagent/node_agent.go b/pkg/cmd/cli/nodeagent/node_agent.go index 96a46b4a7..7b0b6ebf0 100644 --- a/pkg/cmd/cli/nodeagent/node_agent.go +++ b/pkg/cmd/cli/nodeagent/node_agent.go @@ -19,7 +19,7 @@ package nodeagent import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/client" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/nodeagent/server.go b/pkg/cmd/cli/nodeagent/server.go index ed9aa1adb..bb1764cb3 100644 --- a/pkg/cmd/cli/nodeagent/server.go +++ b/pkg/cmd/cli/nodeagent/server.go @@ -47,23 +47,23 @@ import ( ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/buildinfo" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/signals" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/controller" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/exposer" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/nodeagent" - repository "github.com/velero-io/velero/pkg/repository/manager" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/util/filesystem" - "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/pkg/util/logging" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/buildinfo" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/signals" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/controller" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/exposer" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/nodeagent" + repository "github.com/vmware-tanzu/velero/pkg/repository/manager" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/logging" ) var ( diff --git a/pkg/cmd/cli/nodeagent/server_test.go b/pkg/cmd/cli/nodeagent/server_test.go index 5ddb3bfe5..152016ab6 100644 --- a/pkg/cmd/cli/nodeagent/server_test.go +++ b/pkg/cmd/cli/nodeagent/server_test.go @@ -31,12 +31,12 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/nodeagent" - testutil "github.com/velero-io/velero/pkg/test" - velerotypes "github.com/velero-io/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/nodeagent" + testutil "github.com/vmware-tanzu/velero/pkg/test" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) func Test_validatePodVolumesHostPath(t *testing.T) { diff --git a/pkg/cmd/cli/plugin/add.go b/pkg/cmd/cli/plugin/add.go index 17f203227..9ea199fa9 100644 --- a/pkg/cmd/cli/plugin/add.go +++ b/pkg/cmd/cli/plugin/add.go @@ -29,11 +29,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/confirm" - "github.com/velero-io/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/confirm" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" ) const ( diff --git a/pkg/cmd/cli/plugin/get.go b/pkg/cmd/cli/plugin/get.go index 45d91b741..60a939257 100644 --- a/pkg/cmd/cli/plugin/get.go +++ b/pkg/cmd/cli/plugin/get.go @@ -24,10 +24,10 @@ import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/cli/serverstatus" - "github.com/velero-io/velero/pkg/cmd/util/output" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/serverstatus" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" ) func NewGetCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/plugin/helpers.go b/pkg/cmd/cli/plugin/helpers.go index 328e7b063..28f681993 100644 --- a/pkg/cmd/cli/plugin/helpers.go +++ b/pkg/cmd/cli/plugin/helpers.go @@ -25,11 +25,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/kubernetes" - "github.com/velero-io/velero/pkg/install" + "github.com/vmware-tanzu/velero/pkg/install" ) // veleroDeployment returns a Velero deployment object, selected with label and container name, -// refer to https://github.com/velero-io/velero/issues/3961 for more information +// refer to https://github.com/vmware-tanzu/velero/issues/3961 for more information func veleroDeployment(ctx context.Context, kubeClient kubernetes.Interface, namespace string) (*appsv1api.Deployment, error) { veleroLabels := labels.FormatLabels(install.Labels()) diff --git a/pkg/cmd/cli/plugin/plugin.go b/pkg/cmd/cli/plugin/plugin.go index ee6cbee67..0ba2f6177 100644 --- a/pkg/cmd/cli/plugin/plugin.go +++ b/pkg/cmd/cli/plugin/plugin.go @@ -19,7 +19,7 @@ package plugin import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/client" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/plugin/remove.go b/pkg/cmd/cli/plugin/remove.go index 8983fa08e..ed25dc680 100644 --- a/pkg/cmd/cli/plugin/remove.go +++ b/pkg/cmd/cli/plugin/remove.go @@ -26,8 +26,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" ) func NewRemoveCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/podvolume/backup.go b/pkg/cmd/cli/podvolume/backup.go index a8c9f1fdc..ed2d6c09a 100644 --- a/pkg/cmd/cli/podvolume/backup.go +++ b/pkg/cmd/cli/podvolume/backup.go @@ -30,21 +30,21 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" - "github.com/velero-io/velero/internal/credentials" - "github.com/velero-io/velero/pkg/buildinfo" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd/util/signals" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/podvolume" - "github.com/velero-io/velero/pkg/repository" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/filesystem" - "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/internal/credentials" + "github.com/vmware-tanzu/velero/pkg/buildinfo" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd/util/signals" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/podvolume" + "github.com/vmware-tanzu/velero/pkg/repository" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/logging" ctrl "sigs.k8s.io/controller-runtime" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ctlcache "sigs.k8s.io/controller-runtime/pkg/cache" ctlclient "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/cmd/cli/podvolume/backup_test.go b/pkg/cmd/cli/podvolume/backup_test.go index 4ce5192d9..1c59af751 100644 --- a/pkg/cmd/cli/podvolume/backup_test.go +++ b/pkg/cmd/cli/podvolume/backup_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/mock" ctlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/credentials" - cacheMock "github.com/velero-io/velero/pkg/cmd/cli/datamover/mocks" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/internal/credentials" + cacheMock "github.com/vmware-tanzu/velero/pkg/cmd/cli/datamover/mocks" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) func fakeCreateDataPathServiceWithErr(_ *podVolumeBackup) (dataPathService, error) { diff --git a/pkg/cmd/cli/podvolume/podvolume.go b/pkg/cmd/cli/podvolume/podvolume.go index 480538f1a..998e4683a 100644 --- a/pkg/cmd/cli/podvolume/podvolume.go +++ b/pkg/cmd/cli/podvolume/podvolume.go @@ -18,7 +18,7 @@ import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/client" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/podvolume/restore.go b/pkg/cmd/cli/podvolume/restore.go index 3be43e731..4c1596a04 100644 --- a/pkg/cmd/cli/podvolume/restore.go +++ b/pkg/cmd/cli/podvolume/restore.go @@ -31,18 +31,18 @@ import ( "k8s.io/klog/v2" ctrl "sigs.k8s.io/controller-runtime" - "github.com/velero-io/velero/internal/credentials" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/buildinfo" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd/util/signals" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/podvolume" - "github.com/velero-io/velero/pkg/repository" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/filesystem" - "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/internal/credentials" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/buildinfo" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd/util/signals" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/podvolume" + "github.com/vmware-tanzu/velero/pkg/repository" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/logging" ctlcache "sigs.k8s.io/controller-runtime/pkg/cache" ctlclient "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/cmd/cli/podvolume/restore_test.go b/pkg/cmd/cli/podvolume/restore_test.go index 3bc688781..74fbb8090 100644 --- a/pkg/cmd/cli/podvolume/restore_test.go +++ b/pkg/cmd/cli/podvolume/restore_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - cacheMock "github.com/velero-io/velero/pkg/cmd/cli/datamover/mocks" - velerotest "github.com/velero-io/velero/pkg/test" + cacheMock "github.com/vmware-tanzu/velero/pkg/cmd/cli/datamover/mocks" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func fakeCreateRestoreDataPathServiceWithErr(_ *podVolumeRestore) (dataPathService, error) { diff --git a/pkg/cmd/cli/repo/get.go b/pkg/cmd/cli/repo/get.go index adf4bbb66..ec57b9845 100644 --- a/pkg/cmd/cli/repo/get.go +++ b/pkg/cmd/cli/repo/get.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/output" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" ) func NewGetCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/repo/repo.go b/pkg/cmd/cli/repo/repo.go index 7c193c434..957dad793 100644 --- a/pkg/cmd/cli/repo/repo.go +++ b/pkg/cmd/cli/repo/repo.go @@ -19,7 +19,7 @@ package repo import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/client" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/repomantenance/maintenance.go b/pkg/cmd/cli/repomantenance/maintenance.go index 4cdcd4ddd..46c54f7d2 100644 --- a/pkg/cmd/cli/repomantenance/maintenance.go +++ b/pkg/cmd/cli/repomantenance/maintenance.go @@ -18,16 +18,16 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/credentials" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerocli "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/repository" - "github.com/velero-io/velero/pkg/util/filesystem" - "github.com/velero-io/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/internal/credentials" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerocli "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/repository" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/util/logging" - repokey "github.com/velero-io/velero/pkg/repository/keys" - "github.com/velero-io/velero/pkg/repository/maintenance" - repomanager "github.com/velero-io/velero/pkg/repository/manager" + repokey "github.com/vmware-tanzu/velero/pkg/repository/keys" + "github.com/vmware-tanzu/velero/pkg/repository/maintenance" + repomanager "github.com/vmware-tanzu/velero/pkg/repository/manager" ) type Options struct { diff --git a/pkg/cmd/cli/restore/create.go b/pkg/cmd/cli/restore/create.go index 1bc04224b..2fb21433e 100644 --- a/pkg/cmd/cli/restore/create.go +++ b/pkg/cmd/cli/restore/create.go @@ -31,15 +31,15 @@ import ( "k8s.io/client-go/tools/cache" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/resourcemodifiers" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/flag" - "github.com/velero-io/velero/pkg/cmd/util/output" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/pkg/util/velero/restore" + "github.com/vmware-tanzu/velero/internal/resourcemodifiers" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/velero/restore" ) func NewCreateCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/restore/create_test.go b/pkg/cmd/cli/restore/create_test.go index 6f7344555..8cc369dea 100644 --- a/pkg/cmd/cli/restore/create_test.go +++ b/pkg/cmd/cli/restore/create_test.go @@ -26,11 +26,11 @@ import ( controllerclient "sigs.k8s.io/controller-runtime/pkg/client" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - cmdtest "github.com/velero-io/velero/pkg/cmd/test" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestMostRecentBackup(t *testing.T) { diff --git a/pkg/cmd/cli/restore/delete.go b/pkg/cmd/cli/restore/delete.go index 41e4eb0dc..a2e70953d 100644 --- a/pkg/cmd/cli/restore/delete.go +++ b/pkg/cmd/cli/restore/delete.go @@ -27,11 +27,11 @@ import ( kubeerrs "k8s.io/apimachinery/pkg/util/errors" controllerclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/cli" - "github.com/velero-io/velero/pkg/cmd/util/confirm" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/cli" + "github.com/vmware-tanzu/velero/pkg/cmd/util/confirm" ) // NewDeleteCommand creates and returns a new cobra command for deleting restores. diff --git a/pkg/cmd/cli/restore/delete_test.go b/pkg/cmd/cli/restore/delete_test.go index fd6b778a7..e98f9b804 100644 --- a/pkg/cmd/cli/restore/delete_test.go +++ b/pkg/cmd/cli/restore/delete_test.go @@ -26,12 +26,12 @@ import ( "github.com/stretchr/testify/require" controllerclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - "github.com/velero-io/velero/pkg/cmd/cli" - cmdtest "github.com/velero-io/velero/pkg/cmd/test" - velerotest "github.com/velero-io/velero/pkg/test" - veleroexec "github.com/velero-io/velero/pkg/util/exec" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + "github.com/vmware-tanzu/velero/pkg/cmd/cli" + cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) func TestDeleteCommand(t *testing.T) { diff --git a/pkg/cmd/cli/restore/describe.go b/pkg/cmd/cli/restore/describe.go index 939b359f6..6404ef21d 100644 --- a/pkg/cmd/cli/restore/describe.go +++ b/pkg/cmd/cli/restore/describe.go @@ -26,11 +26,11 @@ import ( "k8s.io/apimachinery/pkg/labels" controllerclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/output" - "github.com/velero-io/velero/pkg/label" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" + "github.com/vmware-tanzu/velero/pkg/label" ) func NewDescribeCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/restore/describe_test.go b/pkg/cmd/cli/restore/describe_test.go index 43c32cb72..7c2ffe5f8 100644 --- a/pkg/cmd/cli/restore/describe_test.go +++ b/pkg/cmd/cli/restore/describe_test.go @@ -27,12 +27,12 @@ import ( "k8s.io/client-go/rest" controllerclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - cmdtest "github.com/velero-io/velero/pkg/cmd/test" - "github.com/velero-io/velero/pkg/features" - "github.com/velero-io/velero/pkg/test" - veleroexec "github.com/velero-io/velero/pkg/util/exec" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" + "github.com/vmware-tanzu/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/test" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) func TestNewDescribeCommand(t *testing.T) { diff --git a/pkg/cmd/cli/restore/get.go b/pkg/cmd/cli/restore/get.go index ebacf90cc..9a4014b25 100644 --- a/pkg/cmd/cli/restore/get.go +++ b/pkg/cmd/cli/restore/get.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/labels" controllerclient "sigs.k8s.io/controller-runtime/pkg/client" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/output" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" ) func NewGetCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/restore/get_test.go b/pkg/cmd/cli/restore/get_test.go index 3c63e0466..22b10e152 100644 --- a/pkg/cmd/cli/restore/get_test.go +++ b/pkg/cmd/cli/restore/get_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/require" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - cmdtest "github.com/velero-io/velero/pkg/cmd/test" - velerotest "github.com/velero-io/velero/pkg/test" - veleroexec "github.com/velero-io/velero/pkg/util/exec" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) func TestNewGetCommand(t *testing.T) { diff --git a/pkg/cmd/cli/restore/logs.go b/pkg/cmd/cli/restore/logs.go index e11fc591f..f4315c917 100644 --- a/pkg/cmd/cli/restore/logs.go +++ b/pkg/cmd/cli/restore/logs.go @@ -26,11 +26,11 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/cacert" - "github.com/velero-io/velero/pkg/cmd/util/downloadrequest" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/cacert" + "github.com/vmware-tanzu/velero/pkg/cmd/util/downloadrequest" ) func NewLogsCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/restore/logs_test.go b/pkg/cmd/cli/restore/logs_test.go index a06fc0d93..61c2392b6 100644 --- a/pkg/cmd/cli/restore/logs_test.go +++ b/pkg/cmd/cli/restore/logs_test.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/require" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - cmdtest "github.com/velero-io/velero/pkg/cmd/test" - "github.com/velero-io/velero/pkg/cmd/util/cacert" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" + "github.com/vmware-tanzu/velero/pkg/cmd/util/cacert" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestNewLogsCommand(t *testing.T) { diff --git a/pkg/cmd/cli/restore/restore.go b/pkg/cmd/cli/restore/restore.go index 8ee152b19..728c800ed 100644 --- a/pkg/cmd/cli/restore/restore.go +++ b/pkg/cmd/cli/restore/restore.go @@ -19,7 +19,7 @@ package restore import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/client" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/restore/restore_test.go b/pkg/cmd/cli/restore/restore_test.go index 1820882e1..85f4b662a 100644 --- a/pkg/cmd/cli/restore/restore_test.go +++ b/pkg/cmd/cli/restore/restore_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" ) func TestNewRestoreCommand(t *testing.T) { diff --git a/pkg/cmd/cli/schedule/create.go b/pkg/cmd/cli/schedule/create.go index 29b9bffe3..47c19318f 100644 --- a/pkg/cmd/cli/schedule/create.go +++ b/pkg/cmd/cli/schedule/create.go @@ -26,12 +26,12 @@ import ( corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/velero-io/velero/internal/resourcepolicies" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/cli/backup" - "github.com/velero-io/velero/pkg/cmd/util/output" + "github.com/vmware-tanzu/velero/internal/resourcepolicies" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/backup" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" ) func NewCreateCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/schedule/delete.go b/pkg/cmd/cli/schedule/delete.go index a6dd9b284..77b0bf883 100644 --- a/pkg/cmd/cli/schedule/delete.go +++ b/pkg/cmd/cli/schedule/delete.go @@ -27,11 +27,11 @@ import ( kubeerrs "k8s.io/apimachinery/pkg/util/errors" controllerclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/cli" - "github.com/velero-io/velero/pkg/cmd/util/confirm" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/cli" + "github.com/vmware-tanzu/velero/pkg/cmd/util/confirm" ) // NewDeleteCommand creates and returns a new cobra command for deleting schedules. diff --git a/pkg/cmd/cli/schedule/describe.go b/pkg/cmd/cli/schedule/describe.go index 39b86ec61..82c88dac7 100644 --- a/pkg/cmd/cli/schedule/describe.go +++ b/pkg/cmd/cli/schedule/describe.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/output" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" ) func NewDescribeCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/schedule/get.go b/pkg/cmd/cli/schedule/get.go index 2b9c5564b..88bd49fe0 100644 --- a/pkg/cmd/cli/schedule/get.go +++ b/pkg/cmd/cli/schedule/get.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/output" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" ) func NewGetCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/schedule/pause.go b/pkg/cmd/cli/schedule/pause.go index 24b11ed03..820e887a7 100644 --- a/pkg/cmd/cli/schedule/pause.go +++ b/pkg/cmd/cli/schedule/pause.go @@ -28,10 +28,10 @@ import ( kubeerrs "k8s.io/apimachinery/pkg/util/errors" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/cli" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/cli" ) // NewPauseCommand creates the command for pause diff --git a/pkg/cmd/cli/schedule/schedule.go b/pkg/cmd/cli/schedule/schedule.go index 91eb5e2c7..85c51c399 100644 --- a/pkg/cmd/cli/schedule/schedule.go +++ b/pkg/cmd/cli/schedule/schedule.go @@ -19,7 +19,7 @@ package schedule import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/client" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/schedule/skip_options.go b/pkg/cmd/cli/schedule/skip_options.go index a425e23af..14ea1b4ce 100644 --- a/pkg/cmd/cli/schedule/skip_options.go +++ b/pkg/cmd/cli/schedule/skip_options.go @@ -3,7 +3,7 @@ package schedule import ( "github.com/spf13/pflag" - "github.com/velero-io/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" ) type SkipOptions struct { diff --git a/pkg/cmd/cli/schedule/unpause.go b/pkg/cmd/cli/schedule/unpause.go index bb1278cb8..72197a934 100644 --- a/pkg/cmd/cli/schedule/unpause.go +++ b/pkg/cmd/cli/schedule/unpause.go @@ -19,9 +19,9 @@ package schedule import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/cli" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/cli" ) // NewUnpauseCommand creates the command for unpause diff --git a/pkg/cmd/cli/select_option.go b/pkg/cmd/cli/select_option.go index 5dab105f0..b0f18f4ef 100644 --- a/pkg/cmd/cli/select_option.go +++ b/pkg/cmd/cli/select_option.go @@ -23,7 +23,7 @@ import ( "golang.org/x/text/cases" "golang.org/x/text/language" - "github.com/velero-io/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" ) // SelectOptions defines the options for selecting resources diff --git a/pkg/cmd/cli/select_option_test.go b/pkg/cmd/cli/select_option_test.go index c53ca759a..ea726bd4e 100644 --- a/pkg/cmd/cli/select_option_test.go +++ b/pkg/cmd/cli/select_option_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" ) func TestCompleteOfSelectOption(t *testing.T) { diff --git a/pkg/cmd/cli/serverstatus/server_status.go b/pkg/cmd/cli/serverstatus/server_status.go index 885ed3078..ab994e2d6 100644 --- a/pkg/cmd/cli/serverstatus/server_status.go +++ b/pkg/cmd/cli/serverstatus/server_status.go @@ -24,9 +24,9 @@ import ( "k8s.io/apimachinery/pkg/util/wait" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - veleroclient "github.com/velero-io/velero/pkg/client" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + veleroclient "github.com/vmware-tanzu/velero/pkg/client" ) type Getter interface { diff --git a/pkg/cmd/cli/snapshotlocation/create.go b/pkg/cmd/cli/snapshotlocation/create.go index 7cdb5fd56..db55ad834 100644 --- a/pkg/cmd/cli/snapshotlocation/create.go +++ b/pkg/cmd/cli/snapshotlocation/create.go @@ -25,12 +25,12 @@ import ( "github.com/spf13/pflag" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/flag" - "github.com/velero-io/velero/pkg/cmd/util/output" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" ) func NewCreateCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/snapshotlocation/get.go b/pkg/cmd/cli/snapshotlocation/get.go index 58ebf8eb3..2acddbf7f 100644 --- a/pkg/cmd/cli/snapshotlocation/get.go +++ b/pkg/cmd/cli/snapshotlocation/get.go @@ -23,10 +23,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/output" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" ) func NewGetCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/snapshotlocation/set.go b/pkg/cmd/cli/snapshotlocation/set.go index 9326db185..f6b8ac368 100644 --- a/pkg/cmd/cli/snapshotlocation/set.go +++ b/pkg/cmd/cli/snapshotlocation/set.go @@ -26,12 +26,12 @@ import ( kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/flag" - "github.com/velero-io/velero/pkg/cmd/util/output" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/pkg/cmd/util/output" ) func NewSetCommand(f client.Factory, use string) *cobra.Command { diff --git a/pkg/cmd/cli/snapshotlocation/snapshot_location.go b/pkg/cmd/cli/snapshotlocation/snapshot_location.go index 3993515c7..baebff451 100644 --- a/pkg/cmd/cli/snapshotlocation/snapshot_location.go +++ b/pkg/cmd/cli/snapshotlocation/snapshot_location.go @@ -19,7 +19,7 @@ package snapshotlocation import ( "github.com/spf13/cobra" - "github.com/velero-io/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/client" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/uninstall/uninstall.go b/pkg/cmd/cli/uninstall/uninstall.go index 5968b5643..80a349c92 100644 --- a/pkg/cmd/cli/uninstall/uninstall.go +++ b/pkg/cmd/cli/uninstall/uninstall.go @@ -41,14 +41,14 @@ import ( kbclient "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/util/confirm" - "github.com/velero-io/velero/pkg/controller" - "github.com/velero-io/velero/pkg/install" - kubeutil "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/util/confirm" + "github.com/vmware-tanzu/velero/pkg/controller" + "github.com/vmware-tanzu/velero/pkg/install" + kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" ) var gracefulDeletionMaximumDuration = 1 * time.Minute @@ -213,7 +213,7 @@ func deleteNamespace(ctx context.Context, kbClient kbclient.Client, namespace st fmt.Print(".") } - // Must wait until the namespace is deleted to avoid the issue https://github.com/velero-io/velero/issues/3974 + // Must wait until the namespace is deleted to avoid the issue https://github.com/vmware-tanzu/velero/issues/3974 wait.Until(checkFunc, 5*time.Millisecond, ctx.Done()) if err != nil { return err diff --git a/pkg/cmd/cli/version/version.go b/pkg/cmd/cli/version/version.go index 57a42ece5..f8d261116 100644 --- a/pkg/cmd/cli/version/version.go +++ b/pkg/cmd/cli/version/version.go @@ -27,10 +27,10 @@ import ( "golang.org/x/mod/semver" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/buildinfo" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/cli/serverstatus" + "github.com/vmware-tanzu/velero/pkg/buildinfo" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/serverstatus" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/cli/version/version_test.go b/pkg/cmd/cli/version/version_test.go index cb629653d..355626802 100644 --- a/pkg/cmd/cli/version/version_test.go +++ b/pkg/cmd/cli/version/version_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/mock" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/buildinfo" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/buildinfo" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestPrintVersion(t *testing.T) { diff --git a/pkg/cmd/server/config/config.go b/pkg/cmd/server/config/config.go index b2802edb1..e19086217 100644 --- a/pkg/cmd/server/config/config.go +++ b/pkg/cmd/server/config/config.go @@ -5,18 +5,18 @@ import ( "strings" "time" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" "github.com/sirupsen/logrus" "github.com/spf13/pflag" - "github.com/velero-io/velero/internal/credentials" - "github.com/velero-io/velero/pkg/cmd/util/flag" - "github.com/velero-io/velero/pkg/constant" - podvolumeconfigs "github.com/velero-io/velero/pkg/podvolume/configs" - "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/internal/credentials" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/pkg/constant" + podvolumeconfigs "github.com/vmware-tanzu/velero/pkg/podvolume/configs" + "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/logging" ) const ( diff --git a/pkg/cmd/server/plugin/plugin.go b/pkg/cmd/server/plugin/plugin.go index d706bde07..071f0bbe5 100644 --- a/pkg/cmd/server/plugin/plugin.go +++ b/pkg/cmd/server/plugin/plugin.go @@ -21,22 +21,22 @@ import ( "github.com/spf13/cobra" apiextensions "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/datamover" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/datamover" - dia "github.com/velero-io/velero/internal/delete/actions/csi" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - bia "github.com/velero-io/velero/pkg/backup/actions" - csibia "github.com/velero-io/velero/pkg/backup/actions/csi" - "github.com/velero-io/velero/pkg/client" - velerodiscovery "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/features" - iba "github.com/velero-io/velero/pkg/itemblock/actions" - veleroplugin "github.com/velero-io/velero/pkg/plugin/framework" - plugincommon "github.com/velero-io/velero/pkg/plugin/framework/common" - ria "github.com/velero-io/velero/pkg/restore/actions" - csiria "github.com/velero-io/velero/pkg/restore/actions/csi" - "github.com/velero-io/velero/pkg/util/actionhelpers" + dia "github.com/vmware-tanzu/velero/internal/delete/actions/csi" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + bia "github.com/vmware-tanzu/velero/pkg/backup/actions" + csibia "github.com/vmware-tanzu/velero/pkg/backup/actions/csi" + "github.com/vmware-tanzu/velero/pkg/client" + velerodiscovery "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/features" + iba "github.com/vmware-tanzu/velero/pkg/itemblock/actions" + veleroplugin "github.com/vmware-tanzu/velero/pkg/plugin/framework" + plugincommon "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + ria "github.com/vmware-tanzu/velero/pkg/restore/actions" + csiria "github.com/vmware-tanzu/velero/pkg/restore/actions/csi" + "github.com/vmware-tanzu/velero/pkg/util/actionhelpers" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go index ffcf6c7b4..44c88b980 100644 --- a/pkg/cmd/server/server.go +++ b/pkg/cmd/server/server.go @@ -55,38 +55,38 @@ import ( ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/velero-io/velero/internal/credentials" - "github.com/velero-io/velero/internal/hook" - "github.com/velero-io/velero/internal/storage" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/backup" - "github.com/velero-io/velero/pkg/buildinfo" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd" - "github.com/velero-io/velero/pkg/cmd/server/config" - "github.com/velero-io/velero/pkg/cmd/util/signals" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/controller" - velerodiscovery "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/features" - "github.com/velero-io/velero/pkg/itemoperationmap" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/nodeagent" - "github.com/velero-io/velero/pkg/persistence" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/podexec" - "github.com/velero-io/velero/pkg/podvolume" - "github.com/velero-io/velero/pkg/repository" - repokey "github.com/velero-io/velero/pkg/repository/keys" - repomanager "github.com/velero-io/velero/pkg/repository/manager" - "github.com/velero-io/velero/pkg/restore" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/filesystem" - "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/internal/credentials" + "github.com/vmware-tanzu/velero/internal/hook" + "github.com/vmware-tanzu/velero/internal/storage" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/backup" + "github.com/vmware-tanzu/velero/pkg/buildinfo" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd" + "github.com/vmware-tanzu/velero/pkg/cmd/server/config" + "github.com/vmware-tanzu/velero/pkg/cmd/util/signals" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/controller" + velerodiscovery "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/itemoperationmap" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/nodeagent" + "github.com/vmware-tanzu/velero/pkg/persistence" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/podexec" + "github.com/vmware-tanzu/velero/pkg/podvolume" + "github.com/vmware-tanzu/velero/pkg/repository" + repokey "github.com/vmware-tanzu/velero/pkg/repository/keys" + repomanager "github.com/vmware-tanzu/velero/pkg/repository/manager" + "github.com/vmware-tanzu/velero/pkg/restore" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/logging" ) func NewCommand(f client.Factory) *cobra.Command { diff --git a/pkg/cmd/server/server_test.go b/pkg/cmd/server/server_test.go index 5ffacb436..c602f7c9e 100644 --- a/pkg/cmd/server/server_test.go +++ b/pkg/cmd/server/server_test.go @@ -31,15 +31,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/client/mocks" - "github.com/velero-io/velero/pkg/cmd/server/config" - "github.com/velero-io/velero/pkg/constant" - discovery_mocks "github.com/velero-io/velero/pkg/discovery/mocks" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/uploader" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/client/mocks" + "github.com/vmware-tanzu/velero/pkg/cmd/server/config" + "github.com/vmware-tanzu/velero/pkg/constant" + discovery_mocks "github.com/vmware-tanzu/velero/pkg/discovery/mocks" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/uploader" ) func TestVeleroResourcesExist(t *testing.T) { diff --git a/pkg/cmd/util/cacert/bsl_cacert.go b/pkg/cmd/util/cacert/bsl_cacert.go index fe202bb84..d11729945 100644 --- a/pkg/cmd/util/cacert/bsl_cacert.go +++ b/pkg/cmd/util/cacert/bsl_cacert.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/types" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // GetCACertFromBackup fetches the BackupStorageLocation for a backup and returns its cacert diff --git a/pkg/cmd/util/cacert/bsl_cacert_test.go b/pkg/cmd/util/cacert/bsl_cacert_test.go index ac2f936ff..03e14b724 100644 --- a/pkg/cmd/util/cacert/bsl_cacert_test.go +++ b/pkg/cmd/util/cacert/bsl_cacert_test.go @@ -26,9 +26,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/util" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/util" ) func TestGetCACertFromBackup(t *testing.T) { diff --git a/pkg/cmd/util/downloadrequest/downloadrequest.go b/pkg/cmd/util/downloadrequest/downloadrequest.go index 8cdf6fbb7..6e1d30c37 100644 --- a/pkg/cmd/util/downloadrequest/downloadrequest.go +++ b/pkg/cmd/util/downloadrequest/downloadrequest.go @@ -32,8 +32,8 @@ import ( "github.com/pkg/errors" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - veleroV1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" + veleroV1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" ) // ErrNotFound is exported for external packages to check for when a file is diff --git a/pkg/cmd/util/downloadrequest/downloadrequest_test.go b/pkg/cmd/util/downloadrequest/downloadrequest_test.go index 40372b614..995e83dc6 100644 --- a/pkg/cmd/util/downloadrequest/downloadrequest_test.go +++ b/pkg/cmd/util/downloadrequest/downloadrequest_test.go @@ -39,10 +39,10 @@ import ( kbclient "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/cmd/util/cacert" - "github.com/velero-io/velero/pkg/util" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/cmd/util/cacert" + "github.com/vmware-tanzu/velero/pkg/util" ) // createSelfSignedCertificate creates a self-signed certificate for testing. diff --git a/pkg/cmd/util/output/backup_describer.go b/pkg/cmd/util/output/backup_describer.go index 24f4410be..e0637a4bd 100644 --- a/pkg/cmd/util/output/backup_describer.go +++ b/pkg/cmd/util/output/backup_describer.go @@ -34,15 +34,15 @@ import ( "github.com/fatih/color" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - veleroapishared "github.com/velero-io/velero/pkg/apis/velero/shared" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/cmd/util/cacert" - "github.com/velero-io/velero/pkg/cmd/util/downloadrequest" - "github.com/velero-io/velero/pkg/itemoperation" + veleroapishared "github.com/vmware-tanzu/velero/pkg/apis/velero/shared" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/cmd/util/cacert" + "github.com/vmware-tanzu/velero/pkg/cmd/util/downloadrequest" + "github.com/vmware-tanzu/velero/pkg/itemoperation" - "github.com/velero-io/velero/internal/volume" - "github.com/velero-io/velero/pkg/util/collections" - "github.com/velero-io/velero/pkg/util/results" + "github.com/vmware-tanzu/velero/internal/volume" + "github.com/vmware-tanzu/velero/pkg/util/collections" + "github.com/vmware-tanzu/velero/pkg/util/results" ) // DescribeBackup describes a backup in human-readable format. diff --git a/pkg/cmd/util/output/backup_describer_test.go b/pkg/cmd/util/output/backup_describer_test.go index 9b4923404..0de03bdaa 100644 --- a/pkg/cmd/util/output/backup_describer_test.go +++ b/pkg/cmd/util/output/backup_describer_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/require" corev1api "k8s.io/api/core/v1" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/itemoperation" ) func TestDescribeUploaderConfig(t *testing.T) { diff --git a/pkg/cmd/util/output/backup_printer.go b/pkg/cmd/util/output/backup_printer.go index 4ffb8c929..873bc9fc3 100644 --- a/pkg/cmd/util/output/backup_printer.go +++ b/pkg/cmd/util/output/backup_printer.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/duration" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) var ( diff --git a/pkg/cmd/util/output/backup_printer_test.go b/pkg/cmd/util/output/backup_printer_test.go index 6495e1058..1a00bf6c1 100644 --- a/pkg/cmd/util/output/backup_printer_test.go +++ b/pkg/cmd/util/output/backup_printer_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) func TestSortBackups(t *testing.T) { diff --git a/pkg/cmd/util/output/backup_repo_printer.go b/pkg/cmd/util/output/backup_repo_printer.go index 4da5b25ad..1e68cb949 100644 --- a/pkg/cmd/util/output/backup_repo_printer.go +++ b/pkg/cmd/util/output/backup_repo_printer.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) var ( diff --git a/pkg/cmd/util/output/backup_storage_location_printer.go b/pkg/cmd/util/output/backup_storage_location_printer.go index 6cb5cc010..90960ca52 100644 --- a/pkg/cmd/util/output/backup_storage_location_printer.go +++ b/pkg/cmd/util/output/backup_storage_location_printer.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/cmd" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/cmd" ) var ( diff --git a/pkg/cmd/util/output/backup_structured_describer.go b/pkg/cmd/util/output/backup_structured_describer.go index d65560328..904afa34e 100644 --- a/pkg/cmd/util/output/backup_structured_describer.go +++ b/pkg/cmd/util/output/backup_structured_describer.go @@ -28,11 +28,11 @@ import ( kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/cmd/util/cacert" - "github.com/velero-io/velero/pkg/cmd/util/downloadrequest" - "github.com/velero-io/velero/pkg/util/results" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/cmd/util/cacert" + "github.com/vmware-tanzu/velero/pkg/cmd/util/downloadrequest" + "github.com/vmware-tanzu/velero/pkg/util/results" ) // DescribeBackupInSF describes a backup in structured format. diff --git a/pkg/cmd/util/output/backup_structured_describer_test.go b/pkg/cmd/util/output/backup_structured_describer_test.go index de7fa3278..c5ede1b36 100644 --- a/pkg/cmd/util/output/backup_structured_describer_test.go +++ b/pkg/cmd/util/output/backup_structured_describer_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/require" corev1api "k8s.io/api/core/v1" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/util/results" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/util/results" ) func TestDescribeBackupInSF(t *testing.T) { diff --git a/pkg/cmd/util/output/output.go b/pkg/cmd/util/output/output.go index 7b1c02dcf..a0f8ce704 100644 --- a/pkg/cmd/util/output/output.go +++ b/pkg/cmd/util/output/output.go @@ -29,9 +29,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/printers" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/cmd/util/flag" - "github.com/velero-io/velero/pkg/util/encode" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/pkg/util/encode" ) const ( diff --git a/pkg/cmd/util/output/output_test.go b/pkg/cmd/util/output/output_test.go index 12fb5e74a..1d3d67ae3 100644 --- a/pkg/cmd/util/output/output_test.go +++ b/pkg/cmd/util/output/output_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/runtime" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" "testing" ) diff --git a/pkg/cmd/util/output/plugin_printer.go b/pkg/cmd/util/output/plugin_printer.go index 3566e777a..faa957314 100644 --- a/pkg/cmd/util/output/plugin_printer.go +++ b/pkg/cmd/util/output/plugin_printer.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) var ( diff --git a/pkg/cmd/util/output/restore_describer.go b/pkg/cmd/util/output/restore_describer.go index b67fab071..a89943e74 100644 --- a/pkg/cmd/util/output/restore_describer.go +++ b/pkg/cmd/util/output/restore_describer.go @@ -25,7 +25,7 @@ import ( "sort" "strings" - "github.com/velero-io/velero/internal/volume" + "github.com/vmware-tanzu/velero/internal/volume" corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -33,12 +33,12 @@ import ( "github.com/fatih/color" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/cmd/util/cacert" - "github.com/velero-io/velero/pkg/cmd/util/downloadrequest" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/results" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/cmd/util/cacert" + "github.com/vmware-tanzu/velero/pkg/cmd/util/downloadrequest" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/results" ) func DescribeRestore( diff --git a/pkg/cmd/util/output/restore_describer_test.go b/pkg/cmd/util/output/restore_describer_test.go index 3b92fc025..6348dfaf0 100644 --- a/pkg/cmd/util/output/restore_describer_test.go +++ b/pkg/cmd/util/output/restore_describer_test.go @@ -11,12 +11,12 @@ import ( "github.com/stretchr/testify/require" corev1api "k8s.io/api/core/v1" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/results" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/results" ) func TestDescribeResult(t *testing.T) { diff --git a/pkg/cmd/util/output/restore_printer.go b/pkg/cmd/util/output/restore_printer.go index 331388a6a..782eb3485 100644 --- a/pkg/cmd/util/output/restore_printer.go +++ b/pkg/cmd/util/output/restore_printer.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) var ( diff --git a/pkg/cmd/util/output/schedule_describe_test.go b/pkg/cmd/util/output/schedule_describe_test.go index 68f92e221..12e8c5858 100644 --- a/pkg/cmd/util/output/schedule_describe_test.go +++ b/pkg/cmd/util/output/schedule_describe_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" ) func TestDescribeSchedule(t *testing.T) { diff --git a/pkg/cmd/util/output/schedule_describer.go b/pkg/cmd/util/output/schedule_describer.go index ceb66aefb..73abb51a1 100644 --- a/pkg/cmd/util/output/schedule_describer.go +++ b/pkg/cmd/util/output/schedule_describer.go @@ -21,7 +21,7 @@ import ( "github.com/fatih/color" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) func DescribeSchedule(schedule *v1.Schedule) string { diff --git a/pkg/cmd/util/output/schedule_printer.go b/pkg/cmd/util/output/schedule_printer.go index c1c5ce7dd..e39ee9069 100644 --- a/pkg/cmd/util/output/schedule_printer.go +++ b/pkg/cmd/util/output/schedule_printer.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) var ( diff --git a/pkg/cmd/util/output/volume_snapshot_location_printer.go b/pkg/cmd/util/output/volume_snapshot_location_printer.go index 46ec1cb69..d6168818c 100644 --- a/pkg/cmd/util/output/volume_snapshot_location_printer.go +++ b/pkg/cmd/util/output/volume_snapshot_location_printer.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) var ( diff --git a/pkg/cmd/velero/velero.go b/pkg/cmd/velero/velero.go index 4487aacdc..42f07b03a 100644 --- a/pkg/cmd/velero/velero.go +++ b/pkg/cmd/velero/velero.go @@ -25,35 +25,35 @@ import ( "github.com/spf13/cobra" "k8s.io/klog/v2" - "github.com/velero-io/velero/pkg/cmd/cli/debug" - "github.com/velero-io/velero/pkg/cmd/cli/podvolume" - "github.com/velero-io/velero/pkg/cmd/cli/repomantenance" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/debug" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/podvolume" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/repomantenance" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/cmd/cli/backup" - "github.com/velero-io/velero/pkg/cmd/cli/backuplocation" - "github.com/velero-io/velero/pkg/cmd/cli/bug" - cliclient "github.com/velero-io/velero/pkg/cmd/cli/client" - "github.com/velero-io/velero/pkg/cmd/cli/completion" - "github.com/velero-io/velero/pkg/cmd/cli/create" - "github.com/velero-io/velero/pkg/cmd/cli/delete" - "github.com/velero-io/velero/pkg/cmd/cli/describe" - "github.com/velero-io/velero/pkg/cmd/cli/get" - "github.com/velero-io/velero/pkg/cmd/cli/install" - "github.com/velero-io/velero/pkg/cmd/cli/plugin" - "github.com/velero-io/velero/pkg/cmd/cli/repo" - "github.com/velero-io/velero/pkg/cmd/cli/restore" - "github.com/velero-io/velero/pkg/cmd/cli/schedule" - "github.com/velero-io/velero/pkg/cmd/cli/snapshotlocation" - "github.com/velero-io/velero/pkg/cmd/cli/uninstall" - "github.com/velero-io/velero/pkg/cmd/cli/version" - "github.com/velero-io/velero/pkg/cmd/server" - runplugin "github.com/velero-io/velero/pkg/cmd/server/plugin" - veleroflag "github.com/velero-io/velero/pkg/cmd/util/flag" - "github.com/velero-io/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/backup" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/backuplocation" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/bug" + cliclient "github.com/vmware-tanzu/velero/pkg/cmd/cli/client" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/completion" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/create" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/delete" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/describe" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/get" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/install" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/plugin" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/repo" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/restore" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/schedule" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/snapshotlocation" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/uninstall" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/version" + "github.com/vmware-tanzu/velero/pkg/cmd/server" + runplugin "github.com/vmware-tanzu/velero/pkg/cmd/server/plugin" + veleroflag "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/pkg/features" - "github.com/velero-io/velero/pkg/cmd/cli/datamover" - "github.com/velero-io/velero/pkg/cmd/cli/nodeagent" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/datamover" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/nodeagent" ) func NewCommand(name string) *cobra.Command { diff --git a/pkg/controller/backup_controller.go b/pkg/controller/backup_controller.go index acb292416..496875bbf 100644 --- a/pkg/controller/backup_controller.go +++ b/pkg/controller/backup_controller.go @@ -42,27 +42,27 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/predicate" - "github.com/velero-io/velero/internal/credentials" - "github.com/velero-io/velero/internal/resourcepolicies" - "github.com/velero-io/velero/internal/storage" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - pkgbackup "github.com/velero-io/velero/pkg/backup" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/features" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/persistence" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - "github.com/velero-io/velero/pkg/plugin/framework" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/collections" - "github.com/velero-io/velero/pkg/util/encode" - kubeutil "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/pkg/util/logging" - "github.com/velero-io/velero/pkg/util/results" - veleroutil "github.com/velero-io/velero/pkg/util/velero" + "github.com/vmware-tanzu/velero/internal/credentials" + "github.com/vmware-tanzu/velero/internal/resourcepolicies" + "github.com/vmware-tanzu/velero/internal/storage" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + pkgbackup "github.com/vmware-tanzu/velero/pkg/backup" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/persistence" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/collections" + "github.com/vmware-tanzu/velero/pkg/util/encode" + kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/pkg/util/results" + veleroutil "github.com/vmware-tanzu/velero/pkg/util/velero" ) const ( @@ -766,7 +766,7 @@ func (b *backupReconciler) runBackup(backup *pkgbackup.Request) error { } // native snapshots phase will either be failed or completed right away - // https://github.com/velero-io/velero/blob/de3ea52f0cc478e99efa7b9524c7f353514261a4/pkg/backup/item_backupper.go#L632-L639 + // https://github.com/vmware-tanzu/velero/blob/de3ea52f0cc478e99efa7b9524c7f353514261a4/pkg/backup/item_backupper.go#L632-L639 backup.Status.VolumeSnapshotsAttempted = len(backup.VolumeSnapshots.Get()) for _, snap := range backup.VolumeSnapshots.Get() { if snap.Status.Phase == volume.SnapshotPhaseCompleted { diff --git a/pkg/controller/backup_controller_test.go b/pkg/controller/backup_controller_test.go index 2b4fd3e9a..7b646edcf 100644 --- a/pkg/controller/backup_controller_test.go +++ b/pkg/controller/backup_controller_test.go @@ -44,24 +44,24 @@ import ( kbclient "sigs.k8s.io/controller-runtime/pkg/client" fakeClient "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - pkgbackup "github.com/velero-io/velero/pkg/backup" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/features" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/persistence" - persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - "github.com/velero-io/velero/pkg/plugin/framework" - pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks" - biav2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2" - ibav1 "github.com/velero-io/velero/pkg/plugin/velero/itemblockaction/v1" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/boolptr" - kubeutil "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/pkg/util/logging" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + pkgbackup "github.com/vmware-tanzu/velero/pkg/backup" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/persistence" + persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks" + biav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2" + ibav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/itemblockaction/v1" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/logging" ) type fakeBackupper struct { diff --git a/pkg/controller/backup_deletion_controller.go b/pkg/controller/backup_deletion_controller.go index 33379b219..5fe29c5f1 100644 --- a/pkg/controller/backup_deletion_controller.go +++ b/pkg/controller/backup_deletion_controller.go @@ -37,27 +37,27 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/credentials" - "github.com/velero-io/velero/internal/delete" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/persistence" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1" - "github.com/velero-io/velero/pkg/podvolume" - "github.com/velero-io/velero/pkg/repository" - repomanager "github.com/velero-io/velero/pkg/repository/manager" - repotypes "github.com/velero-io/velero/pkg/repository/types" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/csi" - "github.com/velero-io/velero/pkg/util/filesystem" - "github.com/velero-io/velero/pkg/util/kube" - veleroutil "github.com/velero-io/velero/pkg/util/velero" + "github.com/vmware-tanzu/velero/internal/credentials" + "github.com/vmware-tanzu/velero/internal/delete" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/persistence" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1" + "github.com/vmware-tanzu/velero/pkg/podvolume" + "github.com/vmware-tanzu/velero/pkg/repository" + repomanager "github.com/vmware-tanzu/velero/pkg/repository/manager" + repotypes "github.com/vmware-tanzu/velero/pkg/repository/types" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/csi" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/util/kube" + veleroutil "github.com/vmware-tanzu/velero/pkg/util/velero" ) const ( diff --git a/pkg/controller/backup_deletion_controller_test.go b/pkg/controller/backup_deletion_controller_test.go index f6df13af1..24cc65846 100644 --- a/pkg/controller/backup_deletion_controller_test.go +++ b/pkg/controller/backup_deletion_controller_test.go @@ -44,21 +44,21 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - pkgbackup "github.com/velero-io/velero/pkg/backup" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/metrics" - persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/plugin/velero/mocks" - "github.com/velero-io/velero/pkg/repository" - repomanager "github.com/velero-io/velero/pkg/repository/manager" - repomocks "github.com/velero-io/velero/pkg/repository/mocks" - repotypes "github.com/velero-io/velero/pkg/repository/types" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + pkgbackup "github.com/vmware-tanzu/velero/pkg/backup" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/metrics" + persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks" + "github.com/vmware-tanzu/velero/pkg/repository" + repomanager "github.com/vmware-tanzu/velero/pkg/repository/manager" + repomocks "github.com/vmware-tanzu/velero/pkg/repository/mocks" + repotypes "github.com/vmware-tanzu/velero/pkg/repository/types" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) type backupDeletionControllerTestData struct { @@ -292,7 +292,7 @@ func TestBackupDeletionControllerReconcile(t *testing.T) { // Clear out resource labels to make sure the controller adds them and does not // panic when encountering a nil Labels map - // (https://github.com/velero-io/velero/issues/1546) + // (https://github.com/vmware-tanzu/velero/issues/1546) input.Labels = nil backup := builder.ForBackup(velerov1api.DefaultNamespace, "foo").Result() @@ -527,7 +527,7 @@ func TestBackupDeletionControllerReconcile(t *testing.T) { input := defaultTestDbr() // Clear out resource labels to make sure the controller adds them and does not // panic when encountering a nil Labels map - // (https://github.com/velero-io/velero/issues/1546) + // (https://github.com/vmware-tanzu/velero/issues/1546) input.Labels = nil location := &velerov1api.BackupStorageLocation{ @@ -612,7 +612,7 @@ func TestBackupDeletionControllerReconcile(t *testing.T) { input := defaultTestDbr() // Clear out resource labels to make sure the controller adds them and does not // panic when encountering a nil Labels map - // (https://github.com/velero-io/velero/issues/1546) + // (https://github.com/vmware-tanzu/velero/issues/1546) input.Labels = nil location := &velerov1api.BackupStorageLocation{ diff --git a/pkg/controller/backup_finalizer_controller.go b/pkg/controller/backup_finalizer_controller.go index 827089010..b24c132fa 100644 --- a/pkg/controller/backup_finalizer_controller.go +++ b/pkg/controller/backup_finalizer_controller.go @@ -30,17 +30,17 @@ import ( ctrl "sigs.k8s.io/controller-runtime" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - pkgbackup "github.com/velero-io/velero/pkg/backup" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/persistence" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - "github.com/velero-io/velero/pkg/plugin/framework" - "github.com/velero-io/velero/pkg/util/encode" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + pkgbackup "github.com/vmware-tanzu/velero/pkg/backup" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/persistence" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + "github.com/vmware-tanzu/velero/pkg/util/encode" ) // backupFinalizerReconciler reconciles a Backup object diff --git a/pkg/controller/backup_finalizer_controller_test.go b/pkg/controller/backup_finalizer_controller_test.go index 1ac8474c3..ade3ce2cd 100644 --- a/pkg/controller/backup_finalizer_controller_test.go +++ b/pkg/controller/backup_finalizer_controller_test.go @@ -33,16 +33,16 @@ import ( ctrl "sigs.k8s.io/controller-runtime" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/features" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - "github.com/velero-io/velero/pkg/plugin/framework" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func mockBackupFinalizerReconciler(fakeClient kbclient.Client, fakeGlobalClient kbclient.Client, fakeClock *testclocks.FakeClock) (*backupFinalizerReconciler, *fakeBackupper) { diff --git a/pkg/controller/backup_operations_controller.go b/pkg/controller/backup_operations_controller.go index dd138ca52..1a5b49c0b 100644 --- a/pkg/controller/backup_operations_controller.go +++ b/pkg/controller/backup_operations_controller.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - v2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2" + v2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -34,15 +34,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/predicate" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/itemoperationmap" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/persistence" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - "github.com/velero-io/velero/pkg/util/encode" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/itemoperationmap" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/persistence" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + "github.com/vmware-tanzu/velero/pkg/util/encode" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) const ( @@ -229,7 +229,7 @@ func (c *backupOperationsReconciler) updateBackupAndOperationsJSON( if len(operations.ErrsSinceUpdate) > 0 { c.metrics.RegisterBackupItemsErrorsGauge(backupScheduleName, backup.Status.Errors) - // FIXME: download/upload results once https://github.com/velero-io/velero/pull/5576 is merged + // FIXME: download/upload results once https://github.com/vmware-tanzu/velero/pull/5576 is merged } removeIfComplete := true defer func() { diff --git a/pkg/controller/backup_operations_controller_test.go b/pkg/controller/backup_operations_controller_test.go index 2b90571ce..0a25676d3 100644 --- a/pkg/controller/backup_operations_controller_test.go +++ b/pkg/controller/backup_operations_controller_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - v2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2" + v2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" @@ -33,18 +33,18 @@ import ( ctrl "sigs.k8s.io/controller-runtime" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/itemoperationmap" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/metrics" - persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks" - "github.com/velero-io/velero/pkg/plugin/velero" - biav2mocks "github.com/velero-io/velero/pkg/plugin/velero/mocks/backupitemaction/v2" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/itemoperationmap" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/metrics" + persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + biav2mocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks/backupitemaction/v2" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) var ( diff --git a/pkg/controller/backup_queue_controller.go b/pkg/controller/backup_queue_controller.go index 97d21de9a..c5cdc9461 100644 --- a/pkg/controller/backup_queue_controller.go +++ b/pkg/controller/backup_queue_controller.go @@ -35,10 +35,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/util/collections" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/util/collections" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) // backupQueueReconciler reconciles a Backup object diff --git a/pkg/controller/backup_queue_controller_test.go b/pkg/controller/backup_queue_controller_test.go index 4b3064d4c..2b479ed7e 100644 --- a/pkg/controller/backup_queue_controller_test.go +++ b/pkg/controller/backup_queue_controller_test.go @@ -30,9 +30,9 @@ import ( //"sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestBackupQueueReconciler(t *testing.T) { diff --git a/pkg/controller/backup_repository_controller.go b/pkg/controller/backup_repository_controller.go index 3cdc8252a..11ebb5aec 100644 --- a/pkg/controller/backup_repository_controller.go +++ b/pkg/controller/backup_repository_controller.go @@ -39,14 +39,14 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/repository/maintenance" - repomanager "github.com/velero-io/velero/pkg/repository/manager" - "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/pkg/util/logging" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/repository/maintenance" + repomanager "github.com/vmware-tanzu/velero/pkg/repository/manager" + "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/logging" ) const ( diff --git a/pkg/controller/backup_repository_controller_test.go b/pkg/controller/backup_repository_controller_test.go index cd9cd6a01..ed952f4ae 100644 --- a/pkg/controller/backup_repository_controller_test.go +++ b/pkg/controller/backup_repository_controller_test.go @@ -32,17 +32,17 @@ import ( "k8s.io/utils/clock" ctrl "sigs.k8s.io/controller-runtime" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/repository" - "github.com/velero-io/velero/pkg/repository/maintenance" - repomaintenance "github.com/velero-io/velero/pkg/repository/maintenance" - repomanager "github.com/velero-io/velero/pkg/repository/manager" - repomokes "github.com/velero-io/velero/pkg/repository/mocks" - repotypes "github.com/velero-io/velero/pkg/repository/types" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/logging" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/repository" + "github.com/vmware-tanzu/velero/pkg/repository/maintenance" + repomaintenance "github.com/vmware-tanzu/velero/pkg/repository/maintenance" + repomanager "github.com/vmware-tanzu/velero/pkg/repository/manager" + repomokes "github.com/vmware-tanzu/velero/pkg/repository/mocks" + repotypes "github.com/vmware-tanzu/velero/pkg/repository/types" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/logging" "sigs.k8s.io/controller-runtime/pkg/client" clientFake "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/pkg/controller/backup_storage_location_controller.go b/pkg/controller/backup_storage_location_controller.go index e65b883b6..abcd1e59e 100644 --- a/pkg/controller/backup_storage_location_controller.go +++ b/pkg/controller/backup_storage_location_controller.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/velero-io/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/metrics" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -32,12 +32,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/predicate" - "github.com/velero-io/velero/internal/storage" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/persistence" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/internal/storage" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/persistence" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) const ( diff --git a/pkg/controller/backup_storage_location_controller_test.go b/pkg/controller/backup_storage_location_controller_test.go index 4eddeeed0..8a5dc4a4a 100644 --- a/pkg/controller/backup_storage_location_controller_test.go +++ b/pkg/controller/backup_storage_location_controller_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/velero-io/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/metrics" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -35,13 +35,13 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/scheme" - "github.com/velero-io/velero/internal/storage" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/internal/storage" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) var _ = Describe("Backup Storage Location Reconciler", func() { diff --git a/pkg/controller/backup_sync_controller.go b/pkg/controller/backup_sync_controller.go index 99d4ca3ed..b84ae6f0b 100644 --- a/pkg/controller/backup_sync_controller.go +++ b/pkg/controller/backup_sync_controller.go @@ -33,13 +33,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/predicate" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/persistence" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - "github.com/velero-io/velero/pkg/util/kube" - veleroutil "github.com/velero-io/velero/pkg/util/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/persistence" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + "github.com/vmware-tanzu/velero/pkg/util/kube" + veleroutil "github.com/vmware-tanzu/velero/pkg/util/velero" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controller/backup_sync_controller_test.go b/pkg/controller/backup_sync_controller_test.go index 8c88da72f..fe440ff09 100644 --- a/pkg/controller/backup_sync_controller_test.go +++ b/pkg/controller/backup_sync_controller_test.go @@ -37,13 +37,13 @@ import ( ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/label" - persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/label" + persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func defaultLocation(namespace string) *velerov1api.BackupStorageLocation { diff --git a/pkg/controller/data_download_controller.go b/pkg/controller/data_download_controller.go index c69dfdf5a..36fec450b 100644 --- a/pkg/controller/data_download_controller.go +++ b/pkg/controller/data_download_controller.go @@ -40,20 +40,20 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/velero-io/velero/pkg/apis/velero/shared" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/constant" - datamover "github.com/velero-io/velero/pkg/datamover" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/exposer" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/nodeagent" - repository "github.com/velero-io/velero/pkg/repository/manager" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/apis/velero/shared" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/constant" + datamover "github.com/vmware-tanzu/velero/pkg/datamover" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/exposer" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/nodeagent" + repository "github.com/vmware-tanzu/velero/pkg/repository/manager" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) // DataDownloadReconciler reconciles a DataDownload object diff --git a/pkg/controller/data_download_controller_test.go b/pkg/controller/data_download_controller_test.go index f49bfd3f0..397f931c0 100644 --- a/pkg/controller/data_download_controller_test.go +++ b/pkg/controller/data_download_controller_test.go @@ -40,18 +40,18 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/datapath" - datapathmockes "github.com/velero-io/velero/pkg/datapath/mocks" - "github.com/velero-io/velero/pkg/exposer" - exposermockes "github.com/velero-io/velero/pkg/exposer/mocks" - "github.com/velero-io/velero/pkg/metrics" - velerotest "github.com/velero-io/velero/pkg/test" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/datapath" + datapathmockes "github.com/vmware-tanzu/velero/pkg/datapath/mocks" + "github.com/vmware-tanzu/velero/pkg/exposer" + exposermockes "github.com/vmware-tanzu/velero/pkg/exposer/mocks" + "github.com/vmware-tanzu/velero/pkg/metrics" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) const dataDownloadName string = "datadownload-1" diff --git a/pkg/controller/data_upload_controller.go b/pkg/controller/data_upload_controller.go index 35c37f691..13be03994 100644 --- a/pkg/controller/data_upload_controller.go +++ b/pkg/controller/data_upload_controller.go @@ -41,19 +41,19 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/velero-io/velero/pkg/apis/velero/shared" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/datamover" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/exposer" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/nodeagent" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/apis/velero/shared" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/datamover" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/exposer" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/nodeagent" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) const ( diff --git a/pkg/controller/data_upload_controller_test.go b/pkg/controller/data_upload_controller_test.go index ec6b90711..a73e3de94 100644 --- a/pkg/controller/data_upload_controller_test.go +++ b/pkg/controller/data_upload_controller_test.go @@ -46,18 +46,18 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/datapath" - datapathmocks "github.com/velero-io/velero/pkg/datapath/mocks" - "github.com/velero-io/velero/pkg/exposer" - "github.com/velero-io/velero/pkg/metrics" - velerotest "github.com/velero-io/velero/pkg/test" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/datapath" + datapathmocks "github.com/vmware-tanzu/velero/pkg/datapath/mocks" + "github.com/vmware-tanzu/velero/pkg/exposer" + "github.com/vmware-tanzu/velero/pkg/metrics" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) const dataUploadName = "dataupload-1" diff --git a/pkg/controller/download_request_controller.go b/pkg/controller/download_request_controller.go index 0c817d4be..bd9565895 100644 --- a/pkg/controller/download_request_controller.go +++ b/pkg/controller/download_request_controller.go @@ -29,12 +29,12 @@ import ( kbclient "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/predicate" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/itemoperationmap" - "github.com/velero-io/velero/pkg/persistence" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/itemoperationmap" + "github.com/vmware-tanzu/velero/pkg/persistence" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) const ( diff --git a/pkg/controller/download_request_controller_test.go b/pkg/controller/download_request_controller_test.go index d57bca316..81bdbab83 100644 --- a/pkg/controller/download_request_controller_test.go +++ b/pkg/controller/download_request_controller_test.go @@ -32,12 +32,12 @@ import ( kbclient "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) var _ = Describe("Download Request Reconciler", func() { diff --git a/pkg/controller/gc_controller.go b/pkg/controller/gc_controller.go index c9141face..bb3c60ae5 100644 --- a/pkg/controller/gc_controller.go +++ b/pkg/controller/gc_controller.go @@ -31,13 +31,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/predicate" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - pkgbackup "github.com/velero-io/velero/pkg/backup" - veleroclient "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/util/kube" - veleroutil "github.com/velero-io/velero/pkg/util/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + pkgbackup "github.com/vmware-tanzu/velero/pkg/backup" + veleroclient "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/util/kube" + veleroutil "github.com/vmware-tanzu/velero/pkg/util/velero" ) const ( diff --git a/pkg/controller/gc_controller_test.go b/pkg/controller/gc_controller_test.go index 04c8b9c1c..754b46e0a 100644 --- a/pkg/controller/gc_controller_test.go +++ b/pkg/controller/gc_controller_test.go @@ -28,9 +28,9 @@ import ( ctrl "sigs.k8s.io/controller-runtime" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func mockGCReconciler(fakeClient kbclient.Client, fakeClock *testclocks.FakeClock, freq time.Duration) *gcReconciler { diff --git a/pkg/controller/pod_volume_backup_controller.go b/pkg/controller/pod_volume_backup_controller.go index 907aca868..0bcbfa6d2 100644 --- a/pkg/controller/pod_volume_backup_controller.go +++ b/pkg/controller/pod_volume_backup_controller.go @@ -40,16 +40,16 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - veleroapishared "github.com/velero-io/velero/pkg/apis/velero/shared" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/exposer" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/nodeagent" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util" - "github.com/velero-io/velero/pkg/util/kube" + veleroapishared "github.com/vmware-tanzu/velero/pkg/apis/velero/shared" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/exposer" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/nodeagent" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) const ( diff --git a/pkg/controller/pod_volume_backup_controller_test.go b/pkg/controller/pod_volume_backup_controller_test.go index 3806e4e99..b49d7eb5b 100644 --- a/pkg/controller/pod_volume_backup_controller_test.go +++ b/pkg/controller/pod_volume_backup_controller_test.go @@ -43,16 +43,16 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/datapath" - datapathmocks "github.com/velero-io/velero/pkg/datapath/mocks" - "github.com/velero-io/velero/pkg/exposer" - "github.com/velero-io/velero/pkg/metrics" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/datapath" + datapathmocks "github.com/vmware-tanzu/velero/pkg/datapath/mocks" + "github.com/vmware-tanzu/velero/pkg/exposer" + "github.com/vmware-tanzu/velero/pkg/metrics" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) const pvbName = "pvb-1" diff --git a/pkg/controller/pod_volume_restore_controller.go b/pkg/controller/pod_volume_restore_controller.go index 62a6d793d..f40de528b 100644 --- a/pkg/controller/pod_volume_restore_controller.go +++ b/pkg/controller/pod_volume_restore_controller.go @@ -42,18 +42,18 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - veleroapishared "github.com/velero-io/velero/pkg/apis/velero/shared" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/exposer" - "github.com/velero-io/velero/pkg/nodeagent" - repository "github.com/velero-io/velero/pkg/repository/manager" - "github.com/velero-io/velero/pkg/restorehelper" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util" - "github.com/velero-io/velero/pkg/util/kube" + veleroapishared "github.com/vmware-tanzu/velero/pkg/apis/velero/shared" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/exposer" + "github.com/vmware-tanzu/velero/pkg/nodeagent" + repository "github.com/vmware-tanzu/velero/pkg/repository/manager" + "github.com/vmware-tanzu/velero/pkg/restorehelper" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) func NewPodVolumeRestoreReconciler( diff --git a/pkg/controller/pod_volume_restore_controller_test.go b/pkg/controller/pod_volume_restore_controller_test.go index 87a17e639..1819cbc32 100644 --- a/pkg/controller/pod_volume_restore_controller_test.go +++ b/pkg/controller/pod_volume_restore_controller_test.go @@ -43,18 +43,18 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/datapath" - datapathmockes "github.com/velero-io/velero/pkg/datapath/mocks" - "github.com/velero-io/velero/pkg/exposer" - exposermockes "github.com/velero-io/velero/pkg/exposer/mocks" - "github.com/velero-io/velero/pkg/restorehelper" - "github.com/velero-io/velero/pkg/test" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/datapath" + datapathmockes "github.com/vmware-tanzu/velero/pkg/datapath/mocks" + "github.com/vmware-tanzu/velero/pkg/exposer" + exposermockes "github.com/vmware-tanzu/velero/pkg/exposer/mocks" + "github.com/vmware-tanzu/velero/pkg/restorehelper" + "github.com/vmware-tanzu/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) func TestShouldProcess(t *testing.T) { diff --git a/pkg/controller/restore_controller.go b/pkg/controller/restore_controller.go index 9dca400f1..469951f27 100644 --- a/pkg/controller/restore_controller.go +++ b/pkg/controller/restore_controller.go @@ -42,24 +42,24 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/velero-io/velero/internal/hook" - "github.com/velero-io/velero/internal/resourcemodifiers" - "github.com/velero-io/velero/internal/volume" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/persistence" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - "github.com/velero-io/velero/pkg/plugin/framework" - pkgrestore "github.com/velero-io/velero/pkg/restore" - "github.com/velero-io/velero/pkg/util/collections" - kubeutil "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/pkg/util/logging" - "github.com/velero-io/velero/pkg/util/results" - veleroutil "github.com/velero-io/velero/pkg/util/velero" - pkgrestoreUtil "github.com/velero-io/velero/pkg/util/velero/restore" + "github.com/vmware-tanzu/velero/internal/hook" + "github.com/vmware-tanzu/velero/internal/resourcemodifiers" + "github.com/vmware-tanzu/velero/internal/volume" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/persistence" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + pkgrestore "github.com/vmware-tanzu/velero/pkg/restore" + "github.com/vmware-tanzu/velero/pkg/util/collections" + kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/pkg/util/results" + veleroutil "github.com/vmware-tanzu/velero/pkg/util/velero" + pkgrestoreUtil "github.com/vmware-tanzu/velero/pkg/util/velero/restore" ) // nonRestorableResources is an exclusion list for the restoration process. Any resources @@ -70,22 +70,22 @@ var nonRestorableResources = []string{ "events.events.k8s.io", // Don't ever restore backups - if appropriate, they'll be synced in from object storage. - // https://github.com/velero-io/velero/issues/622 + // https://github.com/vmware-tanzu/velero/issues/622 "backups.velero.io", // Restores are cluster-specific, and don't have value moving across clusters. - // https://github.com/velero-io/velero/issues/622 + // https://github.com/vmware-tanzu/velero/issues/622 "restores.velero.io", // TODO: Remove this in v1.11 or v1.12 // Restic repositories are automatically managed by Velero and will be automatically // created as needed if they don't exist. - // https://github.com/velero-io/velero/issues/1113 + // https://github.com/vmware-tanzu/velero/issues/1113 "resticrepositories.velero.io", // CSINode delegates cluster node for CSI operation. // VolumeAttachement records PV mounts to which node. - // https://github.com/velero-io/velero/issues/4823 + // https://github.com/vmware-tanzu/velero/issues/4823 "csinodes.storage.k8s.io", "volumeattachments.storage.k8s.io", diff --git a/pkg/controller/restore_controller_test.go b/pkg/controller/restore_controller_test.go index 1219cf1e9..b013ee64d 100644 --- a/pkg/controller/restore_controller_test.go +++ b/pkg/controller/restore_controller_test.go @@ -35,20 +35,20 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/resourcemodifiers" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/metrics" - persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - "github.com/velero-io/velero/pkg/plugin/framework" - pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks" - riav2 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v2" - pkgrestore "github.com/velero-io/velero/pkg/restore" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/logging" - "github.com/velero-io/velero/pkg/util/results" + "github.com/vmware-tanzu/velero/internal/resourcemodifiers" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/metrics" + persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks" + riav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2" + pkgrestore "github.com/vmware-tanzu/velero/pkg/restore" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/pkg/util/results" ) func TestFetchBackupInfo(t *testing.T) { diff --git a/pkg/controller/restore_finalizer_controller.go b/pkg/controller/restore_finalizer_controller.go index 00aa9db45..f82216bc3 100644 --- a/pkg/controller/restore_finalizer_controller.go +++ b/pkg/controller/restore_finalizer_controller.go @@ -36,18 +36,18 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/hook" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/persistence" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util/boolptr" - kubeutil "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/pkg/util/results" + "github.com/vmware-tanzu/velero/internal/hook" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/persistence" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/results" ) type restoreFinalizerReconciler struct { diff --git a/pkg/controller/restore_finalizer_controller_test.go b/pkg/controller/restore_finalizer_controller_test.go index 6bf3f7c84..6fb5ba303 100644 --- a/pkg/controller/restore_finalizer_controller_test.go +++ b/pkg/controller/restore_finalizer_controller_test.go @@ -36,20 +36,20 @@ import ( ctrl "sigs.k8s.io/controller-runtime" crclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/hook" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/metrics" - persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/boolptr" - pkgUtilKubeMocks "github.com/velero-io/velero/pkg/util/kube/mocks" - "github.com/velero-io/velero/pkg/util/results" + "github.com/vmware-tanzu/velero/internal/hook" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/metrics" + persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + pkgUtilKubeMocks "github.com/vmware-tanzu/velero/pkg/util/kube/mocks" + "github.com/vmware-tanzu/velero/pkg/util/results" ) func TestRestoreFinalizerReconcile(t *testing.T) { diff --git a/pkg/controller/restore_operations_controller.go b/pkg/controller/restore_operations_controller.go index c5b6c00e8..0539e21a4 100644 --- a/pkg/controller/restore_operations_controller.go +++ b/pkg/controller/restore_operations_controller.go @@ -30,14 +30,14 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/predicate" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/itemoperationmap" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/persistence" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/itemoperationmap" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/persistence" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) const ( diff --git a/pkg/controller/restore_operations_controller_test.go b/pkg/controller/restore_operations_controller_test.go index aa50dd3e7..a1ec0f792 100644 --- a/pkg/controller/restore_operations_controller_test.go +++ b/pkg/controller/restore_operations_controller_test.go @@ -31,18 +31,18 @@ import ( ctrl "sigs.k8s.io/controller-runtime" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/itemoperationmap" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/metrics" - persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks" - "github.com/velero-io/velero/pkg/plugin/clientmgmt" - pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks" - "github.com/velero-io/velero/pkg/plugin/velero" - riav2mocks "github.com/velero-io/velero/pkg/plugin/velero/mocks/restoreitemaction/v2" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/itemoperationmap" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/metrics" + persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" + pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + riav2mocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks/restoreitemaction/v2" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) var ( diff --git a/pkg/controller/schedule_controller.go b/pkg/controller/schedule_controller.go index f811ae81f..443b3c08b 100644 --- a/pkg/controller/schedule_controller.go +++ b/pkg/controller/schedule_controller.go @@ -33,11 +33,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/predicate" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/metrics" - "github.com/velero-io/velero/pkg/util/kube" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/metrics" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) const ( diff --git a/pkg/controller/schedule_controller_test.go b/pkg/controller/schedule_controller_test.go index 153e82889..f4585763c 100644 --- a/pkg/controller/schedule_controller_test.go +++ b/pkg/controller/schedule_controller_test.go @@ -31,10 +31,10 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/metrics" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/metrics" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) // Test reconcile function of schedule controller. Pause is not covered as event filter will not allow it through @@ -334,7 +334,7 @@ func TestGetNextRunTime(t *testing.T) { } func TestParseCronSchedule(t *testing.T) { - // From https://github.com/velero-io/velero/issues/30, where we originally were using cron.Parse(), + // From https://github.com/vmware-tanzu/velero/issues/30, where we originally were using cron.Parse(), // which treats the first field as seconds, and not minutes. We want to use cron.ParseStandard() // instead, which has the first field as minutes. diff --git a/pkg/controller/server_status_request_controller.go b/pkg/controller/server_status_request_controller.go index 15f7a9176..3fb1af80b 100644 --- a/pkg/controller/server_status_request_controller.go +++ b/pkg/controller/server_status_request_controller.go @@ -29,12 +29,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" - "github.com/velero-io/velero/internal/velero" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/buildinfo" - "github.com/velero-io/velero/pkg/constant" - "github.com/velero-io/velero/pkg/plugin/framework" - "github.com/velero-io/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/internal/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/buildinfo" + "github.com/vmware-tanzu/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" ) const ( diff --git a/pkg/controller/server_status_request_controller_test.go b/pkg/controller/server_status_request_controller_test.go index cc2ca223d..eb95c7e87 100644 --- a/pkg/controller/server_status_request_controller_test.go +++ b/pkg/controller/server_status_request_controller_test.go @@ -30,12 +30,12 @@ import ( kbclient "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/buildinfo" - "github.com/velero-io/velero/pkg/plugin/framework" - "github.com/velero-io/velero/pkg/plugin/framework/common" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/buildinfo" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func statusRequestBuilder(resourceVersion string) *builder.ServerStatusRequestBuilder { diff --git a/pkg/controller/suite_test.go b/pkg/controller/suite_test.go index 2c221d22c..1e5e90717 100644 --- a/pkg/controller/suite_test.go +++ b/pkg/controller/suite_test.go @@ -25,8 +25,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/velero-io/velero/pkg/persistence" - persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks" + "github.com/vmware-tanzu/velero/pkg/persistence" + persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks" "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/envtest" @@ -35,8 +35,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" diff --git a/pkg/datamover/backup_micro_service.go b/pkg/datamover/backup_micro_service.go index ef3c20238..4edd24c97 100644 --- a/pkg/datamover/backup_micro_service.go +++ b/pkg/datamover/backup_micro_service.go @@ -31,13 +31,13 @@ import ( cachetool "k8s.io/client-go/tools/cache" "sigs.k8s.io/controller-runtime/pkg/cache" - "github.com/velero-io/velero/internal/credentials" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/repository" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/internal/credentials" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/repository" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/kube" apierrors "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/pkg/datamover/backup_micro_service_test.go b/pkg/datamover/backup_micro_service_test.go index 60821eb72..79b4a834a 100644 --- a/pkg/datamover/backup_micro_service_test.go +++ b/pkg/datamover/backup_micro_service_test.go @@ -30,20 +30,20 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/uploader" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" clientFake "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - velerotest "github.com/velero-io/velero/pkg/test" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + velerotest "github.com/vmware-tanzu/velero/pkg/test" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - datapathmockes "github.com/velero-io/velero/pkg/datapath/mocks" + datapathmockes "github.com/vmware-tanzu/velero/pkg/datapath/mocks" ) type backupMsTestHelper struct { diff --git a/pkg/datamover/dataupload_delete_action.go b/pkg/datamover/dataupload_delete_action.go index e0b1e7abc..6b36e1068 100644 --- a/pkg/datamover/dataupload_delete_action.go +++ b/pkg/datamover/dataupload_delete_action.go @@ -12,11 +12,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/plugin/velero" - repotypes "github.com/velero-io/velero/pkg/repository/types" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + repotypes "github.com/vmware-tanzu/velero/pkg/repository/types" ) type DataUploadDeleteAction struct { diff --git a/pkg/datamover/dataupload_delete_action_test.go b/pkg/datamover/dataupload_delete_action_test.go index 8ec70a0f7..cdbf4b006 100644 --- a/pkg/datamover/dataupload_delete_action_test.go +++ b/pkg/datamover/dataupload_delete_action_test.go @@ -32,11 +32,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" crclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func toUnstructured(t *testing.T, du *velerov2alpha1.DataUpload) runtime.Unstructured { diff --git a/pkg/datamover/restore_micro_service.go b/pkg/datamover/restore_micro_service.go index 0fbf2bb50..e1c95ee3d 100644 --- a/pkg/datamover/restore_micro_service.go +++ b/pkg/datamover/restore_micro_service.go @@ -29,13 +29,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/credentials" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/repository" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/internal/credentials" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/repository" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/kube" cachetool "k8s.io/client-go/tools/cache" ) diff --git a/pkg/datamover/restore_micro_service_test.go b/pkg/datamover/restore_micro_service_test.go index 394fa4f02..bce4d94b7 100644 --- a/pkg/datamover/restore_micro_service_test.go +++ b/pkg/datamover/restore_micro_service_test.go @@ -31,15 +31,15 @@ import ( kbclient "sigs.k8s.io/controller-runtime/pkg/client" clientFake "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/datapath" - datapathmockes "github.com/velero-io/velero/pkg/datapath/mocks" - "github.com/velero-io/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/datapath" + datapathmockes "github.com/vmware-tanzu/velero/pkg/datapath/mocks" + "github.com/vmware-tanzu/velero/pkg/uploader" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" - velerotest "github.com/velero-io/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestOnDataDownloadFailed(t *testing.T) { diff --git a/pkg/datapath/data_path.go b/pkg/datapath/data_path.go index fc6336cd7..68521c04b 100644 --- a/pkg/datapath/data_path.go +++ b/pkg/datapath/data_path.go @@ -24,14 +24,14 @@ import ( "github.com/sirupsen/logrus" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/credentials" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/repository" - repokey "github.com/velero-io/velero/pkg/repository/keys" - repoProvider "github.com/velero-io/velero/pkg/repository/provider" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/uploader/provider" - "github.com/velero-io/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/internal/credentials" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/repository" + repokey "github.com/vmware-tanzu/velero/pkg/repository/keys" + repoProvider "github.com/vmware-tanzu/velero/pkg/repository/provider" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/uploader/provider" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) // InitParam define the input param for data path init @@ -167,7 +167,7 @@ func (dp *generalDataPath) close(ctx context.Context) { func (dp *generalDataPath) StartBackup(source AccessPoint, uploaderConfig map[string]string, param any) error { if !dp.initialized { - return errors.New("data path is not initialized") + return errors.New("file system data path is not initialized") } dp.wgDataPath.Add(1) @@ -243,7 +243,7 @@ func (dp *generalDataPath) UpdateProgress(p *uploader.Progress) { func (dp *generalDataPath) Cancel() { dp.cancel() - dp.log.WithField("user", dp.jobName).Info("Data path is canceled") + dp.log.WithField("user", dp.jobName).Info("FileSystemBR is canceled") } func (dp *generalDataPath) boostRepoConnect(ctx context.Context, repositoryType string, credentialGetter *credentials.CredentialGetter, cacheDir string) error { diff --git a/pkg/datapath/data_path_test.go b/pkg/datapath/data_path_test.go index 606822b2f..c063347c7 100644 --- a/pkg/datapath/data_path_test.go +++ b/pkg/datapath/data_path_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/uploader/provider" - providerMock "github.com/velero-io/velero/pkg/uploader/provider/mocks" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/uploader/provider" + providerMock "github.com/vmware-tanzu/velero/pkg/uploader/provider/mocks" ) func TestAsyncBackup(t *testing.T) { diff --git a/pkg/datapath/micro_service_watcher.go b/pkg/datapath/micro_service_watcher.go index ae523c05b..665b84b81 100644 --- a/pkg/datapath/micro_service_watcher.go +++ b/pkg/datapath/micro_service_watcher.go @@ -32,13 +32,13 @@ import ( "k8s.io/client-go/tools/cache" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/kube" ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/velero-io/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/pkg/util/logging" ) const ( diff --git a/pkg/datapath/micro_service_watcher_test.go b/pkg/datapath/micro_service_watcher_test.go index 2687a323a..6724c290c 100644 --- a/pkg/datapath/micro_service_watcher_test.go +++ b/pkg/datapath/micro_service_watcher_test.go @@ -36,10 +36,10 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/velero-io/velero/pkg/builder" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/pkg/builder" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/logging" ) func TestReEnsureThisPod(t *testing.T) { diff --git a/pkg/datapath/mocks/asyncBR.go b/pkg/datapath/mocks/asyncBR.go index 05a75b4c1..ef87fde83 100644 --- a/pkg/datapath/mocks/asyncBR.go +++ b/pkg/datapath/mocks/asyncBR.go @@ -6,7 +6,7 @@ import ( context "context" mock "github.com/stretchr/testify/mock" - datapath "github.com/velero-io/velero/pkg/datapath" + datapath "github.com/vmware-tanzu/velero/pkg/datapath" ) // AsyncBR is an autogenerated mock type for the AsyncBR type diff --git a/pkg/datapath/types.go b/pkg/datapath/types.go index ebd4f14d6..a9c2331a6 100644 --- a/pkg/datapath/types.go +++ b/pkg/datapath/types.go @@ -19,7 +19,7 @@ package datapath import ( "context" - "github.com/velero-io/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/uploader" ) // Result represents the result of a backup/restore diff --git a/pkg/discovery/helper.go b/pkg/discovery/helper.go index 282c91bf6..11c2d623b 100644 --- a/pkg/discovery/helper.go +++ b/pkg/discovery/helper.go @@ -30,9 +30,9 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/restmapper" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/features" - kcmdutil "github.com/velero-io/velero/third_party/kubernetes/pkg/kubectl/cmd/util" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/features" + kcmdutil "github.com/vmware-tanzu/velero/third_party/kubernetes/pkg/kubectl/cmd/util" ) //go:generate mockery --name Helper diff --git a/pkg/discovery/helper_test.go b/pkg/discovery/helper_test.go index c8af4f62e..d70c10438 100644 --- a/pkg/discovery/helper_test.go +++ b/pkg/discovery/helper_test.go @@ -30,10 +30,10 @@ import ( "k8s.io/client-go/discovery/fake" clientgotesting "k8s.io/client-go/testing" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/features" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/logging" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/features" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/logging" ) func TestSortResources(t *testing.T) { diff --git a/pkg/exposer/cache_volume.go b/pkg/exposer/cache_volume.go index e914c191c..85571c243 100644 --- a/pkg/exposer/cache_volume.go +++ b/pkg/exposer/cache_volume.go @@ -24,8 +24,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) type CacheConfigs struct { diff --git a/pkg/exposer/csi_snapshot.go b/pkg/exposer/csi_snapshot.go index 316b2ae75..079a4b527 100644 --- a/pkg/exposer/csi_snapshot.go +++ b/pkg/exposer/csi_snapshot.go @@ -33,12 +33,12 @@ import ( "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/nodeagent" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/util" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/csi" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/nodeagent" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/util" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/csi" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) // CSISnapshotExposeParam define the input param for Expose of CSI snapshots diff --git a/pkg/exposer/csi_snapshot_priority_test.go b/pkg/exposer/csi_snapshot_priority_test.go index bb1ce9ea0..d1ffa4700 100644 --- a/pkg/exposer/csi_snapshot_priority_test.go +++ b/pkg/exposer/csi_snapshot_priority_test.go @@ -28,9 +28,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) func TestCreateBackupPodWithPriorityClass(t *testing.T) { diff --git a/pkg/exposer/csi_snapshot_test.go b/pkg/exposer/csi_snapshot_test.go index 2e91f28ab..e1a9860eb 100644 --- a/pkg/exposer/csi_snapshot_test.go +++ b/pkg/exposer/csi_snapshot_test.go @@ -36,12 +36,12 @@ import ( "k8s.io/utils/pointer" clientFake "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" - velerotest "github.com/velero-io/velero/pkg/test" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/util" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/kube" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/util" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/kube" storagev1api "k8s.io/api/storage/v1" ) diff --git a/pkg/exposer/generic_restore.go b/pkg/exposer/generic_restore.go index adfe89f9f..b711e7364 100644 --- a/pkg/exposer/generic_restore.go +++ b/pkg/exposer/generic_restore.go @@ -30,10 +30,10 @@ import ( "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/nodeagent" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/nodeagent" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) // GenericRestoreExposeParam define the input param for Generic Restore Expose diff --git a/pkg/exposer/generic_restore_priority_test.go b/pkg/exposer/generic_restore_priority_test.go index c0c2d677e..642e0cc43 100644 --- a/pkg/exposer/generic_restore_priority_test.go +++ b/pkg/exposer/generic_restore_priority_test.go @@ -27,9 +27,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) // TestCreateRestorePodWithPriorityClass verifies that the priority class name is properly set in the restore pod diff --git a/pkg/exposer/generic_restore_test.go b/pkg/exposer/generic_restore_test.go index 397a8871f..799719a50 100644 --- a/pkg/exposer/generic_restore_test.go +++ b/pkg/exposer/generic_restore_test.go @@ -32,9 +32,9 @@ import ( "k8s.io/client-go/kubernetes/fake" clientTesting "k8s.io/client-go/testing" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/kube" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) func TestRestoreExpose(t *testing.T) { diff --git a/pkg/exposer/host_path.go b/pkg/exposer/host_path.go index 0ba791454..e51178711 100644 --- a/pkg/exposer/host_path.go +++ b/pkg/exposer/host_path.go @@ -26,11 +26,11 @@ import ( corev1api "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/nodeagent" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/filesystem" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/nodeagent" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) var getVolumeDirectory = kube.GetVolumeDirectory diff --git a/pkg/exposer/host_path_test.go b/pkg/exposer/host_path_test.go index 7089fcbb3..e751afe0d 100644 --- a/pkg/exposer/host_path_test.go +++ b/pkg/exposer/host_path_test.go @@ -28,13 +28,13 @@ import ( corev1api "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/nodeagent" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/filesystem" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/nodeagent" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) func TestGetPodVolumeHostPath(t *testing.T) { diff --git a/pkg/exposer/image.go b/pkg/exposer/image.go index 8bdc7634b..58658e1b7 100644 --- a/pkg/exposer/image.go +++ b/pkg/exposer/image.go @@ -24,7 +24,7 @@ import ( corev1api "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" - "github.com/velero-io/velero/pkg/nodeagent" + "github.com/vmware-tanzu/velero/pkg/nodeagent" ) type inheritedPodInfo struct { diff --git a/pkg/exposer/image_test.go b/pkg/exposer/image_test.go index 0edadf823..5c47f5c04 100644 --- a/pkg/exposer/image_test.go +++ b/pkg/exposer/image_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/kube" appsv1api "k8s.io/api/apps/v1" corev1api "k8s.io/api/core/v1" diff --git a/pkg/exposer/mocks/GenericRestoreExposer.go b/pkg/exposer/mocks/GenericRestoreExposer.go index e3214ad2a..7daae6d6d 100644 --- a/pkg/exposer/mocks/GenericRestoreExposer.go +++ b/pkg/exposer/mocks/GenericRestoreExposer.go @@ -9,7 +9,7 @@ import ( "time" mock "github.com/stretchr/testify/mock" - "github.com/velero-io/velero/pkg/exposer" + "github.com/vmware-tanzu/velero/pkg/exposer" "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/exposer/mocks/PodVolumeExposer.go b/pkg/exposer/mocks/PodVolumeExposer.go index be0a20486..d601e5c5b 100644 --- a/pkg/exposer/mocks/PodVolumeExposer.go +++ b/pkg/exposer/mocks/PodVolumeExposer.go @@ -9,7 +9,7 @@ import ( "time" mock "github.com/stretchr/testify/mock" - "github.com/velero-io/velero/pkg/exposer" + "github.com/vmware-tanzu/velero/pkg/exposer" "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/exposer/pod_volume.go b/pkg/exposer/pod_volume.go index 4de0fba57..aeb6f1903 100644 --- a/pkg/exposer/pod_volume.go +++ b/pkg/exposer/pod_volume.go @@ -31,10 +31,10 @@ import ( "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/nodeagent" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/filesystem" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/nodeagent" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) const ( diff --git a/pkg/exposer/pod_volume_test.go b/pkg/exposer/pod_volume_test.go index 48b7d1480..d65030e22 100644 --- a/pkg/exposer/pod_volume_test.go +++ b/pkg/exposer/pod_volume_test.go @@ -19,11 +19,11 @@ import ( clientTesting "k8s.io/client-go/testing" clientFake "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/datapath" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/filesystem" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/datapath" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) func TestPodVolumeExpose(t *testing.T) { diff --git a/pkg/exposer/vgdp_counter.go b/pkg/exposer/vgdp_counter.go index b0c9f94d1..cf6737c14 100644 --- a/pkg/exposer/vgdp_counter.go +++ b/pkg/exposer/vgdp_counter.go @@ -9,8 +9,8 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" "sigs.k8s.io/controller-runtime/pkg/manager" diff --git a/pkg/exposer/vgdp_counter_test.go b/pkg/exposer/vgdp_counter_test.go index b67f61f55..725b5f8d6 100644 --- a/pkg/exposer/vgdp_counter_test.go +++ b/pkg/exposer/vgdp_counter_test.go @@ -9,11 +9,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/velero-io/velero/pkg/builder" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/builder" + velerotest "github.com/vmware-tanzu/velero/pkg/test" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" ) func TestIsConstrained(t *testing.T) { diff --git a/pkg/install/daemonset.go b/pkg/install/daemonset.go index 616b8b5fe..10d2764e6 100644 --- a/pkg/install/daemonset.go +++ b/pkg/install/daemonset.go @@ -26,8 +26,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" - "github.com/velero-io/velero/internal/velero" - "github.com/velero-io/velero/pkg/nodeagent" + "github.com/vmware-tanzu/velero/internal/velero" + "github.com/vmware-tanzu/velero/pkg/nodeagent" ) func DaemonSet(namespace string, opts ...podTemplateOption) *appsv1api.DaemonSet { diff --git a/pkg/install/deployment.go b/pkg/install/deployment.go index a33c597f6..7af17bc53 100644 --- a/pkg/install/deployment.go +++ b/pkg/install/deployment.go @@ -26,9 +26,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" - "github.com/velero-io/velero/internal/velero" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/internal/velero" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) type podTemplateOption func(*podTemplateConfig) diff --git a/pkg/install/deployment_test.go b/pkg/install/deployment_test.go index decd38295..53b696f72 100644 --- a/pkg/install/deployment_test.go +++ b/pkg/install/deployment_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" corev1api "k8s.io/api/core/v1" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) func TestDeployment(t *testing.T) { diff --git a/pkg/install/import_test.go b/pkg/install/import_test.go index dfee28291..e77befe46 100644 --- a/pkg/install/import_test.go +++ b/pkg/install/import_test.go @@ -13,7 +13,7 @@ import ( // test that this package do not import cloud provider -// Prevent https://github.com/velero-io/velero/issues/8207 and https://github.com/velero-io/velero/issues/8157 +// Prevent https://github.com/vmware-tanzu/velero/issues/8207 and https://github.com/vmware-tanzu/velero/issues/8157 func TestPkgImportNoCloudProvider(t *testing.T) { _, filename, _, ok := runtime.Caller(0) if !ok { diff --git a/pkg/install/install.go b/pkg/install/install.go index 862405ef3..b60c4f9aa 100644 --- a/pkg/install/install.go +++ b/pkg/install/install.go @@ -36,8 +36,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) // kindToResource translates a Kind (mixed case, singular) to a Resource (lowercase, plural) string. diff --git a/pkg/install/install_test.go b/pkg/install/install_test.go index 5f2045ae5..47a9aa273 100644 --- a/pkg/install/install_test.go +++ b/pkg/install/install_test.go @@ -21,8 +21,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/controller-runtime/pkg/client/fake" - v1crds "github.com/velero-io/velero/config/crd/v1/crds" - "github.com/velero-io/velero/pkg/test" + v1crds "github.com/vmware-tanzu/velero/config/crd/v1/crds" + "github.com/vmware-tanzu/velero/pkg/test" ) func TestInstall(t *testing.T) { diff --git a/pkg/install/resources.go b/pkg/install/resources.go index 89eba79ba..5c7534774 100644 --- a/pkg/install/resources.go +++ b/pkg/install/resources.go @@ -27,10 +27,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - v1crds "github.com/velero-io/velero/config/crd/v1/crds" - v2alpha1crds "github.com/velero-io/velero/config/crd/v2alpha1/crds" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/util/kube" + v1crds "github.com/vmware-tanzu/velero/config/crd/v1/crds" + v2alpha1crds "github.com/vmware-tanzu/velero/config/crd/v2alpha1/crds" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) const ( diff --git a/pkg/itemblock/actions/pod_action.go b/pkg/itemblock/actions/pod_action.go index 421e4a7c1..2596e78a2 100644 --- a/pkg/itemblock/actions/pod_action.go +++ b/pkg/itemblock/actions/pod_action.go @@ -22,9 +22,9 @@ import ( corev1api "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util/actionhelpers" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util/actionhelpers" ) // PodAction implements ItemBlockAction. diff --git a/pkg/itemblock/actions/pod_action_test.go b/pkg/itemblock/actions/pod_action_test.go index c6cc34799..645feeee2 100644 --- a/pkg/itemblock/actions/pod_action_test.go +++ b/pkg/itemblock/actions/pod_action_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestPodActionAppliesTo(t *testing.T) { diff --git a/pkg/itemblock/actions/pvc_action.go b/pkg/itemblock/actions/pvc_action.go index 0b95307f5..6777ef566 100644 --- a/pkg/itemblock/actions/pvc_action.go +++ b/pkg/itemblock/actions/pvc_action.go @@ -25,13 +25,13 @@ import ( "k8s.io/apimachinery/pkg/runtime" crclient "sigs.k8s.io/controller-runtime/pkg/client" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/kuberesource" - plugincommon "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util/actionhelpers" - "github.com/velero-io/velero/pkg/util/kube" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + plugincommon "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util/actionhelpers" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) // PVCAction inspects a PersistentVolumeClaim for the PersistentVolume diff --git a/pkg/itemblock/actions/pvc_action_test.go b/pkg/itemblock/actions/pvc_action_test.go index 4e4f16ec4..8b3cf58d5 100644 --- a/pkg/itemblock/actions/pvc_action_test.go +++ b/pkg/itemblock/actions/pvc_action_test.go @@ -27,12 +27,12 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestBackupPVAction(t *testing.T) { diff --git a/pkg/itemblock/actions/service_account_action.go b/pkg/itemblock/actions/service_account_action.go index 743299f95..91cdbbe59 100644 --- a/pkg/itemblock/actions/service_account_action.go +++ b/pkg/itemblock/actions/service_account_action.go @@ -22,10 +22,10 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - velerodiscovery "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util/actionhelpers" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerodiscovery "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util/actionhelpers" ) // ServiceAccountAction implements ItemBlockAction. diff --git a/pkg/itemblock/actions/service_account_action_test.go b/pkg/itemblock/actions/service_account_action_test.go index d357c9df3..01106b215 100644 --- a/pkg/itemblock/actions/service_account_action_test.go +++ b/pkg/itemblock/actions/service_account_action_test.go @@ -28,10 +28,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/actionhelpers" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/actionhelpers" ) func newV1ClusterRoleBindingList(rbacCRBList []rbacv1.ClusterRoleBinding) []actionhelpers.ClusterRoleBinding { diff --git a/pkg/itemoperation/backup_operation.go b/pkg/itemoperation/backup_operation.go index 14ee9e88d..84b207a3b 100644 --- a/pkg/itemoperation/backup_operation.go +++ b/pkg/itemoperation/backup_operation.go @@ -17,7 +17,7 @@ limitations under the License. package itemoperation import ( - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // BackupOperation stores information about an async item operation diff --git a/pkg/itemoperation/restore_operation.go b/pkg/itemoperation/restore_operation.go index f2162d166..d639d4b23 100644 --- a/pkg/itemoperation/restore_operation.go +++ b/pkg/itemoperation/restore_operation.go @@ -17,7 +17,7 @@ limitations under the License. package itemoperation import ( - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // RestoreOperation stores information about an async item operation diff --git a/pkg/itemoperationmap/backup_operation_map.go b/pkg/itemoperationmap/backup_operation_map.go index 47663d64d..47cdcac81 100644 --- a/pkg/itemoperationmap/backup_operation_map.go +++ b/pkg/itemoperationmap/backup_operation_map.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/persistence" - "github.com/velero-io/velero/pkg/util/encode" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/persistence" + "github.com/vmware-tanzu/velero/pkg/util/encode" ) type BackupItemOperationsMap struct { diff --git a/pkg/itemoperationmap/restore_operation_map.go b/pkg/itemoperationmap/restore_operation_map.go index 5bc35bb67..4256591bc 100644 --- a/pkg/itemoperationmap/restore_operation_map.go +++ b/pkg/itemoperationmap/restore_operation_map.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/persistence" - "github.com/velero-io/velero/pkg/util/encode" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/persistence" + "github.com/vmware-tanzu/velero/pkg/util/encode" ) type RestoreItemOperationsMap struct { diff --git a/pkg/kopia/kopia_log_test.go b/pkg/kopia/kopia_log_test.go index efc8e9fc9..bb03a89cc 100644 --- a/pkg/kopia/kopia_log_test.go +++ b/pkg/kopia/kopia_log_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap/zapcore" - "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/test" ) func TestEnabled(t *testing.T) { diff --git a/pkg/label/label.go b/pkg/label/label.go index 2b97060aa..bfd28b836 100644 --- a/pkg/label/label.go +++ b/pkg/label/label.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/validation" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // GetValidName converts an input string to valid Kubernetes label string in accordance to rfc1035 DNS Label spec diff --git a/pkg/nodeagent/node_agent.go b/pkg/nodeagent/node_agent.go index 23ecaec01..87efb896a 100644 --- a/pkg/nodeagent/node_agent.go +++ b/pkg/nodeagent/node_agent.go @@ -29,8 +29,8 @@ import ( "k8s.io/client-go/kubernetes" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/util/kube" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) const ( diff --git a/pkg/nodeagent/node_agent_test.go b/pkg/nodeagent/node_agent_test.go index 704c92876..168e91de1 100644 --- a/pkg/nodeagent/node_agent_test.go +++ b/pkg/nodeagent/node_agent_test.go @@ -30,9 +30,9 @@ import ( clientTesting "k8s.io/client-go/testing" clientFake "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/velero-io/velero/pkg/builder" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/builder" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) type reactor struct { diff --git a/pkg/persistence/mocks/backup_store.go b/pkg/persistence/mocks/backup_store.go index b8392c242..b9c4184c3 100644 --- a/pkg/persistence/mocks/backup_store.go +++ b/pkg/persistence/mocks/backup_store.go @@ -21,15 +21,15 @@ import ( io "io" mock "github.com/stretchr/testify/mock" - itemoperation "github.com/velero-io/velero/pkg/itemoperation" + itemoperation "github.com/vmware-tanzu/velero/pkg/itemoperation" - persistence "github.com/velero-io/velero/pkg/persistence" + persistence "github.com/vmware-tanzu/velero/pkg/persistence" - results "github.com/velero-io/velero/pkg/util/results" + results "github.com/vmware-tanzu/velero/pkg/util/results" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" - volume "github.com/velero-io/velero/internal/volume" + volume "github.com/vmware-tanzu/velero/internal/volume" volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" ) diff --git a/pkg/persistence/object_store.go b/pkg/persistence/object_store.go index 22a91b3b5..fd441e943 100644 --- a/pkg/persistence/object_store.go +++ b/pkg/persistence/object_store.go @@ -30,13 +30,13 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer" kerrors "k8s.io/apimachinery/pkg/util/errors" - "github.com/velero-io/velero/internal/credentials" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util" - "github.com/velero-io/velero/pkg/util/results" + "github.com/vmware-tanzu/velero/internal/credentials" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util" + "github.com/vmware-tanzu/velero/pkg/util/results" ) type BackupInfo struct { diff --git a/pkg/persistence/object_store_test.go b/pkg/persistence/object_store_test.go index 5f08d4cd7..e9a3bde36 100644 --- a/pkg/persistence/object_store_test.go +++ b/pkg/persistence/object_store_test.go @@ -33,17 +33,17 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/internal/credentials" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - providermocks "github.com/velero-io/velero/pkg/plugin/velero/mocks" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/encode" - "github.com/velero-io/velero/pkg/util/results" + "github.com/vmware-tanzu/velero/internal/credentials" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + providermocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/encode" + "github.com/vmware-tanzu/velero/pkg/util/results" ) type objectBackupStoreTestHarness struct { diff --git a/pkg/plugin/clientmgmt/backupitemaction/v1/restartable_backup_item_action.go b/pkg/plugin/clientmgmt/backupitemaction/v1/restartable_backup_item_action.go index 457eff760..4bc28e487 100644 --- a/pkg/plugin/clientmgmt/backupitemaction/v1/restartable_backup_item_action.go +++ b/pkg/plugin/clientmgmt/backupitemaction/v1/restartable_backup_item_action.go @@ -20,11 +20,11 @@ import ( "github.com/pkg/errors" "k8s.io/apimachinery/pkg/runtime" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - biav1 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v1" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + biav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v1" ) // AdaptedBackupItemAction is a backup item action adapted to the v1 BackupItemAction API diff --git a/pkg/plugin/clientmgmt/backupitemaction/v1/restartable_backup_item_action_test.go b/pkg/plugin/clientmgmt/backupitemaction/v1/restartable_backup_item_action_test.go index 75711d401..8dc113df5 100644 --- a/pkg/plugin/clientmgmt/backupitemaction/v1/restartable_backup_item_action_test.go +++ b/pkg/plugin/clientmgmt/backupitemaction/v1/restartable_backup_item_action_test.go @@ -25,12 +25,12 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/velero-io/velero/internal/restartabletest" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - mocks "github.com/velero-io/velero/pkg/plugin/velero/mocks/backupitemaction/v1" + "github.com/vmware-tanzu/velero/internal/restartabletest" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + mocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks/backupitemaction/v1" ) func TestRestartableGetBackupItemAction(t *testing.T) { diff --git a/pkg/plugin/clientmgmt/backupitemaction/v2/restartable_backup_item_action.go b/pkg/plugin/clientmgmt/backupitemaction/v2/restartable_backup_item_action.go index d3f2dd35e..84ddb54b2 100644 --- a/pkg/plugin/clientmgmt/backupitemaction/v2/restartable_backup_item_action.go +++ b/pkg/plugin/clientmgmt/backupitemaction/v2/restartable_backup_item_action.go @@ -20,12 +20,12 @@ import ( "github.com/pkg/errors" "k8s.io/apimachinery/pkg/runtime" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - biav1cli "github.com/velero-io/velero/pkg/plugin/clientmgmt/backupitemaction/v1" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - biav2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + biav1cli "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/backupitemaction/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + biav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2" ) // AdaptedBackupItemAction is a v1 BackupItemAction adapted to implement the v2 API diff --git a/pkg/plugin/clientmgmt/backupitemaction/v2/restartable_backup_item_action_test.go b/pkg/plugin/clientmgmt/backupitemaction/v2/restartable_backup_item_action_test.go index 649ee0fcb..bd1ee0ec2 100644 --- a/pkg/plugin/clientmgmt/backupitemaction/v2/restartable_backup_item_action_test.go +++ b/pkg/plugin/clientmgmt/backupitemaction/v2/restartable_backup_item_action_test.go @@ -25,12 +25,12 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/velero-io/velero/internal/restartabletest" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - mocksv2 "github.com/velero-io/velero/pkg/plugin/velero/mocks/backupitemaction/v2" + "github.com/vmware-tanzu/velero/internal/restartabletest" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + mocksv2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks/backupitemaction/v2" ) func TestRestartableGetBackupItemAction(t *testing.T) { diff --git a/pkg/plugin/clientmgmt/itemblockaction/v1/restartable_item_block_action.go b/pkg/plugin/clientmgmt/itemblockaction/v1/restartable_item_block_action.go index 9d69330c2..83742978f 100644 --- a/pkg/plugin/clientmgmt/itemblockaction/v1/restartable_item_block_action.go +++ b/pkg/plugin/clientmgmt/itemblockaction/v1/restartable_item_block_action.go @@ -20,11 +20,11 @@ import ( "github.com/pkg/errors" "k8s.io/apimachinery/pkg/runtime" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - ibav1 "github.com/velero-io/velero/pkg/plugin/velero/itemblockaction/v1" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + ibav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/itemblockaction/v1" ) // AdaptedItemBlockAction is an ItemBlock action adapted to the v1 ItemBlockAction API diff --git a/pkg/plugin/clientmgmt/itemblockaction/v1/restartable_item_block_action_test.go b/pkg/plugin/clientmgmt/itemblockaction/v1/restartable_item_block_action_test.go index a4c18c3fd..04dd60652 100644 --- a/pkg/plugin/clientmgmt/itemblockaction/v1/restartable_item_block_action_test.go +++ b/pkg/plugin/clientmgmt/itemblockaction/v1/restartable_item_block_action_test.go @@ -25,12 +25,12 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/velero-io/velero/internal/restartabletest" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - mocks "github.com/velero-io/velero/pkg/plugin/velero/mocks/itemblockaction/v1" + "github.com/vmware-tanzu/velero/internal/restartabletest" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + mocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks/itemblockaction/v1" ) func TestRestartableGetItemBlockAction(t *testing.T) { diff --git a/pkg/plugin/clientmgmt/manager.go b/pkg/plugin/clientmgmt/manager.go index 747591c18..1c895d86e 100644 --- a/pkg/plugin/clientmgmt/manager.go +++ b/pkg/plugin/clientmgmt/manager.go @@ -24,21 +24,21 @@ import ( "github.com/sirupsen/logrus" - biav1cli "github.com/velero-io/velero/pkg/plugin/clientmgmt/backupitemaction/v1" - biav2cli "github.com/velero-io/velero/pkg/plugin/clientmgmt/backupitemaction/v2" - ibav1cli "github.com/velero-io/velero/pkg/plugin/clientmgmt/itemblockaction/v1" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - riav1cli "github.com/velero-io/velero/pkg/plugin/clientmgmt/restoreitemaction/v1" - riav2cli "github.com/velero-io/velero/pkg/plugin/clientmgmt/restoreitemaction/v2" - vsv1cli "github.com/velero-io/velero/pkg/plugin/clientmgmt/volumesnapshotter/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - biav1 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v1" - biav2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2" - ibav1 "github.com/velero-io/velero/pkg/plugin/velero/itemblockaction/v1" - riav1 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v1" - riav2 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v2" - vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1" + biav1cli "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/backupitemaction/v1" + biav2cli "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/backupitemaction/v2" + ibav1cli "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/itemblockaction/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + riav1cli "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/restoreitemaction/v1" + riav2cli "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/restoreitemaction/v2" + vsv1cli "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/volumesnapshotter/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + biav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v1" + biav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2" + ibav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/itemblockaction/v1" + riav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v1" + riav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2" + vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1" ) // Manager manages the lifecycles of plugins. diff --git a/pkg/plugin/clientmgmt/manager_test.go b/pkg/plugin/clientmgmt/manager_test.go index 296bfa21f..7576c42c5 100644 --- a/pkg/plugin/clientmgmt/manager_test.go +++ b/pkg/plugin/clientmgmt/manager_test.go @@ -26,17 +26,17 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/internal/restartabletest" - biav1cli "github.com/velero-io/velero/pkg/plugin/clientmgmt/backupitemaction/v1" - biav2cli "github.com/velero-io/velero/pkg/plugin/clientmgmt/backupitemaction/v2" - ibav1cli "github.com/velero-io/velero/pkg/plugin/clientmgmt/itemblockaction/v1" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - riav1cli "github.com/velero-io/velero/pkg/plugin/clientmgmt/restoreitemaction/v1" - riav2cli "github.com/velero-io/velero/pkg/plugin/clientmgmt/restoreitemaction/v2" - vsv1cli "github.com/velero-io/velero/pkg/plugin/clientmgmt/volumesnapshotter/v1" - "github.com/velero-io/velero/pkg/plugin/framework" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/internal/restartabletest" + biav1cli "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/backupitemaction/v1" + biav2cli "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/backupitemaction/v2" + ibav1cli "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/itemblockaction/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + riav1cli "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/restoreitemaction/v1" + riav2cli "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/restoreitemaction/v2" + vsv1cli "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/volumesnapshotter/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/test" ) type mockRegistry struct { diff --git a/pkg/plugin/clientmgmt/process/client_builder.go b/pkg/plugin/clientmgmt/process/client_builder.go index 3e86c2862..ceeac8db7 100644 --- a/pkg/plugin/clientmgmt/process/client_builder.go +++ b/pkg/plugin/clientmgmt/process/client_builder.go @@ -26,11 +26,11 @@ import ( hcplugin "github.com/hashicorp/go-plugin" "github.com/sirupsen/logrus" - "github.com/velero-io/velero/pkg/plugin/framework" - biav2 "github.com/velero-io/velero/pkg/plugin/framework/backupitemaction/v2" - "github.com/velero-io/velero/pkg/plugin/framework/common" - ibav1 "github.com/velero-io/velero/pkg/plugin/framework/itemblockaction/v1" - riav2 "github.com/velero-io/velero/pkg/plugin/framework/restoreitemaction/v2" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + biav2 "github.com/vmware-tanzu/velero/pkg/plugin/framework/backupitemaction/v2" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + ibav1 "github.com/vmware-tanzu/velero/pkg/plugin/framework/itemblockaction/v1" + riav2 "github.com/vmware-tanzu/velero/pkg/plugin/framework/restoreitemaction/v2" ) // clientBuilder builds go-plugin Clients. diff --git a/pkg/plugin/clientmgmt/process/client_builder_test.go b/pkg/plugin/clientmgmt/process/client_builder_test.go index daf1de42f..14278ae8f 100644 --- a/pkg/plugin/clientmgmt/process/client_builder_test.go +++ b/pkg/plugin/clientmgmt/process/client_builder_test.go @@ -25,12 +25,12 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" - "github.com/velero-io/velero/pkg/plugin/framework" - biav2 "github.com/velero-io/velero/pkg/plugin/framework/backupitemaction/v2" - "github.com/velero-io/velero/pkg/plugin/framework/common" - ibav1 "github.com/velero-io/velero/pkg/plugin/framework/itemblockaction/v1" - riav2 "github.com/velero-io/velero/pkg/plugin/framework/restoreitemaction/v2" - "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + biav2 "github.com/vmware-tanzu/velero/pkg/plugin/framework/backupitemaction/v2" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + ibav1 "github.com/vmware-tanzu/velero/pkg/plugin/framework/itemblockaction/v1" + riav2 "github.com/vmware-tanzu/velero/pkg/plugin/framework/restoreitemaction/v2" + "github.com/vmware-tanzu/velero/pkg/test" ) func TestNewClientBuilder(t *testing.T) { diff --git a/pkg/plugin/clientmgmt/process/process.go b/pkg/plugin/clientmgmt/process/process.go index e21221f06..4d20a1784 100644 --- a/pkg/plugin/clientmgmt/process/process.go +++ b/pkg/plugin/clientmgmt/process/process.go @@ -21,7 +21,7 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/velero-io/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" ) type Factory interface { diff --git a/pkg/plugin/clientmgmt/process/process_test.go b/pkg/plugin/clientmgmt/process/process_test.go index ef4138b08..e67de8db9 100644 --- a/pkg/plugin/clientmgmt/process/process_test.go +++ b/pkg/plugin/clientmgmt/process/process_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/plugin/framework" - "github.com/velero-io/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" ) type mockClientProtocol struct { diff --git a/pkg/plugin/clientmgmt/process/registry.go b/pkg/plugin/clientmgmt/process/registry.go index 4e2e36cf7..744048690 100644 --- a/pkg/plugin/clientmgmt/process/registry.go +++ b/pkg/plugin/clientmgmt/process/registry.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/velero-io/velero/pkg/plugin/framework" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) // Registry manages information about available plugins. diff --git a/pkg/plugin/clientmgmt/process/registry_test.go b/pkg/plugin/clientmgmt/process/registry_test.go index 02330fbd3..e188419b2 100644 --- a/pkg/plugin/clientmgmt/process/registry_test.go +++ b/pkg/plugin/clientmgmt/process/registry_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/test" ) func TestNewRegistry(t *testing.T) { diff --git a/pkg/plugin/clientmgmt/restartable_delete_item_action.go b/pkg/plugin/clientmgmt/restartable_delete_item_action.go index c2a68a77f..b566ede6f 100644 --- a/pkg/plugin/clientmgmt/restartable_delete_item_action.go +++ b/pkg/plugin/clientmgmt/restartable_delete_item_action.go @@ -19,9 +19,9 @@ package clientmgmt import ( "github.com/pkg/errors" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // restartableDeleteItemAction is a delete item action for a given implementation (such as "pod"). It is associated with diff --git a/pkg/plugin/clientmgmt/restartable_delete_item_action_test.go b/pkg/plugin/clientmgmt/restartable_delete_item_action_test.go index 20722d2e8..52edf7ffb 100644 --- a/pkg/plugin/clientmgmt/restartable_delete_item_action_test.go +++ b/pkg/plugin/clientmgmt/restartable_delete_item_action_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/velero-io/velero/internal/restartabletest" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/plugin/velero/mocks" + "github.com/vmware-tanzu/velero/internal/restartabletest" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks" ) func TestRestartableGetDeleteItemAction(t *testing.T) { diff --git a/pkg/plugin/clientmgmt/restartable_object_store.go b/pkg/plugin/clientmgmt/restartable_object_store.go index a37f4c47c..6e66d4b3e 100644 --- a/pkg/plugin/clientmgmt/restartable_object_store.go +++ b/pkg/plugin/clientmgmt/restartable_object_store.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // restartableObjectStore is an object store for a given implementation (such as "aws"). It is associated with diff --git a/pkg/plugin/clientmgmt/restartable_object_store_test.go b/pkg/plugin/clientmgmt/restartable_object_store_test.go index a334f70f5..0b25e02d8 100644 --- a/pkg/plugin/clientmgmt/restartable_object_store_test.go +++ b/pkg/plugin/clientmgmt/restartable_object_store_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/internal/restartabletest" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" - providermocks "github.com/velero-io/velero/pkg/plugin/velero/mocks" + "github.com/vmware-tanzu/velero/internal/restartabletest" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + providermocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks" ) func TestRestartableGetObjectStore(t *testing.T) { diff --git a/pkg/plugin/clientmgmt/restoreitemaction/v1/restartable_restore_item_action.go b/pkg/plugin/clientmgmt/restoreitemaction/v1/restartable_restore_item_action.go index 4e07fa1cb..a03ccecd2 100644 --- a/pkg/plugin/clientmgmt/restoreitemaction/v1/restartable_restore_item_action.go +++ b/pkg/plugin/clientmgmt/restoreitemaction/v1/restartable_restore_item_action.go @@ -19,10 +19,10 @@ package v1 import ( "github.com/pkg/errors" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - riav1 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + riav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v1" ) // AdaptedRestoreItemAction is a restore item action adapted to the v1 RestoreItemAction API diff --git a/pkg/plugin/clientmgmt/restoreitemaction/v1/restartable_restore_item_action_test.go b/pkg/plugin/clientmgmt/restoreitemaction/v1/restartable_restore_item_action_test.go index f2554fd92..08239fc93 100644 --- a/pkg/plugin/clientmgmt/restoreitemaction/v1/restartable_restore_item_action_test.go +++ b/pkg/plugin/clientmgmt/restoreitemaction/v1/restartable_restore_item_action_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/velero-io/velero/internal/restartabletest" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - mocks "github.com/velero-io/velero/pkg/plugin/velero/mocks/restoreitemaction/v1" + "github.com/vmware-tanzu/velero/internal/restartabletest" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + mocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks/restoreitemaction/v1" ) func TestRestartableGetRestoreItemAction(t *testing.T) { diff --git a/pkg/plugin/clientmgmt/restoreitemaction/v2/restartable_restore_item_action.go b/pkg/plugin/clientmgmt/restoreitemaction/v2/restartable_restore_item_action.go index 9989f0d70..c23787cfb 100644 --- a/pkg/plugin/clientmgmt/restoreitemaction/v2/restartable_restore_item_action.go +++ b/pkg/plugin/clientmgmt/restoreitemaction/v2/restartable_restore_item_action.go @@ -19,12 +19,12 @@ package v2 import ( "github.com/pkg/errors" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - riav1cli "github.com/velero-io/velero/pkg/plugin/clientmgmt/restoreitemaction/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - riav2 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v2" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + riav1cli "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/restoreitemaction/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + riav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2" ) // AdaptedRestoreItemAction is a v1 RestoreItemAction adapted to implement the v2 API diff --git a/pkg/plugin/clientmgmt/restoreitemaction/v2/restartable_restore_item_action_test.go b/pkg/plugin/clientmgmt/restoreitemaction/v2/restartable_restore_item_action_test.go index bde2eb2ed..af6521e43 100644 --- a/pkg/plugin/clientmgmt/restoreitemaction/v2/restartable_restore_item_action_test.go +++ b/pkg/plugin/clientmgmt/restoreitemaction/v2/restartable_restore_item_action_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/velero-io/velero/internal/restartabletest" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - mocks "github.com/velero-io/velero/pkg/plugin/velero/mocks/restoreitemaction/v2" + "github.com/vmware-tanzu/velero/internal/restartabletest" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + mocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks/restoreitemaction/v2" ) func TestRestartableGetRestoreItemAction(t *testing.T) { diff --git a/pkg/plugin/clientmgmt/volumesnapshotter/v1/restartable_volume_snapshotter.go b/pkg/plugin/clientmgmt/volumesnapshotter/v1/restartable_volume_snapshotter.go index dd26aa7f2..7aec39872 100644 --- a/pkg/plugin/clientmgmt/volumesnapshotter/v1/restartable_volume_snapshotter.go +++ b/pkg/plugin/clientmgmt/volumesnapshotter/v1/restartable_volume_snapshotter.go @@ -20,9 +20,9 @@ import ( "github.com/pkg/errors" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" - vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1" ) // AdaptedVolumeSnapshotter is a volume snapshotter adapted to the v1 VolumeSnapshotter API diff --git a/pkg/plugin/clientmgmt/volumesnapshotter/v1/restartable_volume_snapshotter_test.go b/pkg/plugin/clientmgmt/volumesnapshotter/v1/restartable_volume_snapshotter_test.go index 4ff59d66f..8a2efe04c 100644 --- a/pkg/plugin/clientmgmt/volumesnapshotter/v1/restartable_volume_snapshotter_test.go +++ b/pkg/plugin/clientmgmt/volumesnapshotter/v1/restartable_volume_snapshotter_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/velero-io/velero/internal/restartabletest" - "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" - "github.com/velero-io/velero/pkg/plugin/framework/common" - providermocks "github.com/velero-io/velero/pkg/plugin/velero/mocks/volumesnapshotter/v1" + "github.com/vmware-tanzu/velero/internal/restartabletest" + "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + providermocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks/volumesnapshotter/v1" ) func TestRestartableGetVolumeSnapshotter(t *testing.T) { diff --git a/pkg/plugin/framework/action_resolver.go b/pkg/plugin/framework/action_resolver.go index b3db6a12c..ac8a0b1d0 100644 --- a/pkg/plugin/framework/action_resolver.go +++ b/pkg/plugin/framework/action_resolver.go @@ -23,14 +23,14 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/plugin/velero" - biav1 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v1" - biav2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2" - ibav1 "github.com/velero-io/velero/pkg/plugin/velero/itemblockaction/v1" - riav1 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v1" - riav2 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v2" - "github.com/velero-io/velero/pkg/util/collections" + "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + biav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v1" + biav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2" + ibav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/itemblockaction/v1" + riav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v1" + riav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2" + "github.com/vmware-tanzu/velero/pkg/util/collections" ) /* diff --git a/pkg/plugin/framework/action_resolver_test.go b/pkg/plugin/framework/action_resolver_test.go index 104682bd4..cf0e411da 100644 --- a/pkg/plugin/framework/action_resolver_test.go +++ b/pkg/plugin/framework/action_resolver_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) type mockApplicable struct { diff --git a/pkg/plugin/framework/backup_item_action.go b/pkg/plugin/framework/backup_item_action.go index ea17b0639..9c1a5665d 100644 --- a/pkg/plugin/framework/backup_item_action.go +++ b/pkg/plugin/framework/backup_item_action.go @@ -22,8 +22,8 @@ import ( plugin "github.com/hashicorp/go-plugin" "google.golang.org/grpc" - "github.com/velero-io/velero/pkg/plugin/framework/common" - protobiav1 "github.com/velero-io/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + protobiav1 "github.com/vmware-tanzu/velero/pkg/plugin/generated" ) // BackupItemActionPlugin is an implementation of go-plugin's Plugin diff --git a/pkg/plugin/framework/backup_item_action_client.go b/pkg/plugin/framework/backup_item_action_client.go index 1ea17fc8d..724737d01 100644 --- a/pkg/plugin/framework/backup_item_action_client.go +++ b/pkg/plugin/framework/backup_item_action_client.go @@ -27,10 +27,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - protobiav1 "github.com/velero-io/velero/pkg/plugin/generated" - "github.com/velero-io/velero/pkg/plugin/velero" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + protobiav1 "github.com/vmware-tanzu/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // NewBackupItemActionPlugin constructs a BackupItemActionPlugin. diff --git a/pkg/plugin/framework/backup_item_action_server.go b/pkg/plugin/framework/backup_item_action_server.go index 047e49abb..7c18b4ef6 100644 --- a/pkg/plugin/framework/backup_item_action_server.go +++ b/pkg/plugin/framework/backup_item_action_server.go @@ -24,11 +24,11 @@ import ( "github.com/pkg/errors" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" - "github.com/velero-io/velero/pkg/plugin/velero" - biav1 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v1" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + biav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v1" ) // BackupItemActionGRPCServer implements the proto-generated BackupItemAction interface, and accepts diff --git a/pkg/plugin/framework/backup_item_action_test.go b/pkg/plugin/framework/backup_item_action_test.go index 982a47c8e..1472eb115 100644 --- a/pkg/plugin/framework/backup_item_action_test.go +++ b/pkg/plugin/framework/backup_item_action_test.go @@ -27,12 +27,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" - "github.com/velero-io/velero/pkg/plugin/velero" - mocks "github.com/velero-io/velero/pkg/plugin/velero/mocks/backupitemaction/v1" - velerotest "github.com/velero-io/velero/pkg/test" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + mocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks/backupitemaction/v1" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestBackupItemActionGRPCServerExecute(t *testing.T) { diff --git a/pkg/plugin/framework/backupitemaction/v2/backup_item_action.go b/pkg/plugin/framework/backupitemaction/v2/backup_item_action.go index 68d969b62..903ec378c 100644 --- a/pkg/plugin/framework/backupitemaction/v2/backup_item_action.go +++ b/pkg/plugin/framework/backupitemaction/v2/backup_item_action.go @@ -22,8 +22,8 @@ import ( plugin "github.com/hashicorp/go-plugin" "google.golang.org/grpc" - "github.com/velero-io/velero/pkg/plugin/framework/common" - protobiav2 "github.com/velero-io/velero/pkg/plugin/generated/backupitemaction/v2" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + protobiav2 "github.com/vmware-tanzu/velero/pkg/plugin/generated/backupitemaction/v2" ) // BackupItemActionPlugin is an implementation of go-plugin's Plugin diff --git a/pkg/plugin/framework/backupitemaction/v2/backup_item_action_client.go b/pkg/plugin/framework/backupitemaction/v2/backup_item_action_client.go index 9dd4090de..64695dbe3 100644 --- a/pkg/plugin/framework/backupitemaction/v2/backup_item_action_client.go +++ b/pkg/plugin/framework/backupitemaction/v2/backup_item_action_client.go @@ -27,10 +27,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - protobiav2 "github.com/velero-io/velero/pkg/plugin/generated/backupitemaction/v2" - "github.com/velero-io/velero/pkg/plugin/velero" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + protobiav2 "github.com/vmware-tanzu/velero/pkg/plugin/generated/backupitemaction/v2" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // NewBackupItemActionPlugin constructs a BackupItemActionPlugin. diff --git a/pkg/plugin/framework/backupitemaction/v2/backup_item_action_server.go b/pkg/plugin/framework/backupitemaction/v2/backup_item_action_server.go index b95168968..f8c894eba 100644 --- a/pkg/plugin/framework/backupitemaction/v2/backup_item_action_server.go +++ b/pkg/plugin/framework/backupitemaction/v2/backup_item_action_server.go @@ -27,12 +27,12 @@ import ( timestamppb "google.golang.org/protobuf/types/known/timestamppb" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" - protobiav2 "github.com/velero-io/velero/pkg/plugin/generated/backupitemaction/v2" - "github.com/velero-io/velero/pkg/plugin/velero" - biav2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" + protobiav2 "github.com/vmware-tanzu/velero/pkg/plugin/generated/backupitemaction/v2" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + biav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2" ) // BackupItemActionGRPCServer implements the proto-generated BackupItemAction interface, and accepts diff --git a/pkg/plugin/framework/backupitemaction/v2/backup_item_action_test.go b/pkg/plugin/framework/backupitemaction/v2/backup_item_action_test.go index ba630554d..502c37502 100644 --- a/pkg/plugin/framework/backupitemaction/v2/backup_item_action_test.go +++ b/pkg/plugin/framework/backupitemaction/v2/backup_item_action_test.go @@ -27,13 +27,13 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" - protobiav2 "github.com/velero-io/velero/pkg/plugin/generated/backupitemaction/v2" - "github.com/velero-io/velero/pkg/plugin/velero" - mocks "github.com/velero-io/velero/pkg/plugin/velero/mocks/backupitemaction/v2" - velerotest "github.com/velero-io/velero/pkg/test" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" + protobiav2 "github.com/vmware-tanzu/velero/pkg/plugin/generated/backupitemaction/v2" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + mocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks/backupitemaction/v2" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestBackupItemActionGRPCServerExecute(t *testing.T) { diff --git a/pkg/plugin/framework/common/client_dispenser_test.go b/pkg/plugin/framework/common/client_dispenser_test.go index 3441cc648..3aa0cd299 100644 --- a/pkg/plugin/framework/common/client_dispenser_test.go +++ b/pkg/plugin/framework/common/client_dispenser_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/test" ) type fakeClient struct { diff --git a/pkg/plugin/framework/common/client_errors.go b/pkg/plugin/framework/common/client_errors.go index 7a452ec5b..1d9e6c22f 100644 --- a/pkg/plugin/framework/common/client_errors.go +++ b/pkg/plugin/framework/common/client_errors.go @@ -19,7 +19,7 @@ package common import ( "google.golang.org/grpc/status" - proto "github.com/velero-io/velero/pkg/plugin/generated" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" ) // FromGRPCError takes a gRPC status error, extracts a stack trace diff --git a/pkg/plugin/framework/common/plugin_base_test.go b/pkg/plugin/framework/common/plugin_base_test.go index f4d48de9c..e9d5ec2e2 100644 --- a/pkg/plugin/framework/common/plugin_base_test.go +++ b/pkg/plugin/framework/common/plugin_base_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/test" ) func TestClientLogger(t *testing.T) { diff --git a/pkg/plugin/framework/common/plugin_config_test.go b/pkg/plugin/framework/common/plugin_config_test.go index ec5ef9ef5..53cb0fb8f 100644 --- a/pkg/plugin/framework/common/plugin_config_test.go +++ b/pkg/plugin/framework/common/plugin_config_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) func TestGetPluginConfig(t *testing.T) { diff --git a/pkg/plugin/framework/common/server_errors.go b/pkg/plugin/framework/common/server_errors.go index 20ea63893..60eff50f4 100644 --- a/pkg/plugin/framework/common/server_errors.go +++ b/pkg/plugin/framework/common/server_errors.go @@ -22,8 +22,8 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/protoadapt" - proto "github.com/velero-io/velero/pkg/plugin/generated" - "github.com/velero-io/velero/pkg/util/logging" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/util/logging" ) // NewGRPCErrorWithCode wraps err in a gRPC status error with the error's stack trace diff --git a/pkg/plugin/framework/delete_item_action.go b/pkg/plugin/framework/delete_item_action.go index 8ef51f06d..db4329b7f 100644 --- a/pkg/plugin/framework/delete_item_action.go +++ b/pkg/plugin/framework/delete_item_action.go @@ -22,8 +22,8 @@ import ( plugin "github.com/hashicorp/go-plugin" "google.golang.org/grpc" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" ) // DeleteItemActionPlugin is an implementation of go-plugin's Plugin diff --git a/pkg/plugin/framework/delete_item_action_client.go b/pkg/plugin/framework/delete_item_action_client.go index b8ca2d7b8..bec5088db 100644 --- a/pkg/plugin/framework/delete_item_action_client.go +++ b/pkg/plugin/framework/delete_item_action_client.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) var _ velero.DeleteItemAction = &DeleteItemActionGRPCClient{} diff --git a/pkg/plugin/framework/delete_item_action_server.go b/pkg/plugin/framework/delete_item_action_server.go index 154ec3452..01abe8dc3 100644 --- a/pkg/plugin/framework/delete_item_action_server.go +++ b/pkg/plugin/framework/delete_item_action_server.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" - "github.com/velero-io/velero/pkg/plugin/velero" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // DeleteItemActionGRPCServer implements the proto-generated DeleteItemActionServer interface, and accepts diff --git a/pkg/plugin/framework/examples_test.go b/pkg/plugin/framework/examples_test.go index e750be8f4..41bb8395e 100644 --- a/pkg/plugin/framework/examples_test.go +++ b/pkg/plugin/framework/examples_test.go @@ -20,7 +20,7 @@ import ( "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) func ExampleNewServer_volumeSnapshotter() { diff --git a/pkg/plugin/framework/import_test.go b/pkg/plugin/framework/import_test.go index 18aa0db91..ee1439329 100644 --- a/pkg/plugin/framework/import_test.go +++ b/pkg/plugin/framework/import_test.go @@ -13,7 +13,7 @@ import ( // test that this package do not import cloud provider -// Prevent https://github.com/velero-io/velero/issues/8207 and https://github.com/velero-io/velero/issues/8157 +// Prevent https://github.com/vmware-tanzu/velero/issues/8207 and https://github.com/vmware-tanzu/velero/issues/8157 func TestPkgImportNoCloudProvider(t *testing.T) { _, filename, _, ok := runtime.Caller(0) if !ok { diff --git a/pkg/plugin/framework/itemblockaction/v1/item_block_action.go b/pkg/plugin/framework/itemblockaction/v1/item_block_action.go index 8e7852126..2115d2ecf 100644 --- a/pkg/plugin/framework/itemblockaction/v1/item_block_action.go +++ b/pkg/plugin/framework/itemblockaction/v1/item_block_action.go @@ -22,8 +22,8 @@ import ( plugin "github.com/hashicorp/go-plugin" "google.golang.org/grpc" - "github.com/velero-io/velero/pkg/plugin/framework/common" - protoibav1 "github.com/velero-io/velero/pkg/plugin/generated/itemblockaction/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + protoibav1 "github.com/vmware-tanzu/velero/pkg/plugin/generated/itemblockaction/v1" ) // ItemBlockActionPlugin is an implementation of go-plugin's Plugin diff --git a/pkg/plugin/framework/itemblockaction/v1/item_block_action_client.go b/pkg/plugin/framework/itemblockaction/v1/item_block_action_client.go index f1a056f93..aa597c4af 100644 --- a/pkg/plugin/framework/itemblockaction/v1/item_block_action_client.go +++ b/pkg/plugin/framework/itemblockaction/v1/item_block_action_client.go @@ -26,10 +26,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - protoibav1 "github.com/velero-io/velero/pkg/plugin/generated/itemblockaction/v1" - "github.com/velero-io/velero/pkg/plugin/velero" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + protoibav1 "github.com/vmware-tanzu/velero/pkg/plugin/generated/itemblockaction/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // NewItemBlockActionPlugin constructs a ItemBlockActionPlugin. diff --git a/pkg/plugin/framework/itemblockaction/v1/item_block_action_server.go b/pkg/plugin/framework/itemblockaction/v1/item_block_action_server.go index 51c5e429e..2d940550c 100644 --- a/pkg/plugin/framework/itemblockaction/v1/item_block_action_server.go +++ b/pkg/plugin/framework/itemblockaction/v1/item_block_action_server.go @@ -24,12 +24,12 @@ import ( "github.com/pkg/errors" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" - protoibav1 "github.com/velero-io/velero/pkg/plugin/generated/itemblockaction/v1" - "github.com/velero-io/velero/pkg/plugin/velero" - ibav1 "github.com/velero-io/velero/pkg/plugin/velero/itemblockaction/v1" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" + protoibav1 "github.com/vmware-tanzu/velero/pkg/plugin/generated/itemblockaction/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + ibav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/itemblockaction/v1" ) // ItemBlockActionGRPCServer implements the proto-generated ItemBlockAction interface, and accepts diff --git a/pkg/plugin/framework/itemblockaction/v1/item_block_action_test.go b/pkg/plugin/framework/itemblockaction/v1/item_block_action_test.go index 045e8d5a7..6e2a0e4d5 100644 --- a/pkg/plugin/framework/itemblockaction/v1/item_block_action_test.go +++ b/pkg/plugin/framework/itemblockaction/v1/item_block_action_test.go @@ -26,13 +26,13 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" - protoibav1 "github.com/velero-io/velero/pkg/plugin/generated/itemblockaction/v1" - "github.com/velero-io/velero/pkg/plugin/velero" - mocks "github.com/velero-io/velero/pkg/plugin/velero/mocks/itemblockaction/v1" - velerotest "github.com/velero-io/velero/pkg/test" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" + protoibav1 "github.com/vmware-tanzu/velero/pkg/plugin/generated/itemblockaction/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + mocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks/itemblockaction/v1" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestItemBlockActionGRPCServerGetRelatedItems(t *testing.T) { diff --git a/pkg/plugin/framework/logger.go b/pkg/plugin/framework/logger.go index 22ac4f187..b7f13e4af 100644 --- a/pkg/plugin/framework/logger.go +++ b/pkg/plugin/framework/logger.go @@ -19,7 +19,7 @@ package framework import ( "github.com/sirupsen/logrus" - "github.com/velero-io/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/pkg/util/logging" ) // newLogger returns a logger that is suitable for use within an diff --git a/pkg/plugin/framework/logger_test.go b/pkg/plugin/framework/logger_test.go index 7899da35e..7e9ba7bf2 100644 --- a/pkg/plugin/framework/logger_test.go +++ b/pkg/plugin/framework/logger_test.go @@ -21,7 +21,7 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" - "github.com/velero-io/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/pkg/util/logging" ) func TestNewLogger(t *testing.T) { diff --git a/pkg/plugin/framework/object_store.go b/pkg/plugin/framework/object_store.go index 647295a4a..ea624da42 100644 --- a/pkg/plugin/framework/object_store.go +++ b/pkg/plugin/framework/object_store.go @@ -22,8 +22,8 @@ import ( plugin "github.com/hashicorp/go-plugin" "google.golang.org/grpc" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" ) // ObjectStorePlugin is an implementation of go-plugin's Plugin diff --git a/pkg/plugin/framework/object_store_client.go b/pkg/plugin/framework/object_store_client.go index b44c06668..b59f3d1b0 100644 --- a/pkg/plugin/framework/object_store_client.go +++ b/pkg/plugin/framework/object_store_client.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" ) const byteChunkSize = 16384 diff --git a/pkg/plugin/framework/object_store_server.go b/pkg/plugin/framework/object_store_server.go index 1dc54688d..fbed21ecf 100644 --- a/pkg/plugin/framework/object_store_server.go +++ b/pkg/plugin/framework/object_store_server.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // ObjectStoreGRPCServer implements the proto-generated ObjectStoreServer interface, and accepts diff --git a/pkg/plugin/framework/plugin_lister.go b/pkg/plugin/framework/plugin_lister.go index d58b802d6..6db81c66d 100644 --- a/pkg/plugin/framework/plugin_lister.go +++ b/pkg/plugin/framework/plugin_lister.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" ) // PluginIdentifier uniquely identifies a plugin by command, kind, and name. diff --git a/pkg/plugin/framework/restore_item_action.go b/pkg/plugin/framework/restore_item_action.go index a0cfa0b0f..26cef3728 100644 --- a/pkg/plugin/framework/restore_item_action.go +++ b/pkg/plugin/framework/restore_item_action.go @@ -22,8 +22,8 @@ import ( plugin "github.com/hashicorp/go-plugin" "google.golang.org/grpc" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" ) // RestoreItemActionPlugin is an implementation of go-plugin's Plugin diff --git a/pkg/plugin/framework/restore_item_action_client.go b/pkg/plugin/framework/restore_item_action_client.go index a902417a1..3a5a633f3 100644 --- a/pkg/plugin/framework/restore_item_action_client.go +++ b/pkg/plugin/framework/restore_item_action_client.go @@ -26,10 +26,10 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" - "github.com/velero-io/velero/pkg/plugin/velero" - riav1 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + riav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v1" ) var _ riav1.RestoreItemAction = &RestoreItemActionGRPCClient{} diff --git a/pkg/plugin/framework/restore_item_action_server.go b/pkg/plugin/framework/restore_item_action_server.go index 14a90f02e..175a941bd 100644 --- a/pkg/plugin/framework/restore_item_action_server.go +++ b/pkg/plugin/framework/restore_item_action_server.go @@ -24,11 +24,11 @@ import ( "github.com/pkg/errors" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" - "github.com/velero-io/velero/pkg/plugin/velero" - riav1 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v1" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + riav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v1" ) // RestoreItemActionGRPCServer implements the proto-generated RestoreItemActionServer interface, and accepts diff --git a/pkg/plugin/framework/restoreitemaction/v2/restore_item_action.go b/pkg/plugin/framework/restoreitemaction/v2/restore_item_action.go index 606f04cdf..00bb825b8 100644 --- a/pkg/plugin/framework/restoreitemaction/v2/restore_item_action.go +++ b/pkg/plugin/framework/restoreitemaction/v2/restore_item_action.go @@ -22,8 +22,8 @@ import ( plugin "github.com/hashicorp/go-plugin" "google.golang.org/grpc" - "github.com/velero-io/velero/pkg/plugin/framework/common" - protoriav2 "github.com/velero-io/velero/pkg/plugin/generated/restoreitemaction/v2" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + protoriav2 "github.com/vmware-tanzu/velero/pkg/plugin/generated/restoreitemaction/v2" ) // RestoreItemActionPlugin is an implementation of go-plugin's Plugin diff --git a/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_client.go b/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_client.go index 40668d4c3..5e2f01c37 100644 --- a/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_client.go +++ b/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_client.go @@ -26,11 +26,11 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - protoriav2 "github.com/velero-io/velero/pkg/plugin/generated/restoreitemaction/v2" - "github.com/velero-io/velero/pkg/plugin/velero" - riav2 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v2" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + protoriav2 "github.com/vmware-tanzu/velero/pkg/plugin/generated/restoreitemaction/v2" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + riav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2" ) var _ riav2.RestoreItemAction = &RestoreItemActionGRPCClient{} diff --git a/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_server.go b/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_server.go index 6a9302080..115961656 100644 --- a/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_server.go +++ b/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_server.go @@ -28,12 +28,12 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" - protoriav2 "github.com/velero-io/velero/pkg/plugin/generated/restoreitemaction/v2" - "github.com/velero-io/velero/pkg/plugin/velero" - riav2 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v2" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" + protoriav2 "github.com/vmware-tanzu/velero/pkg/plugin/generated/restoreitemaction/v2" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + riav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2" ) // RestoreItemActionGRPCServer implements the proto-generated RestoreItemActionServer interface, and accepts diff --git a/pkg/plugin/framework/server.go b/pkg/plugin/framework/server.go index 58d184709..923210d55 100644 --- a/pkg/plugin/framework/server.go +++ b/pkg/plugin/framework/server.go @@ -24,11 +24,11 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/pflag" - "github.com/velero-io/velero/pkg/cmd/server/config" - biav2 "github.com/velero-io/velero/pkg/plugin/framework/backupitemaction/v2" - "github.com/velero-io/velero/pkg/plugin/framework/common" - ibav1 "github.com/velero-io/velero/pkg/plugin/framework/itemblockaction/v1" - riav2 "github.com/velero-io/velero/pkg/plugin/framework/restoreitemaction/v2" + "github.com/vmware-tanzu/velero/pkg/cmd/server/config" + biav2 "github.com/vmware-tanzu/velero/pkg/plugin/framework/backupitemaction/v2" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + ibav1 "github.com/vmware-tanzu/velero/pkg/plugin/framework/itemblockaction/v1" + riav2 "github.com/vmware-tanzu/velero/pkg/plugin/framework/restoreitemaction/v2" ) // Server serves registered plugin implementations. diff --git a/pkg/plugin/framework/volume_snapshotter.go b/pkg/plugin/framework/volume_snapshotter.go index b54955c11..8cbb48fa4 100644 --- a/pkg/plugin/framework/volume_snapshotter.go +++ b/pkg/plugin/framework/volume_snapshotter.go @@ -22,8 +22,8 @@ import ( plugin "github.com/hashicorp/go-plugin" "google.golang.org/grpc" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" ) // VolumeSnapshotterPlugin is an implementation of go-plugin's Plugin diff --git a/pkg/plugin/framework/volume_snapshotter_client.go b/pkg/plugin/framework/volume_snapshotter_client.go index 6af01e37d..f7af07ce4 100644 --- a/pkg/plugin/framework/volume_snapshotter_client.go +++ b/pkg/plugin/framework/volume_snapshotter_client.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" ) // NewVolumeSnapshotterPlugin constructs a VolumeSnapshotterPlugin. diff --git a/pkg/plugin/framework/volume_snapshotter_server.go b/pkg/plugin/framework/volume_snapshotter_server.go index 95050afb8..de30c823f 100644 --- a/pkg/plugin/framework/volume_snapshotter_server.go +++ b/pkg/plugin/framework/volume_snapshotter_server.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/velero-io/velero/pkg/plugin/framework/common" - proto "github.com/velero-io/velero/pkg/plugin/generated" - vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" + vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1" ) // VolumeSnapshotterGRPCServer implements the proto-generated VolumeSnapshotterServer interface, and accepts diff --git a/pkg/plugin/generated/backupitemaction/v2/BackupItemAction.pb.go b/pkg/plugin/generated/backupitemaction/v2/BackupItemAction.pb.go index 3c8f740d1..5eb2c852b 100644 --- a/pkg/plugin/generated/backupitemaction/v2/BackupItemAction.pb.go +++ b/pkg/plugin/generated/backupitemaction/v2/BackupItemAction.pb.go @@ -7,7 +7,7 @@ package v2 import ( - generated "github.com/velero-io/velero/pkg/plugin/generated" + generated "github.com/vmware-tanzu/velero/pkg/plugin/generated" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/pkg/plugin/generated/itemblockaction/v1/ItemBlockAction.pb.go b/pkg/plugin/generated/itemblockaction/v1/ItemBlockAction.pb.go index ffa395a39..cec604477 100644 --- a/pkg/plugin/generated/itemblockaction/v1/ItemBlockAction.pb.go +++ b/pkg/plugin/generated/itemblockaction/v1/ItemBlockAction.pb.go @@ -7,7 +7,7 @@ package v1 import ( - generated "github.com/velero-io/velero/pkg/plugin/generated" + generated "github.com/vmware-tanzu/velero/pkg/plugin/generated" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/pkg/plugin/generated/restoreitemaction/v2/RestoreItemAction.pb.go b/pkg/plugin/generated/restoreitemaction/v2/RestoreItemAction.pb.go index 0063e6158..a7bbc421e 100644 --- a/pkg/plugin/generated/restoreitemaction/v2/RestoreItemAction.pb.go +++ b/pkg/plugin/generated/restoreitemaction/v2/RestoreItemAction.pb.go @@ -7,7 +7,7 @@ package v2 import ( - generated "github.com/velero-io/velero/pkg/plugin/generated" + generated "github.com/vmware-tanzu/velero/pkg/plugin/generated" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" durationpb "google.golang.org/protobuf/types/known/durationpb" diff --git a/pkg/plugin/mocks/manager.go b/pkg/plugin/mocks/manager.go index 0c2219dc0..c12510fdd 100644 --- a/pkg/plugin/mocks/manager.go +++ b/pkg/plugin/mocks/manager.go @@ -4,19 +4,19 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - itemblockactionv1 "github.com/velero-io/velero/pkg/plugin/velero/itemblockaction/v1" + itemblockactionv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/itemblockaction/v1" - restoreitemactionv1 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v1" + restoreitemactionv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v1" - restoreitemactionv2 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v2" + restoreitemactionv2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2" - v1 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v1" + v1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v1" - v2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2" + v2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2" - velero "github.com/velero-io/velero/pkg/plugin/velero" + velero "github.com/vmware-tanzu/velero/pkg/plugin/velero" - volumesnapshotterv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1" + volumesnapshotterv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1" ) // Manager is an autogenerated mock type for the Manager type diff --git a/pkg/plugin/mocks/process_factory.go b/pkg/plugin/mocks/process_factory.go index 5325a6a9f..586e31121 100644 --- a/pkg/plugin/mocks/process_factory.go +++ b/pkg/plugin/mocks/process_factory.go @@ -21,7 +21,7 @@ import ( logrus "github.com/sirupsen/logrus" mock "github.com/stretchr/testify/mock" - process "github.com/velero-io/velero/pkg/plugin/clientmgmt/process" + process "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt/process" ) // ProcessFactory is an autogenerated mock type for the ProcessFactory type diff --git a/pkg/plugin/proto/BackupItemAction.proto b/pkg/plugin/proto/BackupItemAction.proto index 5d89e2a87..66111300a 100644 --- a/pkg/plugin/proto/BackupItemAction.proto +++ b/pkg/plugin/proto/BackupItemAction.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package generated; -option go_package = "github.com/velero-io/velero/pkg/plugin/generated"; +option go_package = "github.com/vmware-tanzu/velero/pkg/plugin/generated"; import "Shared.proto"; diff --git a/pkg/plugin/proto/DeleteItemAction.proto b/pkg/plugin/proto/DeleteItemAction.proto index 34c1924c9..f2838fe0c 100644 --- a/pkg/plugin/proto/DeleteItemAction.proto +++ b/pkg/plugin/proto/DeleteItemAction.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package generated; -option go_package = "github.com/velero-io/velero/pkg/plugin/generated"; +option go_package = "github.com/vmware-tanzu/velero/pkg/plugin/generated"; import "Shared.proto"; diff --git a/pkg/plugin/proto/ObjectStore.proto b/pkg/plugin/proto/ObjectStore.proto index 49e493789..4487a0cef 100644 --- a/pkg/plugin/proto/ObjectStore.proto +++ b/pkg/plugin/proto/ObjectStore.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package generated; -option go_package = "github.com/velero-io/velero/pkg/plugin/generated"; +option go_package = "github.com/vmware-tanzu/velero/pkg/plugin/generated"; import "Shared.proto"; diff --git a/pkg/plugin/proto/PluginLister.proto b/pkg/plugin/proto/PluginLister.proto index d2300924d..55cfe62de 100644 --- a/pkg/plugin/proto/PluginLister.proto +++ b/pkg/plugin/proto/PluginLister.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package generated; -option go_package = "github.com/velero-io/velero/pkg/plugin/generated"; +option go_package = "github.com/vmware-tanzu/velero/pkg/plugin/generated"; import "Shared.proto"; diff --git a/pkg/plugin/proto/RestoreItemAction.proto b/pkg/plugin/proto/RestoreItemAction.proto index 57ca235a4..ae9c3ddd9 100644 --- a/pkg/plugin/proto/RestoreItemAction.proto +++ b/pkg/plugin/proto/RestoreItemAction.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package generated; -option go_package = "github.com/velero-io/velero/pkg/plugin/generated"; +option go_package = "github.com/vmware-tanzu/velero/pkg/plugin/generated"; import "Shared.proto"; diff --git a/pkg/plugin/proto/Shared.proto b/pkg/plugin/proto/Shared.proto index d59f548af..dd12a7ee7 100644 --- a/pkg/plugin/proto/Shared.proto +++ b/pkg/plugin/proto/Shared.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package generated; -option go_package = "github.com/velero-io/velero/pkg/plugin/generated"; +option go_package = "github.com/vmware-tanzu/velero/pkg/plugin/generated"; import "google/protobuf/timestamp.proto"; diff --git a/pkg/plugin/proto/VolumeSnapshotter.proto b/pkg/plugin/proto/VolumeSnapshotter.proto index 36da5b704..affb762bc 100644 --- a/pkg/plugin/proto/VolumeSnapshotter.proto +++ b/pkg/plugin/proto/VolumeSnapshotter.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package generated; -option go_package = "github.com/velero-io/velero/pkg/plugin/generated"; +option go_package = "github.com/vmware-tanzu/velero/pkg/plugin/generated"; import "Shared.proto"; diff --git a/pkg/plugin/proto/backupitemaction/v2/BackupItemAction.proto b/pkg/plugin/proto/backupitemaction/v2/BackupItemAction.proto index 8479d7f42..36f067fe2 100644 --- a/pkg/plugin/proto/backupitemaction/v2/BackupItemAction.proto +++ b/pkg/plugin/proto/backupitemaction/v2/BackupItemAction.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package v2; -option go_package = "github.com/velero-io/velero/pkg/plugin/generated/backupitemaction/v2"; +option go_package = "github.com/vmware-tanzu/velero/pkg/plugin/generated/backupitemaction/v2"; import "Shared.proto"; import "google/protobuf/empty.proto"; diff --git a/pkg/plugin/proto/itemblockaction/v1/ItemBlockAction.proto b/pkg/plugin/proto/itemblockaction/v1/ItemBlockAction.proto index 71b350044..5c0f86a3d 100644 --- a/pkg/plugin/proto/itemblockaction/v1/ItemBlockAction.proto +++ b/pkg/plugin/proto/itemblockaction/v1/ItemBlockAction.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package v1; -option go_package = "github.com/velero-io/velero/pkg/plugin/generated/itemblockaction/v1"; +option go_package = "github.com/vmware-tanzu/velero/pkg/plugin/generated/itemblockaction/v1"; import "Shared.proto"; diff --git a/pkg/plugin/proto/restoreitemaction/v2/RestoreItemAction.proto b/pkg/plugin/proto/restoreitemaction/v2/RestoreItemAction.proto index 614544025..a3e969114 100644 --- a/pkg/plugin/proto/restoreitemaction/v2/RestoreItemAction.proto +++ b/pkg/plugin/proto/restoreitemaction/v2/RestoreItemAction.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package v2; -option go_package = "github.com/velero-io/velero/pkg/plugin/generated/restoreitemaction/v2"; +option go_package = "github.com/vmware-tanzu/velero/pkg/plugin/generated/restoreitemaction/v2"; import "Shared.proto"; import "google/protobuf/empty.proto"; diff --git a/pkg/plugin/utils/volumehelper/volume_policy_helper.go b/pkg/plugin/utils/volumehelper/volume_policy_helper.go index 84675cafb..843c23b06 100644 --- a/pkg/plugin/utils/volumehelper/volume_policy_helper.go +++ b/pkg/plugin/utils/volumehelper/volume_policy_helper.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" crclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/resourcepolicies" - "github.com/velero-io/velero/internal/volumehelper" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/util/boolptr" - podvolumeutil "github.com/velero-io/velero/pkg/util/podvolume" - vhutil "github.com/velero-io/velero/pkg/util/volumehelper" + "github.com/vmware-tanzu/velero/internal/resourcepolicies" + "github.com/vmware-tanzu/velero/internal/volumehelper" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + podvolumeutil "github.com/vmware-tanzu/velero/pkg/util/podvolume" + vhutil "github.com/vmware-tanzu/velero/pkg/util/volumehelper" ) // ShouldPerformSnapshotWithBackup is used for third-party plugins. diff --git a/pkg/plugin/utils/volumehelper/volume_policy_helper_test.go b/pkg/plugin/utils/volumehelper/volume_policy_helper_test.go index cebc4641e..08b23ae04 100644 --- a/pkg/plugin/utils/volumehelper/volume_policy_helper_test.go +++ b/pkg/plugin/utils/volumehelper/volume_policy_helper_test.go @@ -26,10 +26,10 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/internal/volumehelper" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/kuberesource" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/internal/volumehelper" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestShouldPerformSnapshotWithBackup(t *testing.T) { diff --git a/pkg/plugin/velero/backupitemaction/v1/backup_item_action.go b/pkg/plugin/velero/backupitemaction/v1/backup_item_action.go index 0a823e3ca..35566d98a 100644 --- a/pkg/plugin/velero/backupitemaction/v1/backup_item_action.go +++ b/pkg/plugin/velero/backupitemaction/v1/backup_item_action.go @@ -19,8 +19,8 @@ package v1 import ( "k8s.io/apimachinery/pkg/runtime" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/velero" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // BackupItemAction is an actor that performs an operation on an individual item being backed up. diff --git a/pkg/plugin/velero/backupitemaction/v2/backup_item_action.go b/pkg/plugin/velero/backupitemaction/v2/backup_item_action.go index 4566eafd6..3c23802f2 100644 --- a/pkg/plugin/velero/backupitemaction/v2/backup_item_action.go +++ b/pkg/plugin/velero/backupitemaction/v2/backup_item_action.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/velero" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // BackupItemAction is an actor that performs an operation on an individual item being backed up. diff --git a/pkg/plugin/velero/delete_item_action.go b/pkg/plugin/velero/delete_item_action.go index afd8ebbb2..e3e7d9259 100644 --- a/pkg/plugin/velero/delete_item_action.go +++ b/pkg/plugin/velero/delete_item_action.go @@ -19,7 +19,7 @@ package velero import ( "k8s.io/apimachinery/pkg/runtime" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // DeleteItemAction is an actor that performs an operation on an individual item being restored. diff --git a/pkg/plugin/velero/itemblockaction/v1/item_block_action.go b/pkg/plugin/velero/itemblockaction/v1/item_block_action.go index c8d6e020c..6d0133700 100644 --- a/pkg/plugin/velero/itemblockaction/v1/item_block_action.go +++ b/pkg/plugin/velero/itemblockaction/v1/item_block_action.go @@ -19,8 +19,8 @@ package v1 import ( "k8s.io/apimachinery/pkg/runtime" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/velero" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // ItemBlockAction is an action that returns a list of related items that must be backed up diff --git a/pkg/plugin/velero/mocks/DeleteItemAction.go b/pkg/plugin/velero/mocks/DeleteItemAction.go index c75eb32e9..101e04fde 100644 --- a/pkg/plugin/velero/mocks/DeleteItemAction.go +++ b/pkg/plugin/velero/mocks/DeleteItemAction.go @@ -4,7 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - velero "github.com/velero-io/velero/pkg/plugin/velero" + velero "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // DeleteItemAction is an autogenerated mock type for the DeleteItemAction type diff --git a/pkg/plugin/velero/mocks/backupitemaction/v1/BackupItemAction.go b/pkg/plugin/velero/mocks/backupitemaction/v1/BackupItemAction.go index d6fba5904..cfca2ef6d 100644 --- a/pkg/plugin/velero/mocks/backupitemaction/v1/BackupItemAction.go +++ b/pkg/plugin/velero/mocks/backupitemaction/v1/BackupItemAction.go @@ -21,9 +21,9 @@ import ( mock "github.com/stretchr/testify/mock" runtime "k8s.io/apimachinery/pkg/runtime" - velero "github.com/velero-io/velero/pkg/plugin/velero" + velero "github.com/vmware-tanzu/velero/pkg/plugin/velero" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // BackupItemAction is an autogenerated mock type for the BackupItemAction type diff --git a/pkg/plugin/velero/mocks/backupitemaction/v2/BackupItemAction.go b/pkg/plugin/velero/mocks/backupitemaction/v2/BackupItemAction.go index e30ffeb67..426442477 100644 --- a/pkg/plugin/velero/mocks/backupitemaction/v2/BackupItemAction.go +++ b/pkg/plugin/velero/mocks/backupitemaction/v2/BackupItemAction.go @@ -21,9 +21,9 @@ import ( mock "github.com/stretchr/testify/mock" runtime "k8s.io/apimachinery/pkg/runtime" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" - velero "github.com/velero-io/velero/pkg/plugin/velero" + velero "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // BackupItemAction is an autogenerated mock type for the BackupItemAction type diff --git a/pkg/plugin/velero/mocks/itemblockaction/v1/ItemBlockAction.go b/pkg/plugin/velero/mocks/itemblockaction/v1/ItemBlockAction.go index b07bb63f4..95a8d960a 100644 --- a/pkg/plugin/velero/mocks/itemblockaction/v1/ItemBlockAction.go +++ b/pkg/plugin/velero/mocks/itemblockaction/v1/ItemBlockAction.go @@ -21,9 +21,9 @@ import ( mock "github.com/stretchr/testify/mock" runtime "k8s.io/apimachinery/pkg/runtime" - velero "github.com/velero-io/velero/pkg/plugin/velero" + velero "github.com/vmware-tanzu/velero/pkg/plugin/velero" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // ItemBlockAction is an autogenerated mock type for the ItemBlockAction type diff --git a/pkg/plugin/velero/mocks/restoreitemaction/v1/RestoreItemAction.go b/pkg/plugin/velero/mocks/restoreitemaction/v1/RestoreItemAction.go index bd4b7d56d..1bacf7b16 100644 --- a/pkg/plugin/velero/mocks/restoreitemaction/v1/RestoreItemAction.go +++ b/pkg/plugin/velero/mocks/restoreitemaction/v1/RestoreItemAction.go @@ -19,7 +19,7 @@ package v1 import ( mock "github.com/stretchr/testify/mock" - velero "github.com/velero-io/velero/pkg/plugin/velero" + velero "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // RestoreItemAction is an autogenerated mock type for the RestoreItemAction type diff --git a/pkg/plugin/velero/mocks/restoreitemaction/v2/RestoreItemAction.go b/pkg/plugin/velero/mocks/restoreitemaction/v2/RestoreItemAction.go index 18b4af19d..647e8b6dc 100644 --- a/pkg/plugin/velero/mocks/restoreitemaction/v2/RestoreItemAction.go +++ b/pkg/plugin/velero/mocks/restoreitemaction/v2/RestoreItemAction.go @@ -19,9 +19,9 @@ package v2 import ( mock "github.com/stretchr/testify/mock" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" - velero "github.com/velero-io/velero/pkg/plugin/velero" + velero "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // RestoreItemAction is an autogenerated mock type for the RestoreItemAction type diff --git a/pkg/plugin/velero/restore_item_action_shared.go b/pkg/plugin/velero/restore_item_action_shared.go index 27f3d0622..a8e285b0c 100644 --- a/pkg/plugin/velero/restore_item_action_shared.go +++ b/pkg/plugin/velero/restore_item_action_shared.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" - api "github.com/velero-io/velero/pkg/apis/velero/v1" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // RestoreItemActionExecuteInput contains the input parameters for the ItemAction's Execute function. diff --git a/pkg/plugin/velero/restoreitemaction/v1/restore_item_action.go b/pkg/plugin/velero/restoreitemaction/v1/restore_item_action.go index ec316e789..3398af9e1 100644 --- a/pkg/plugin/velero/restoreitemaction/v1/restore_item_action.go +++ b/pkg/plugin/velero/restoreitemaction/v1/restore_item_action.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // RestoreItemAction is an actor that performs an operation on an individual item being restored. diff --git a/pkg/plugin/velero/restoreitemaction/v2/restore_item_action.go b/pkg/plugin/velero/restoreitemaction/v2/restore_item_action.go index 8d66b6ef4..dfc35428f 100644 --- a/pkg/plugin/velero/restoreitemaction/v2/restore_item_action.go +++ b/pkg/plugin/velero/restoreitemaction/v2/restore_item_action.go @@ -21,8 +21,8 @@ import ( "github.com/pkg/errors" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/velero" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // RestoreItemAction is an actor that performs an operation on an individual item being restored. diff --git a/pkg/podexec/pod_command_executor.go b/pkg/podexec/pod_command_executor.go index 94cda5ac3..0dbc28e95 100644 --- a/pkg/podexec/pod_command_executor.go +++ b/pkg/podexec/pod_command_executor.go @@ -31,7 +31,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/remotecommand" - api "github.com/velero-io/velero/pkg/apis/velero/v1" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) const defaultTimeout = 30 * time.Second diff --git a/pkg/podexec/pod_command_executor_test.go b/pkg/podexec/pod_command_executor_test.go index 34878df70..3286ba42d 100644 --- a/pkg/podexec/pod_command_executor_test.go +++ b/pkg/podexec/pod_command_executor_test.go @@ -37,8 +37,8 @@ import ( "k8s.io/client-go/tools/remotecommand" "k8s.io/utils/ptr" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - velerotest "github.com/velero-io/velero/pkg/test" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestNewPodCommandExecutor(t *testing.T) { diff --git a/pkg/podvolume/backup_micro_service.go b/pkg/podvolume/backup_micro_service.go index e4c80c6e2..d393b2bcb 100644 --- a/pkg/podvolume/backup_micro_service.go +++ b/pkg/podvolume/backup_micro_service.go @@ -31,12 +31,12 @@ import ( cachetool "k8s.io/client-go/tools/cache" "sigs.k8s.io/controller-runtime/pkg/cache" - "github.com/velero-io/velero/internal/credentials" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/repository" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/internal/credentials" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/repository" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/kube" apierrors "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/pkg/podvolume/backup_micro_service_test.go b/pkg/podvolume/backup_micro_service_test.go index 2461b055d..bec46f353 100644 --- a/pkg/podvolume/backup_micro_service_test.go +++ b/pkg/podvolume/backup_micro_service_test.go @@ -30,19 +30,19 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/uploader" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" clientFake "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerotest "github.com/velero-io/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - datapathmockes "github.com/velero-io/velero/pkg/datapath/mocks" + datapathmockes "github.com/vmware-tanzu/velero/pkg/datapath/mocks" ) type backupMsTestHelper struct { diff --git a/pkg/podvolume/backupper.go b/pkg/podvolume/backupper.go index b680b79fc..6b534d5ed 100644 --- a/pkg/podvolume/backupper.go +++ b/pkg/podvolume/backupper.go @@ -30,17 +30,17 @@ import ( ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/resourcepolicies" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - veleroclient "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/nodeagent" - "github.com/velero-io/velero/pkg/podvolume/configs" - "github.com/velero-io/velero/pkg/repository" - "github.com/velero-io/velero/pkg/uploader" - uploaderutil "github.com/velero-io/velero/pkg/uploader/util" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/internal/resourcepolicies" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + veleroclient "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/nodeagent" + "github.com/vmware-tanzu/velero/pkg/podvolume/configs" + "github.com/vmware-tanzu/velero/pkg/repository" + "github.com/vmware-tanzu/velero/pkg/uploader" + uploaderutil "github.com/vmware-tanzu/velero/pkg/uploader/util" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) const ( @@ -371,7 +371,7 @@ func (b *backupper) BackupPodVolumes(backup *velerov1api.Backup, pod *corev1api. continue } // similar with above: the PVB may be handled very quickly by the controller and the informer handler will call "b.wg.Done()" before "b.wg.Add(1)" runs which causes panic - // see https://github.com/velero-io/velero/issues/8657 + // see https://github.com/vmware-tanzu/velero/issues/8657 b.wg.Add(1) if err := veleroclient.CreateRetryGenerateName(b.crClient, b.ctx, volumeBackup); err != nil { b.wg.Done() @@ -397,7 +397,7 @@ func (b *backupper) WaitAllPodVolumesProcessed(log logrus.FieldLogger) []*velero var podVolumeBackups []*velerov1api.PodVolumeBackup // if no pod volume backups are tracked, return directly to avoid issue mentioned in - // https://github.com/velero-io/velero/issues/8723 + // https://github.com/vmware-tanzu/velero/issues/8723 if len(b.pvbIndexer.List()) == 0 { return podVolumeBackups } diff --git a/pkg/podvolume/backupper_factory.go b/pkg/podvolume/backupper_factory.go index 64bdbeb60..f75f1d30b 100644 --- a/pkg/podvolume/backupper_factory.go +++ b/pkg/podvolume/backupper_factory.go @@ -25,8 +25,8 @@ import ( ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/repository" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/repository" ) // BackupperFactory can construct pod volumes backuppers. diff --git a/pkg/podvolume/backupper_test.go b/pkg/podvolume/backupper_test.go index 45a32225a..e6042ede1 100644 --- a/pkg/podvolume/backupper_test.go +++ b/pkg/podvolume/backupper_test.go @@ -36,11 +36,11 @@ import ( clientTesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" - "github.com/velero-io/velero/internal/resourcepolicies" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/repository" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/internal/resourcepolicies" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/repository" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) type fakeInformerRegistration struct{} diff --git a/pkg/podvolume/mocks/restorer.go b/pkg/podvolume/mocks/restorer.go index eb0fd9f2e..56de97f44 100644 --- a/pkg/podvolume/mocks/restorer.go +++ b/pkg/podvolume/mocks/restorer.go @@ -4,9 +4,9 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - podvolume "github.com/velero-io/velero/pkg/podvolume" + podvolume "github.com/vmware-tanzu/velero/pkg/podvolume" - volume "github.com/velero-io/velero/internal/volume" + volume "github.com/vmware-tanzu/velero/internal/volume" ) // Restorer is an autogenerated mock type for the Restorer type diff --git a/pkg/podvolume/restore_micro_service.go b/pkg/podvolume/restore_micro_service.go index 49fcc81c4..77e84eb04 100644 --- a/pkg/podvolume/restore_micro_service.go +++ b/pkg/podvolume/restore_micro_service.go @@ -32,12 +32,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/credentials" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/repository" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/internal/credentials" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/repository" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/kube" cachetool "k8s.io/client-go/tools/cache" ) diff --git a/pkg/podvolume/restore_micro_service_test.go b/pkg/podvolume/restore_micro_service_test.go index 72a1001df..1d25e342f 100644 --- a/pkg/podvolume/restore_micro_service_test.go +++ b/pkg/podvolume/restore_micro_service_test.go @@ -31,19 +31,19 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/datapath" - "github.com/velero-io/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/datapath" + "github.com/vmware-tanzu/velero/pkg/uploader" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" clientFake "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerotest "github.com/velero-io/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - datapathmockes "github.com/velero-io/velero/pkg/datapath/mocks" + datapathmockes "github.com/vmware-tanzu/velero/pkg/datapath/mocks" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/podvolume/restorer.go b/pkg/podvolume/restorer.go index 89b054dc8..ce662d5de 100644 --- a/pkg/podvolume/restorer.go +++ b/pkg/podvolume/restorer.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/velero-io/velero/internal/volume" + "github.com/vmware-tanzu/velero/internal/volume" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -33,14 +33,14 @@ import ( ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - veleroclient "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/nodeagent" - "github.com/velero-io/velero/pkg/repository" - uploaderutil "github.com/velero-io/velero/pkg/uploader/util" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + veleroclient "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/nodeagent" + "github.com/vmware-tanzu/velero/pkg/repository" + uploaderutil "github.com/vmware-tanzu/velero/pkg/uploader/util" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) type RestoreData struct { diff --git a/pkg/podvolume/restorer_factory.go b/pkg/podvolume/restorer_factory.go index 963230900..178d720c8 100644 --- a/pkg/podvolume/restorer_factory.go +++ b/pkg/podvolume/restorer_factory.go @@ -26,8 +26,8 @@ import ( ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/repository" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/repository" ) // RestorerFactory can construct pod volumes restorers. diff --git a/pkg/podvolume/restorer_test.go b/pkg/podvolume/restorer_test.go index 687152ae7..bd67e8480 100644 --- a/pkg/podvolume/restorer_test.go +++ b/pkg/podvolume/restorer_test.go @@ -33,11 +33,11 @@ import ( kubefake "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/cache" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/repository" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/repository" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestGetVolumesRepositoryType(t *testing.T) { diff --git a/pkg/podvolume/snaphost_tracker_test.go b/pkg/podvolume/snaphost_tracker_test.go index 973d1503b..0f89eb903 100644 --- a/pkg/podvolume/snaphost_tracker_test.go +++ b/pkg/podvolume/snaphost_tracker_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/velero-io/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/builder" ) func TestOptoutVolume(t *testing.T) { diff --git a/pkg/podvolume/util.go b/pkg/podvolume/util.go index 0f1fd5ad7..bb827c732 100644 --- a/pkg/podvolume/util.go +++ b/pkg/podvolume/util.go @@ -23,10 +23,10 @@ import ( corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/podvolume/configs" - repotypes "github.com/velero-io/velero/pkg/repository/types" - "github.com/velero-io/velero/pkg/uploader" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/podvolume/configs" + repotypes "github.com/vmware-tanzu/velero/pkg/repository/types" + "github.com/vmware-tanzu/velero/pkg/uploader" ) const ( @@ -87,8 +87,8 @@ func getVolumeBackupInfoForPod(podVolumeBackups []*velerov1api.PodVolumeBackup, } // If the volume came from a projected or DownwardAPI source, skip its restore. - // This allows backups affected by https://github.com/velero-io/velero/issues/3863 - // or https://github.com/velero-io/velero/issues/4053 to be restored successfully. + // This allows backups affected by https://github.com/vmware-tanzu/velero/issues/3863 + // or https://github.com/vmware-tanzu/velero/issues/4053 to be restored successfully. if volumeHasNonRestorableSource(pvb.Spec.Volume, pod.Spec.Volumes) { continue } diff --git a/pkg/podvolume/util_test.go b/pkg/podvolume/util_test.go index 6fd86bee6..bfd33e55e 100644 --- a/pkg/podvolume/util_test.go +++ b/pkg/podvolume/util_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" corev1api "k8s.io/api/core/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" ) func TestGetVolumeBackupsForPod(t *testing.T) { diff --git a/pkg/repository/backup_repo_op.go b/pkg/repository/backup_repo_op.go index 011abffd0..36356e7af 100644 --- a/pkg/repository/backup_repo_op.go +++ b/pkg/repository/backup_repo_op.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/labels" "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/label" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/label" ) // A BackupRepositoryKey uniquely identify a backup repository diff --git a/pkg/repository/backup_repo_op_test.go b/pkg/repository/backup_repo_op_test.go index b50e26e4e..de53cfbe7 100644 --- a/pkg/repository/backup_repo_op_test.go +++ b/pkg/repository/backup_repo_op_test.go @@ -29,9 +29,9 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" - velerotest "github.com/velero-io/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func buildBackupRepo(key BackupRepositoryKey, phase velerov1api.BackupRepositoryPhase, seqNum string) velerov1api.BackupRepository { diff --git a/pkg/repository/config/azure.go b/pkg/repository/config/azure.go index 044700f31..6662d13c6 100644 --- a/pkg/repository/config/azure.go +++ b/pkg/repository/config/azure.go @@ -19,7 +19,7 @@ package config import ( "github.com/pkg/errors" - "github.com/velero-io/velero/pkg/util/azure" + "github.com/vmware-tanzu/velero/pkg/util/azure" ) // GetAzureResticEnvVars gets the environment variables that restic diff --git a/pkg/repository/config/azure_test.go b/pkg/repository/config/azure_test.go index b76b22edb..605987d37 100644 --- a/pkg/repository/config/azure_test.go +++ b/pkg/repository/config/azure_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/util/azure" + "github.com/vmware-tanzu/velero/pkg/util/azure" ) func TestGetAzureResticEnvVars(t *testing.T) { diff --git a/pkg/repository/ensurer.go b/pkg/repository/ensurer.go index f399b2437..91cdb0d9e 100644 --- a/pkg/repository/ensurer.go +++ b/pkg/repository/ensurer.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/pkg/repository/ensurer_test.go b/pkg/repository/ensurer_test.go index 8b8b4b81d..b2d60eb21 100644 --- a/pkg/repository/ensurer_test.go +++ b/pkg/repository/ensurer_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestEnsureRepo(t *testing.T) { diff --git a/pkg/repository/keys/keys.go b/pkg/repository/keys/keys.go index eebd10613..21423afe0 100644 --- a/pkg/repository/keys/keys.go +++ b/pkg/repository/keys/keys.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" - "github.com/velero-io/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/builder" ) const ( diff --git a/pkg/repository/maintenance/maintenance.go b/pkg/repository/maintenance/maintenance.go index 9a6b118db..747d89f52 100644 --- a/pkg/repository/maintenance/maintenance.go +++ b/pkg/repository/maintenance/maintenance.go @@ -37,14 +37,14 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/constant" - velerolabel "github.com/velero-io/velero/pkg/label" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/util" - "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/pkg/util/logging" - veleroutil "github.com/velero-io/velero/pkg/util/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/constant" + velerolabel "github.com/vmware-tanzu/velero/pkg/label" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/util" + "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/logging" + veleroutil "github.com/vmware-tanzu/velero/pkg/util/velero" ) const ( diff --git a/pkg/repository/maintenance/maintenance_test.go b/pkg/repository/maintenance/maintenance_test.go index d501e241d..97eee1148 100644 --- a/pkg/repository/maintenance/maintenance_test.go +++ b/pkg/repository/maintenance/maintenance_test.go @@ -38,15 +38,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - velerolabel "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/repository/provider" - velerotest "github.com/velero-io/velero/pkg/test" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/pkg/util/logging" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + velerolabel "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/repository/provider" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/logging" ) func TestGenerateJobName(t *testing.T) { diff --git a/pkg/repository/manager/manager.go b/pkg/repository/manager/manager.go index d22288e85..4d03931c0 100644 --- a/pkg/repository/manager/manager.go +++ b/pkg/repository/manager/manager.go @@ -25,11 +25,11 @@ import ( "github.com/sirupsen/logrus" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/credentials" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/repository" - "github.com/velero-io/velero/pkg/repository/provider" - "github.com/velero-io/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/internal/credentials" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/repository" + "github.com/vmware-tanzu/velero/pkg/repository/provider" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) // Manager manages backup repositories. diff --git a/pkg/repository/manager/manager_test.go b/pkg/repository/manager/manager_test.go index b3312a636..88d8db481 100644 --- a/pkg/repository/manager/manager_test.go +++ b/pkg/repository/manager/manager_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) func TestGetRepositoryProvider(t *testing.T) { diff --git a/pkg/repository/mocks/Manager.go b/pkg/repository/mocks/Manager.go index 9ef8ea889..954967adc 100644 --- a/pkg/repository/mocks/Manager.go +++ b/pkg/repository/mocks/Manager.go @@ -9,7 +9,7 @@ import ( time "time" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // Manager is an autogenerated mock type for the Manager type diff --git a/pkg/repository/provider/provider.go b/pkg/repository/provider/provider.go index 301c45834..7681d830b 100644 --- a/pkg/repository/provider/provider.go +++ b/pkg/repository/provider/provider.go @@ -20,7 +20,7 @@ import ( "context" "time" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // RepoParam includes the parameters to manipulate a backup repository diff --git a/pkg/repository/provider/unified_repo.go b/pkg/repository/provider/unified_repo.go index 27e20cae7..2af59f190 100644 --- a/pkg/repository/provider/unified_repo.go +++ b/pkg/repository/provider/unified_repo.go @@ -30,12 +30,12 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/velero-io/velero/internal/credentials" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - repoconfig "github.com/velero-io/velero/pkg/repository/config" - repokey "github.com/velero-io/velero/pkg/repository/keys" - "github.com/velero-io/velero/pkg/repository/udmrepo" - reposervice "github.com/velero-io/velero/pkg/repository/udmrepo/service" + "github.com/vmware-tanzu/velero/internal/credentials" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + repoconfig "github.com/vmware-tanzu/velero/pkg/repository/config" + repokey "github.com/vmware-tanzu/velero/pkg/repository/keys" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + reposervice "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/service" ) type unifiedRepoProvider struct { diff --git a/pkg/repository/provider/unified_repo_test.go b/pkg/repository/provider/unified_repo_test.go index d8f5b1975..e0e0a8b8f 100644 --- a/pkg/repository/provider/unified_repo_test.go +++ b/pkg/repository/provider/unified_repo_test.go @@ -30,12 +30,12 @@ import ( corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerocredentials "github.com/velero-io/velero/internal/credentials" - credmock "github.com/velero-io/velero/internal/credentials/mocks" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/repository/udmrepo" - reposervicenmocks "github.com/velero-io/velero/pkg/repository/udmrepo/mocks" - velerotest "github.com/velero-io/velero/pkg/test" + velerocredentials "github.com/vmware-tanzu/velero/internal/credentials" + credmock "github.com/vmware-tanzu/velero/internal/credentials/mocks" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + reposervicenmocks "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/mocks" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestGetStorageCredentials(t *testing.T) { diff --git a/pkg/repository/udmrepo/kopialib/backend/azure.go b/pkg/repository/udmrepo/kopialib/backend/azure.go index 55bb79e43..79bf1bbc2 100644 --- a/pkg/repository/udmrepo/kopialib/backend/azure.go +++ b/pkg/repository/udmrepo/kopialib/backend/azure.go @@ -23,9 +23,9 @@ import ( "github.com/kopia/kopia/repo/blob" - "github.com/velero-io/velero/pkg/repository/udmrepo" - "github.com/velero-io/velero/pkg/repository/udmrepo/kopialib/backend/azure" - "github.com/velero-io/velero/pkg/repository/udmrepo/kopialib/backend/logging" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib/backend/azure" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib/backend/logging" ) type AzureBackend struct { diff --git a/pkg/repository/udmrepo/kopialib/backend/azure/azure_storage_wrapper.go b/pkg/repository/udmrepo/kopialib/backend/azure/azure_storage_wrapper.go index 541b7c82d..5e2443a42 100644 --- a/pkg/repository/udmrepo/kopialib/backend/azure/azure_storage_wrapper.go +++ b/pkg/repository/udmrepo/kopialib/backend/azure/azure_storage_wrapper.go @@ -23,9 +23,9 @@ import ( "github.com/kopia/kopia/repo/blob/azure" "github.com/kopia/kopia/repo/blob/throttling" - "github.com/velero-io/velero/pkg/repository/udmrepo" - "github.com/velero-io/velero/pkg/repository/udmrepo/kopialib/backend/logging" - azureutil "github.com/velero-io/velero/pkg/util/azure" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib/backend/logging" + azureutil "github.com/vmware-tanzu/velero/pkg/util/azure" ) const ( diff --git a/pkg/repository/udmrepo/kopialib/backend/azure_test.go b/pkg/repository/udmrepo/kopialib/backend/azure_test.go index e10517997..b4504986e 100644 --- a/pkg/repository/udmrepo/kopialib/backend/azure_test.go +++ b/pkg/repository/udmrepo/kopialib/backend/azure_test.go @@ -19,13 +19,13 @@ package backend import ( "testing" - velerotest "github.com/velero-io/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" "github.com/kopia/kopia/repo/blob/throttling" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" ) func TestAzureSetup(t *testing.T) { diff --git a/pkg/repository/udmrepo/kopialib/backend/common.go b/pkg/repository/udmrepo/kopialib/backend/common.go index 900857946..7af061204 100644 --- a/pkg/repository/udmrepo/kopialib/backend/common.go +++ b/pkg/repository/udmrepo/kopialib/backend/common.go @@ -29,7 +29,7 @@ import ( "github.com/kopia/kopia/repo/hashing" "github.com/kopia/kopia/repo/splitter" - "github.com/velero-io/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" ) const ( diff --git a/pkg/repository/udmrepo/kopialib/backend/common_test.go b/pkg/repository/udmrepo/kopialib/backend/common_test.go index 2f9773e73..1083bca9a 100644 --- a/pkg/repository/udmrepo/kopialib/backend/common_test.go +++ b/pkg/repository/udmrepo/kopialib/backend/common_test.go @@ -28,7 +28,7 @@ import ( "github.com/kopia/kopia/repo/splitter" "github.com/stretchr/testify/assert" - "github.com/velero-io/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" ) func TestSetupNewRepositoryOptions(t *testing.T) { diff --git a/pkg/repository/udmrepo/kopialib/backend/file_system.go b/pkg/repository/udmrepo/kopialib/backend/file_system.go index 9680fa8bd..f0999e832 100644 --- a/pkg/repository/udmrepo/kopialib/backend/file_system.go +++ b/pkg/repository/udmrepo/kopialib/backend/file_system.go @@ -27,8 +27,8 @@ import ( "github.com/kopia/kopia/repo/blob/filesystem" "github.com/pkg/errors" - "github.com/velero-io/velero/pkg/repository/udmrepo" - "github.com/velero-io/velero/pkg/repository/udmrepo/kopialib/backend/logging" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib/backend/logging" ) type FsBackend struct { diff --git a/pkg/repository/udmrepo/kopialib/backend/file_system_test.go b/pkg/repository/udmrepo/kopialib/backend/file_system_test.go index 92fca43ae..33e608efd 100644 --- a/pkg/repository/udmrepo/kopialib/backend/file_system_test.go +++ b/pkg/repository/udmrepo/kopialib/backend/file_system_test.go @@ -19,13 +19,13 @@ package backend import ( "testing" - velerotest "github.com/velero-io/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" "github.com/kopia/kopia/repo/blob/filesystem" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" ) func TestFSSetup(t *testing.T) { diff --git a/pkg/repository/udmrepo/kopialib/backend/gcs.go b/pkg/repository/udmrepo/kopialib/backend/gcs.go index 6a10b6010..2c46609a4 100644 --- a/pkg/repository/udmrepo/kopialib/backend/gcs.go +++ b/pkg/repository/udmrepo/kopialib/backend/gcs.go @@ -24,8 +24,8 @@ import ( "github.com/kopia/kopia/repo/blob" "github.com/kopia/kopia/repo/blob/gcs" - "github.com/velero-io/velero/pkg/repository/udmrepo" - "github.com/velero-io/velero/pkg/repository/udmrepo/kopialib/backend/logging" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib/backend/logging" ) type GCSBackend struct { diff --git a/pkg/repository/udmrepo/kopialib/backend/gcs_test.go b/pkg/repository/udmrepo/kopialib/backend/gcs_test.go index a782e0375..3398c35c2 100644 --- a/pkg/repository/udmrepo/kopialib/backend/gcs_test.go +++ b/pkg/repository/udmrepo/kopialib/backend/gcs_test.go @@ -19,13 +19,13 @@ package backend import ( "testing" - velerotest "github.com/velero-io/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" "github.com/kopia/kopia/repo/blob/gcs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" ) func TestGcsSetup(t *testing.T) { diff --git a/pkg/repository/udmrepo/kopialib/backend/s3.go b/pkg/repository/udmrepo/kopialib/backend/s3.go index 25e27dddc..202c3c449 100644 --- a/pkg/repository/udmrepo/kopialib/backend/s3.go +++ b/pkg/repository/udmrepo/kopialib/backend/s3.go @@ -24,8 +24,8 @@ import ( "github.com/kopia/kopia/repo/blob" "github.com/kopia/kopia/repo/blob/s3" - "github.com/velero-io/velero/pkg/repository/udmrepo" - "github.com/velero-io/velero/pkg/repository/udmrepo/kopialib/backend/logging" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib/backend/logging" ) type S3Backend struct { diff --git a/pkg/repository/udmrepo/kopialib/backend/s3_test.go b/pkg/repository/udmrepo/kopialib/backend/s3_test.go index 58a2d4d6d..3e1b045c4 100644 --- a/pkg/repository/udmrepo/kopialib/backend/s3_test.go +++ b/pkg/repository/udmrepo/kopialib/backend/s3_test.go @@ -19,12 +19,12 @@ package backend import ( "testing" - velerotest "github.com/velero-io/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" "github.com/kopia/kopia/repo/blob/s3" "github.com/stretchr/testify/assert" - "github.com/velero-io/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" ) func TestS3Setup(t *testing.T) { diff --git a/pkg/repository/udmrepo/kopialib/backend/utils_test.go b/pkg/repository/udmrepo/kopialib/backend/utils_test.go index 4e57bafd0..24923e447 100644 --- a/pkg/repository/udmrepo/kopialib/backend/utils_test.go +++ b/pkg/repository/udmrepo/kopialib/backend/utils_test.go @@ -25,7 +25,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - storagemocks "github.com/velero-io/velero/pkg/repository/udmrepo/kopialib/backend/mocks" + storagemocks "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib/backend/mocks" ) func TestOptionalHaveBool(t *testing.T) { diff --git a/pkg/repository/udmrepo/kopialib/lib_repo.go b/pkg/repository/udmrepo/kopialib/lib_repo.go index fc1e50d63..2131baa5c 100644 --- a/pkg/repository/udmrepo/kopialib/lib_repo.go +++ b/pkg/repository/udmrepo/kopialib/lib_repo.go @@ -38,9 +38,9 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/velero-io/velero/pkg/kopia" - "github.com/velero-io/velero/pkg/repository/udmrepo" - "github.com/velero-io/velero/pkg/repository/udmrepo/kopialib/backend" + "github.com/vmware-tanzu/velero/pkg/kopia" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib/backend" ) type kopiaRepoService struct { diff --git a/pkg/repository/udmrepo/kopialib/lib_repo_test.go b/pkg/repository/udmrepo/kopialib/lib_repo_test.go index c3c778f66..1776f9be0 100644 --- a/pkg/repository/udmrepo/kopialib/lib_repo_test.go +++ b/pkg/repository/udmrepo/kopialib/lib_repo_test.go @@ -36,10 +36,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/repository/udmrepo" - repomocks "github.com/velero-io/velero/pkg/repository/udmrepo/kopialib/backend/mocks" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + repomocks "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib/backend/mocks" - velerotest "github.com/velero-io/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestOpen(t *testing.T) { diff --git a/pkg/repository/udmrepo/kopialib/repo_init.go b/pkg/repository/udmrepo/kopialib/repo_init.go index da6fe022d..ade9039d7 100644 --- a/pkg/repository/udmrepo/kopialib/repo_init.go +++ b/pkg/repository/udmrepo/kopialib/repo_init.go @@ -32,9 +32,9 @@ import ( "github.com/kopia/kopia/repo/maintenance" "github.com/pkg/errors" - "github.com/velero-io/velero/pkg/kopia" - "github.com/velero-io/velero/pkg/repository/udmrepo" - "github.com/velero-io/velero/pkg/repository/udmrepo/kopialib/backend" + "github.com/vmware-tanzu/velero/pkg/kopia" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib/backend" ) type kopiaBackendStore struct { diff --git a/pkg/repository/udmrepo/kopialib/repo_init_test.go b/pkg/repository/udmrepo/kopialib/repo_init_test.go index a71089d75..3b8a52be2 100644 --- a/pkg/repository/udmrepo/kopialib/repo_init_test.go +++ b/pkg/repository/udmrepo/kopialib/repo_init_test.go @@ -27,16 +27,16 @@ import ( "github.com/kopia/kopia/repo/maintenance" "github.com/kopia/kopia/repo/manifest" - velerotest "github.com/velero-io/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/repository/udmrepo" - "github.com/velero-io/velero/pkg/repository/udmrepo/kopialib/backend" - repomocks "github.com/velero-io/velero/pkg/repository/udmrepo/kopialib/backend/mocks" - storagemocks "github.com/velero-io/velero/pkg/repository/udmrepo/kopialib/backend/mocks" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib/backend" + repomocks "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib/backend/mocks" + storagemocks "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib/backend/mocks" "github.com/pkg/errors" ) diff --git a/pkg/repository/udmrepo/mocks/BackupRepo.go b/pkg/repository/udmrepo/mocks/BackupRepo.go index 6ca2648bc..623c4d70d 100644 --- a/pkg/repository/udmrepo/mocks/BackupRepo.go +++ b/pkg/repository/udmrepo/mocks/BackupRepo.go @@ -9,7 +9,7 @@ import ( "time" mock "github.com/stretchr/testify/mock" - "github.com/velero-io/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" ) // NewBackupRepo creates a new instance of BackupRepo. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. diff --git a/pkg/repository/udmrepo/mocks/BackupRepoService.go b/pkg/repository/udmrepo/mocks/BackupRepoService.go index b5be1d866..34a24ef97 100644 --- a/pkg/repository/udmrepo/mocks/BackupRepoService.go +++ b/pkg/repository/udmrepo/mocks/BackupRepoService.go @@ -9,7 +9,7 @@ import ( "time" mock "github.com/stretchr/testify/mock" - "github.com/velero-io/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" ) // NewBackupRepoService creates a new instance of BackupRepoService. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. diff --git a/pkg/repository/udmrepo/mocks/ObjectWriter.go b/pkg/repository/udmrepo/mocks/ObjectWriter.go index 26d38eba0..d50a3ce76 100644 --- a/pkg/repository/udmrepo/mocks/ObjectWriter.go +++ b/pkg/repository/udmrepo/mocks/ObjectWriter.go @@ -6,7 +6,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - "github.com/velero-io/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" ) // NewObjectWriter creates a new instance of ObjectWriter. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. diff --git a/pkg/repository/udmrepo/service/service.go b/pkg/repository/udmrepo/service/service.go index 1f76c7c38..195b67b11 100644 --- a/pkg/repository/udmrepo/service/service.go +++ b/pkg/repository/udmrepo/service/service.go @@ -19,8 +19,8 @@ package service import ( "github.com/sirupsen/logrus" - "github.com/velero-io/velero/pkg/repository/udmrepo" - "github.com/velero-io/velero/pkg/repository/udmrepo/kopialib" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib" ) // Create creates an instance of BackupRepoService diff --git a/pkg/restic/common.go b/pkg/restic/common.go index 572c0f7ad..a5bf05c44 100644 --- a/pkg/restic/common.go +++ b/pkg/restic/common.go @@ -26,10 +26,10 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/velero-io/velero/internal/credentials" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - repoconfig "github.com/velero-io/velero/pkg/repository/config" - "github.com/velero-io/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/internal/credentials" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + repoconfig "github.com/vmware-tanzu/velero/pkg/repository/config" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) const ( diff --git a/pkg/restic/common_test.go b/pkg/restic/common_test.go index 590152fa9..97363340c 100644 --- a/pkg/restic/common_test.go +++ b/pkg/restic/common_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestTempCACertFile(t *testing.T) { diff --git a/pkg/restic/exec_commands.go b/pkg/restic/exec_commands.go index ed5e2274d..94c17c04a 100644 --- a/pkg/restic/exec_commands.go +++ b/pkg/restic/exec_commands.go @@ -26,9 +26,9 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/exec" - "github.com/velero-io/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/exec" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) const restoreProgressCheckInterval = 10 * time.Second diff --git a/pkg/restic/exec_commands_test.go b/pkg/restic/exec_commands_test.go index 5994c948c..370f6653c 100644 --- a/pkg/restic/exec_commands_test.go +++ b/pkg/restic/exec_commands_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) func Test_getSummaryLine(t *testing.T) { diff --git a/pkg/restore/actions/add_pvc_from_pod_action.go b/pkg/restore/actions/add_pvc_from_pod_action.go index 3ae6ee804..3e88f796a 100644 --- a/pkg/restore/actions/add_pvc_from_pod_action.go +++ b/pkg/restore/actions/add_pvc_from_pod_action.go @@ -22,8 +22,8 @@ import ( corev1api "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) type AddPVCFromPodAction struct { diff --git a/pkg/restore/actions/add_pvc_from_pod_action_test.go b/pkg/restore/actions/add_pvc_from_pod_action_test.go index b94c82e70..5d27e1582 100644 --- a/pkg/restore/actions/add_pvc_from_pod_action_test.go +++ b/pkg/restore/actions/add_pvc_from_pod_action_test.go @@ -26,9 +26,9 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestAddPVCFromPodActionExecute(t *testing.T) { diff --git a/pkg/restore/actions/admissionwebhook_config_action.go b/pkg/restore/actions/admissionwebhook_config_action.go index e2bd07257..82599dc62 100644 --- a/pkg/restore/actions/admissionwebhook_config_action.go +++ b/pkg/restore/actions/admissionwebhook_config_action.go @@ -22,12 +22,12 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // AdmissionWebhookConfigurationAction is a RestoreItemAction plugin applicable to mutatingwebhookconfiguration and // validatingwebhookconfiguration to reset the invalid value for "sideEffects" of the webhooks. -// More background please refer to https://github.com/velero-io/velero/issues/3516 +// More background please refer to https://github.com/vmware-tanzu/velero/issues/3516 type AdmissionWebhookConfigurationAction struct { logger logrus.FieldLogger } diff --git a/pkg/restore/actions/admissionwebhook_config_action_test.go b/pkg/restore/actions/admissionwebhook_config_action_test.go index f83e9b8b6..f1257cb9f 100644 --- a/pkg/restore/actions/admissionwebhook_config_action_test.go +++ b/pkg/restore/actions/admissionwebhook_config_action_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestNewAdmissionWebhookConfigurationActionExecute(t *testing.T) { diff --git a/pkg/restore/actions/apiservice_action.go b/pkg/restore/actions/apiservice_action.go index 69b94e8e1..f2433352b 100644 --- a/pkg/restore/actions/apiservice_action.go +++ b/pkg/restore/actions/apiservice_action.go @@ -20,7 +20,7 @@ import ( "github.com/sirupsen/logrus" "k8s.io/kube-aggregator/pkg/controllers/autoregister" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) type APIServiceAction struct { diff --git a/pkg/restore/actions/apiservice_action_test.go b/pkg/restore/actions/apiservice_action_test.go index ef52733b0..9058259c1 100644 --- a/pkg/restore/actions/apiservice_action_test.go +++ b/pkg/restore/actions/apiservice_action_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestAPIServiceActionExecuteSkipsRestore(t *testing.T) { diff --git a/pkg/restore/actions/change_image_name_action.go b/pkg/restore/actions/change_image_name_action.go index 356675c04..828da40d6 100644 --- a/pkg/restore/actions/change_image_name_action.go +++ b/pkg/restore/actions/change_image_name_action.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) const ( diff --git a/pkg/restore/actions/change_image_name_action_test.go b/pkg/restore/actions/change_image_name_action_test.go index d29c1d9c9..530c8453d 100644 --- a/pkg/restore/actions/change_image_name_action_test.go +++ b/pkg/restore/actions/change_image_name_action_test.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // TestChangeImageRepositoryActionExecute runs the ChangeImageNameAction's Execute diff --git a/pkg/restore/actions/change_storageclass_action.go b/pkg/restore/actions/change_storageclass_action.go index bebb236b9..f9f031fe3 100644 --- a/pkg/restore/actions/change_storageclass_action.go +++ b/pkg/restore/actions/change_storageclass_action.go @@ -29,8 +29,8 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" storagev1client "k8s.io/client-go/kubernetes/typed/storage/v1" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // ChangeStorageClassAction updates a PV or PVC's storage class name diff --git a/pkg/restore/actions/change_storageclass_action_test.go b/pkg/restore/actions/change_storageclass_action_test.go index 6e89f8baf..13bbcdcc4 100644 --- a/pkg/restore/actions/change_storageclass_action_test.go +++ b/pkg/restore/actions/change_storageclass_action_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // TestChangeStorageClassActionExecute runs the ChangeStorageClassAction's Execute diff --git a/pkg/restore/actions/clusterrolebinding_action.go b/pkg/restore/actions/clusterrolebinding_action.go index 28534ed6f..a11665c1a 100644 --- a/pkg/restore/actions/clusterrolebinding_action.go +++ b/pkg/restore/actions/clusterrolebinding_action.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // ClusterRoleBindingAction handle namespace remappings for role bindings diff --git a/pkg/restore/actions/clusterrolebinding_action_test.go b/pkg/restore/actions/clusterrolebinding_action_test.go index 8ada6dc93..0829221db 100644 --- a/pkg/restore/actions/clusterrolebinding_action_test.go +++ b/pkg/restore/actions/clusterrolebinding_action_test.go @@ -26,9 +26,9 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/test" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/test" ) func TestClusterRoleBindingActionAppliesTo(t *testing.T) { diff --git a/pkg/restore/actions/crd_v1_preserve_unknown_fields_action.go b/pkg/restore/actions/crd_v1_preserve_unknown_fields_action.go index 8a77af5c5..9e4cf7e2f 100644 --- a/pkg/restore/actions/crd_v1_preserve_unknown_fields_action.go +++ b/pkg/restore/actions/crd_v1_preserve_unknown_fields_action.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // CRDV1PreserveUnknownFieldsAction will take a CRD and inspect it for the API version and the PreserveUnknownFields value. diff --git a/pkg/restore/actions/crd_v1_preserve_unknown_fields_action_test.go b/pkg/restore/actions/crd_v1_preserve_unknown_fields_action_test.go index 2c136059d..329cfb433 100644 --- a/pkg/restore/actions/crd_v1_preserve_unknown_fields_action_test.go +++ b/pkg/restore/actions/crd_v1_preserve_unknown_fields_action_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/test" ) func TestExecuteForACRDWithAnIntOnAFloat64FieldShouldWork(t *testing.T) { - // ref. reopen of https://github.com/velero-io/velero/issues/2319 + // ref. reopen of https://github.com/vmware-tanzu/velero/issues/2319 b := builder.ForV1CustomResourceDefinition("test.velero.io") // 5 here is just an int value, it could be any other whole number. diff --git a/pkg/restore/actions/csi/pvc_action.go b/pkg/restore/actions/csi/pvc_action.go index e89a2b0c3..dee23cf70 100644 --- a/pkg/restore/actions/csi/pvc_action.go +++ b/pkg/restore/actions/csi/pvc_action.go @@ -33,17 +33,17 @@ import ( utilrand "k8s.io/apimachinery/pkg/util/rand" crclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/client" - kuberesource "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/label" - plugincommon "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - riav2 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v2" - uploaderUtil "github.com/velero-io/velero/pkg/uploader/util" - "github.com/velero-io/velero/pkg/util" - "github.com/velero-io/velero/pkg/util/boolptr" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/client" + kuberesource "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/label" + plugincommon "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + riav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2" + uploaderUtil "github.com/vmware-tanzu/velero/pkg/uploader/util" + "github.com/vmware-tanzu/velero/pkg/util" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" ) const ( diff --git a/pkg/restore/actions/csi/pvc_action_test.go b/pkg/restore/actions/csi/pvc_action_test.go index ae858b6ff..4da3bec50 100644 --- a/pkg/restore/actions/csi/pvc_action_test.go +++ b/pkg/restore/actions/csi/pvc_action_test.go @@ -36,16 +36,16 @@ import ( "k8s.io/apimachinery/pkg/util/validation" crclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/apis/velero/shared" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util" - "github.com/velero-io/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/apis/velero/shared" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" ) func TestResetPVCSpec(t *testing.T) { diff --git a/pkg/restore/actions/csi/volumesnapshot_action.go b/pkg/restore/actions/csi/volumesnapshot_action.go index 38bed87a2..dec33d4ef 100644 --- a/pkg/restore/actions/csi/volumesnapshot_action.go +++ b/pkg/restore/actions/csi/volumesnapshot_action.go @@ -31,13 +31,13 @@ import ( "k8s.io/apimachinery/pkg/runtime" crclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/kuberesource" - plugincommon "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util" - "github.com/velero-io/velero/pkg/util/boolptr" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + plugincommon "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" ) // volumeSnapshotRestoreItemAction is a Velero restore item diff --git a/pkg/restore/actions/csi/volumesnapshot_action_test.go b/pkg/restore/actions/csi/volumesnapshot_action_test.go index b7f128255..de3e592c0 100644 --- a/pkg/restore/actions/csi/volumesnapshot_action_test.go +++ b/pkg/restore/actions/csi/volumesnapshot_action_test.go @@ -31,12 +31,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" crclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util" ) var ( diff --git a/pkg/restore/actions/csi/volumesnapshotclass_action.go b/pkg/restore/actions/csi/volumesnapshotclass_action.go index 911e97430..c906a04b2 100644 --- a/pkg/restore/actions/csi/volumesnapshotclass_action.go +++ b/pkg/restore/actions/csi/volumesnapshotclass_action.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/csi" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/csi" ) // volumeSnapshotClassRestoreItemAction is a Velero restore diff --git a/pkg/restore/actions/csi/volumesnapshotclass_action_test.go b/pkg/restore/actions/csi/volumesnapshotclass_action_test.go index 5ad757452..73d86a109 100644 --- a/pkg/restore/actions/csi/volumesnapshotclass_action_test.go +++ b/pkg/restore/actions/csi/volumesnapshotclass_action_test.go @@ -25,12 +25,12 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/kuberesource" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/kuberesource" - //"github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" + //"github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) func TestVSClassExecute(t *testing.T) { diff --git a/pkg/restore/actions/csi/volumesnapshotcontent_action.go b/pkg/restore/actions/csi/volumesnapshotcontent_action.go index d13adc994..00a25c86f 100644 --- a/pkg/restore/actions/csi/volumesnapshotcontent_action.go +++ b/pkg/restore/actions/csi/volumesnapshotcontent_action.go @@ -27,13 +27,13 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" crclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/client" - plugincommon "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/csi" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/client" + plugincommon "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/csi" ) // volumeSnapshotContentRestoreItemAction is a restore item action diff --git a/pkg/restore/actions/csi/volumesnapshotcontent_action_test.go b/pkg/restore/actions/csi/volumesnapshotcontent_action_test.go index 5b9b75b57..83b79bd5b 100644 --- a/pkg/restore/actions/csi/volumesnapshotcontent_action_test.go +++ b/pkg/restore/actions/csi/volumesnapshotcontent_action_test.go @@ -26,13 +26,13 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - factorymocks "github.com/velero-io/velero/pkg/client/mocks" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util" ) func TestVSCExecute(t *testing.T) { diff --git a/pkg/restore/actions/dataupload_retrieve_action.go b/pkg/restore/actions/dataupload_retrieve_action.go index e72fda8ba..a7efdc5f7 100644 --- a/pkg/restore/actions/dataupload_retrieve_action.go +++ b/pkg/restore/actions/dataupload_retrieve_action.go @@ -28,11 +28,11 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - veleroclient "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/plugin/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + veleroclient "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) type DataUploadRetrieveAction struct { diff --git a/pkg/restore/actions/dataupload_retrieve_action_test.go b/pkg/restore/actions/dataupload_retrieve_action_test.go index 572d3ff1c..64be241bf 100644 --- a/pkg/restore/actions/dataupload_retrieve_action_test.go +++ b/pkg/restore/actions/dataupload_retrieve_action_test.go @@ -27,12 +27,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestDataUploadRetrieveActionExectue(t *testing.T) { diff --git a/pkg/restore/actions/init_restorehook_pod_action.go b/pkg/restore/actions/init_restorehook_pod_action.go index c147860ee..7614ef085 100644 --- a/pkg/restore/actions/init_restorehook_pod_action.go +++ b/pkg/restore/actions/init_restorehook_pod_action.go @@ -21,9 +21,9 @@ import ( "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/velero-io/velero/internal/hook" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/internal/hook" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // InitRestoreHookPodAction is a RestoreItemAction plugin applicable to pods that runs diff --git a/pkg/restore/actions/init_restorehook_pod_action_test.go b/pkg/restore/actions/init_restorehook_pod_action_test.go index 66d307d3c..52da2011b 100644 --- a/pkg/restore/actions/init_restorehook_pod_action_test.go +++ b/pkg/restore/actions/init_restorehook_pod_action_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestInitContainerRestoreHookPodActionExecute(t *testing.T) { diff --git a/pkg/restore/actions/job_action.go b/pkg/restore/actions/job_action.go index d0a8cdde9..1eabc208c 100644 --- a/pkg/restore/actions/job_action.go +++ b/pkg/restore/actions/job_action.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) const ( diff --git a/pkg/restore/actions/job_action_test.go b/pkg/restore/actions/job_action_test.go index a78ecd8a6..e3578bb60 100644 --- a/pkg/restore/actions/job_action_test.go +++ b/pkg/restore/actions/job_action_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestJobActionExecute(t *testing.T) { diff --git a/pkg/restore/actions/pod_action.go b/pkg/restore/actions/pod_action.go index 3dfa33857..a9db3ed7e 100644 --- a/pkg/restore/actions/pod_action.go +++ b/pkg/restore/actions/pod_action.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) type PodAction struct { diff --git a/pkg/restore/actions/pod_action_test.go b/pkg/restore/actions/pod_action_test.go index 418346ff7..dae455a5b 100644 --- a/pkg/restore/actions/pod_action_test.go +++ b/pkg/restore/actions/pod_action_test.go @@ -26,9 +26,9 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestPodActionExecute(t *testing.T) { diff --git a/pkg/restore/actions/pod_volume_restore_action.go b/pkg/restore/actions/pod_volume_restore_action.go index 831ca390a..e26a53034 100644 --- a/pkg/restore/actions/pod_volume_restore_action.go +++ b/pkg/restore/actions/pod_volume_restore_action.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/velero-io/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -33,16 +33,16 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - veleroimage "github.com/velero-io/velero/internal/velero" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/plugin/framework/common" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/podvolume" - "github.com/velero-io/velero/pkg/restorehelper" - "github.com/velero-io/velero/pkg/util/kube" - veleroutil "github.com/velero-io/velero/pkg/util/velero" + veleroimage "github.com/vmware-tanzu/velero/internal/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/podvolume" + "github.com/vmware-tanzu/velero/pkg/restorehelper" + "github.com/vmware-tanzu/velero/pkg/util/kube" + veleroutil "github.com/vmware-tanzu/velero/pkg/util/velero" ) const ( diff --git a/pkg/restore/actions/pod_volume_restore_action_test.go b/pkg/restore/actions/pod_volume_restore_action_test.go index 8faa80f43..bc9662ab7 100644 --- a/pkg/restore/actions/pod_volume_restore_action_test.go +++ b/pkg/restore/actions/pod_volume_restore_action_test.go @@ -20,7 +20,7 @@ import ( "sort" "testing" - "github.com/velero-io/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" @@ -33,16 +33,16 @@ import ( "k8s.io/client-go/kubernetes/fake" crfake "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/buildinfo" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/kube" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/buildinfo" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/kube" "k8s.io/client-go/kubernetes/scheme" - "github.com/velero-io/velero/pkg/restorehelper" + "github.com/vmware-tanzu/velero/pkg/restorehelper" ) func TestGetImage(t *testing.T) { diff --git a/pkg/restore/actions/pvc_action.go b/pkg/restore/actions/pvc_action.go index 4ecfa9ead..a4a63374d 100644 --- a/pkg/restore/actions/pvc_action.go +++ b/pkg/restore/actions/pvc_action.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util" ) const ( diff --git a/pkg/restore/actions/pvc_action_test.go b/pkg/restore/actions/pvc_action_test.go index d143342c3..aa2ddeeef 100644 --- a/pkg/restore/actions/pvc_action_test.go +++ b/pkg/restore/actions/pvc_action_test.go @@ -28,10 +28,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) // TestPVCActionExecute runs the PVCAction's Execute diff --git a/pkg/restore/actions/rolebinding_action.go b/pkg/restore/actions/rolebinding_action.go index 92f712a48..05e463587 100644 --- a/pkg/restore/actions/rolebinding_action.go +++ b/pkg/restore/actions/rolebinding_action.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) // RoleBindingAction handle namespace remappings for role bindings diff --git a/pkg/restore/actions/rolebinding_action_test.go b/pkg/restore/actions/rolebinding_action_test.go index bf29cf0cd..f2867e8a5 100644 --- a/pkg/restore/actions/rolebinding_action_test.go +++ b/pkg/restore/actions/rolebinding_action_test.go @@ -26,9 +26,9 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/test" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/test" ) func TestRoleBindingActionAppliesTo(t *testing.T) { diff --git a/pkg/restore/actions/secret_action.go b/pkg/restore/actions/secret_action.go index e339018a9..2ec9fb4ff 100644 --- a/pkg/restore/actions/secret_action.go +++ b/pkg/restore/actions/secret_action.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) // SecretAction is a restore item action for secrets diff --git a/pkg/restore/actions/secret_action_test.go b/pkg/restore/actions/secret_action_test.go index 92c4349a2..575b7634e 100644 --- a/pkg/restore/actions/secret_action_test.go +++ b/pkg/restore/actions/secret_action_test.go @@ -28,8 +28,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/test" ) func TestSecretActionAppliesTo(t *testing.T) { diff --git a/pkg/restore/actions/service_account_action.go b/pkg/restore/actions/service_account_action.go index 52e3c3095..429c21949 100644 --- a/pkg/restore/actions/service_account_action.go +++ b/pkg/restore/actions/service_account_action.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) type ServiceAccountAction struct { diff --git a/pkg/restore/actions/service_account_action_test.go b/pkg/restore/actions/service_account_action_test.go index a6cc389f7..6a2f74ead 100644 --- a/pkg/restore/actions/service_account_action_test.go +++ b/pkg/restore/actions/service_account_action_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/test" ) func TestServiceAccountActionAppliesTo(t *testing.T) { diff --git a/pkg/restore/actions/service_action.go b/pkg/restore/actions/service_action.go index 9db2ae600..47147a31f 100644 --- a/pkg/restore/actions/service_action.go +++ b/pkg/restore/actions/service_action.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" - "github.com/velero-io/velero/pkg/plugin/velero" - "github.com/velero-io/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" ) const annotationLastAppliedConfig = "kubectl.kubernetes.io/last-applied-configuration" diff --git a/pkg/restore/actions/service_action_test.go b/pkg/restore/actions/service_action_test.go index a94675c3b..f9a01d5d4 100644 --- a/pkg/restore/actions/service_action_test.go +++ b/pkg/restore/actions/service_action_test.go @@ -27,10 +27,10 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/plugin/velero" - velerotest "github.com/velero-io/velero/pkg/test" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func svcJSON(ports ...corev1api.ServicePort) string { diff --git a/pkg/restore/merge_service_account_test.go b/pkg/restore/merge_service_account_test.go index 13e77bddd..4322ae003 100644 --- a/pkg/restore/merge_service_account_test.go +++ b/pkg/restore/merge_service_account_test.go @@ -25,7 +25,7 @@ import ( corev1api "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - velerotest "github.com/velero-io/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) var mergedServiceAccountsBenchmarkResult *unstructured.Unstructured diff --git a/pkg/restore/prioritize_group_version.go b/pkg/restore/prioritize_group_version.go index cd52d1cfc..5d7ab15d5 100644 --- a/pkg/restore/prioritize_group_version.go +++ b/pkg/restore/prioritize_group_version.go @@ -27,9 +27,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/version" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/archive" - "github.com/velero-io/velero/pkg/client" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/archive" + "github.com/vmware-tanzu/velero/pkg/client" ) // ChosenGroupVersion is the API Group version that was selected to restore diff --git a/pkg/restore/prioritize_group_version_test.go b/pkg/restore/prioritize_group_version_test.go index fa6300162..e87fb13ba 100644 --- a/pkg/restore/prioritize_group_version_test.go +++ b/pkg/restore/prioritize_group_version_test.go @@ -23,8 +23,8 @@ import ( corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/test" ) func TestK8sPrioritySort(t *testing.T) { diff --git a/pkg/restore/pv_restorer.go b/pkg/restore/pv_restorer.go index 6f4a7bcb7..53fbd0126 100644 --- a/pkg/restore/pv_restorer.go +++ b/pkg/restore/pv_restorer.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/credentials" - "github.com/velero-io/velero/internal/volume" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/internal/credentials" + "github.com/vmware-tanzu/velero/internal/volume" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" ) type PVRestorer interface { diff --git a/pkg/restore/pv_restorer_test.go b/pkg/restore/pv_restorer_test.go index b7a956fbb..09c6dd0ad 100644 --- a/pkg/restore/pv_restorer_test.go +++ b/pkg/restore/pv_restorer_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/velero-io/velero/internal/volume" - api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - providermocks "github.com/velero-io/velero/pkg/plugin/velero/mocks/volumesnapshotter/v1" - vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/internal/volume" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + providermocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks/volumesnapshotter/v1" + vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func defaultBackup() *builder.BackupBuilder { diff --git a/pkg/restore/request.go b/pkg/restore/request.go index e451f61c0..239d65df9 100644 --- a/pkg/restore/request.go +++ b/pkg/restore/request.go @@ -25,11 +25,11 @@ import ( "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/internal/resourcemodifiers" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/internal/resourcemodifiers" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) const ( diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go index 378633f20..5287eec21 100644 --- a/pkg/restore/restore.go +++ b/pkg/restore/restore.go @@ -52,33 +52,33 @@ import ( "k8s.io/client-go/util/retry" crclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/credentials" - "github.com/velero-io/velero/internal/hook" - "github.com/velero-io/velero/internal/resourcemodifiers" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/archive" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/features" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/plugin/framework" - "github.com/velero-io/velero/pkg/plugin/velero" - riav2 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v2" - vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1" - "github.com/velero-io/velero/pkg/podexec" - "github.com/velero-io/velero/pkg/podvolume" - "github.com/velero-io/velero/pkg/podvolume/configs" - "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/collections" - csiutil "github.com/velero-io/velero/pkg/util/csi" - "github.com/velero-io/velero/pkg/util/filesystem" - "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/pkg/util/results" - "github.com/velero-io/velero/pkg/util/wildcard" + "github.com/vmware-tanzu/velero/internal/credentials" + "github.com/vmware-tanzu/velero/internal/hook" + "github.com/vmware-tanzu/velero/internal/resourcemodifiers" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/archive" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + riav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2" + vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1" + "github.com/vmware-tanzu/velero/pkg/podexec" + "github.com/vmware-tanzu/velero/pkg/podvolume" + "github.com/vmware-tanzu/velero/pkg/podvolume/configs" + "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/collections" + csiutil "github.com/vmware-tanzu/velero/pkg/util/csi" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/results" + "github.com/vmware-tanzu/velero/pkg/util/wildcard" ) const ObjectStatusRestoreAnnotationKey = "velero.io/restore-status" @@ -1789,7 +1789,7 @@ func isAlreadyExistsError(ctx *restoreContext, obj *unstructured.Unstructured, e // 1. For NodePort service, the service has nodePort preservation while the same nodePort service already exists. - Get invalid value error // 2. For LoadBalancer service, the "healthCheckNodePort" already exists. - Get internal error // If this is the case, the function returns true to avoid reporting error. - // Refer to https://github.com/velero-io/velero/issues/2308 for more details + // Refer to https://github.com/vmware-tanzu/velero/issues/2308 for more details if obj.GetKind() != "Service" { return false, nil } diff --git a/pkg/restore/restore_test.go b/pkg/restore/restore_test.go index 9efd2eef1..95b283cbe 100644 --- a/pkg/restore/restore_test.go +++ b/pkg/restore/restore_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/collections" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/collections" snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" "github.com/pkg/errors" @@ -45,25 +45,25 @@ import ( "k8s.io/client-go/dynamic" kubetesting "k8s.io/client-go/testing" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/archive" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/client" - "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/features" - "github.com/velero-io/velero/pkg/itemoperation" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" - riav2 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v2" - vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1" - "github.com/velero-io/velero/pkg/podvolume" - uploadermocks "github.com/velero-io/velero/pkg/podvolume/mocks" - "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/util/kube" - kubeutil "github.com/velero-io/velero/pkg/util/kube" - . "github.com/velero-io/velero/pkg/util/results" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/archive" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/itemoperation" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" + riav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2" + vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1" + "github.com/vmware-tanzu/velero/pkg/podvolume" + uploadermocks "github.com/vmware-tanzu/velero/pkg/podvolume/mocks" + "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/util/kube" + kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" + . "github.com/vmware-tanzu/velero/pkg/util/results" ) func TestRestorePVWithVolumeInfo(t *testing.T) { diff --git a/pkg/restore/restore_wildcard_test.go b/pkg/restore/restore_wildcard_test.go index 257eec785..c38ad7dd9 100644 --- a/pkg/restore/restore_wildcard_test.go +++ b/pkg/restore/restore_wildcard_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/archive" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/archive" ) func TestExpandNamespaceWildcards(t *testing.T) { diff --git a/pkg/test/fake_controller_runtime_client.go b/pkg/test/fake_controller_runtime_client.go index 383c7d0b8..90ee95d11 100644 --- a/pkg/test/fake_controller_runtime_client.go +++ b/pkg/test/fake_controller_runtime_client.go @@ -31,8 +31,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" k8sfake "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" ) func NewFakeControllerRuntimeClientBuilder(t *testing.T) *k8sfake.ClientBuilder { diff --git a/pkg/test/fake_dynamic.go b/pkg/test/fake_dynamic.go index ee5021801..996e8cfd1 100644 --- a/pkg/test/fake_dynamic.go +++ b/pkg/test/fake_dynamic.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/dynamic/dynamicinformer" - "github.com/velero-io/velero/pkg/client" + "github.com/vmware-tanzu/velero/pkg/client" ) type FakeDynamicFactory struct { diff --git a/pkg/test/fake_file_system.go b/pkg/test/fake_file_system.go index 2beae0644..7a744647b 100644 --- a/pkg/test/fake_file_system.go +++ b/pkg/test/fake_file_system.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/afero" - "github.com/velero-io/velero/pkg/util/filesystem" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) type FakeFileSystem struct { diff --git a/pkg/test/mock_pod_command_executor.go b/pkg/test/mock_pod_command_executor.go index ff4019a77..b8ace0c6e 100644 --- a/pkg/test/mock_pod_command_executor.go +++ b/pkg/test/mock_pod_command_executor.go @@ -22,7 +22,7 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/mock" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) type MockPodCommandExecutor struct { diff --git a/pkg/test/tar_writer.go b/pkg/test/tar_writer.go index a51079655..20706766c 100644 --- a/pkg/test/tar_writer.go +++ b/pkg/test/tar_writer.go @@ -29,7 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/util/encode" + "github.com/vmware-tanzu/velero/pkg/util/encode" ) type TarWriter struct { diff --git a/pkg/types/node_agent.go b/pkg/types/node_agent.go index b7743bac2..f456bbf55 100644 --- a/pkg/types/node_agent.go +++ b/pkg/types/node_agent.go @@ -19,7 +19,7 @@ package types import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/velero-io/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/pkg/util/kube" ) type LoadConcurrency struct { diff --git a/pkg/types/repo_maintenance.go b/pkg/types/repo_maintenance.go index ae3b1d484..a5115ff92 100644 --- a/pkg/types/repo_maintenance.go +++ b/pkg/types/repo_maintenance.go @@ -16,7 +16,7 @@ limitations under the License. package types -import "github.com/velero-io/velero/pkg/util/kube" +import "github.com/vmware-tanzu/velero/pkg/util/kube" type JobConfigs struct { // LoadAffinities is the config for repository maintenance job load affinity. diff --git a/pkg/uploader/cbt/bitmap.go b/pkg/uploader/cbt/bitmap.go index 731096cfd..f26cb22b7 100644 --- a/pkg/uploader/cbt/bitmap.go +++ b/pkg/uploader/cbt/bitmap.go @@ -21,7 +21,7 @@ import ( "github.com/RoaringBitmap/roaring" - "github.com/velero-io/velero/pkg/uploader/cbt/types" + "github.com/vmware-tanzu/velero/pkg/uploader/cbt/types" ) const ( diff --git a/pkg/uploader/cbt/set.go b/pkg/uploader/cbt/set.go index 3c82eff74..5919419e6 100644 --- a/pkg/uploader/cbt/set.go +++ b/pkg/uploader/cbt/set.go @@ -21,8 +21,8 @@ import ( "github.com/pkg/errors" - "github.com/velero-io/velero/pkg/cbtservice" - "github.com/velero-io/velero/pkg/uploader/cbt/types" + "github.com/vmware-tanzu/velero/pkg/cbtservice" + "github.com/vmware-tanzu/velero/pkg/uploader/cbt/types" ) // SetBitmapOrFull translates the allocated/changed blocks from CBT service to the given bitmap or set the bitmap to full when error happens diff --git a/pkg/uploader/cbt/set_test.go b/pkg/uploader/cbt/set_test.go index 93bd93171..55701dedd 100644 --- a/pkg/uploader/cbt/set_test.go +++ b/pkg/uploader/cbt/set_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/cbtservice" - cbtservicemocks "github.com/velero-io/velero/pkg/cbtservice/mocks" - cbtmocks "github.com/velero-io/velero/pkg/uploader/cbt/types/mocks" + "github.com/vmware-tanzu/velero/pkg/cbtservice" + cbtservicemocks "github.com/vmware-tanzu/velero/pkg/cbtservice/mocks" + cbtmocks "github.com/vmware-tanzu/velero/pkg/uploader/cbt/types/mocks" ) func TestSetBitmapOrFull(t *testing.T) { diff --git a/pkg/uploader/cbt/types/mocks/Bitmap.go b/pkg/uploader/cbt/types/mocks/Bitmap.go index b382e995e..faa4ee242 100644 --- a/pkg/uploader/cbt/types/mocks/Bitmap.go +++ b/pkg/uploader/cbt/types/mocks/Bitmap.go @@ -6,7 +6,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - "github.com/velero-io/velero/pkg/uploader/cbt/types" + "github.com/vmware-tanzu/velero/pkg/uploader/cbt/types" ) // NewBitmap creates a new instance of Bitmap. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. diff --git a/pkg/uploader/kopia/progress.go b/pkg/uploader/kopia/progress.go index 62a98efce..5071398d0 100644 --- a/pkg/uploader/kopia/progress.go +++ b/pkg/uploader/kopia/progress.go @@ -22,7 +22,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/velero-io/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/uploader" "github.com/kopia/kopia/snapshot/upload" ) diff --git a/pkg/uploader/kopia/progress_test.go b/pkg/uploader/kopia/progress_test.go index 8b811f854..8c18bb85b 100644 --- a/pkg/uploader/kopia/progress_test.go +++ b/pkg/uploader/kopia/progress_test.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/velero-io/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/uploader" ) type fakeProgressUpdater struct{} diff --git a/pkg/uploader/kopia/shim.go b/pkg/uploader/kopia/shim.go index d6c888e11..f146348fa 100644 --- a/pkg/uploader/kopia/shim.go +++ b/pkg/uploader/kopia/shim.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" - "github.com/velero-io/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" "github.com/kopia/kopia/repo" "github.com/kopia/kopia/repo/content" diff --git a/pkg/uploader/kopia/shim_test.go b/pkg/uploader/kopia/shim_test.go index cbeada746..7933ec6b8 100644 --- a/pkg/uploader/kopia/shim_test.go +++ b/pkg/uploader/kopia/shim_test.go @@ -30,8 +30,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/repository/udmrepo" - "github.com/velero-io/velero/pkg/repository/udmrepo/mocks" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/mocks" ) func TestShimRepo(t *testing.T) { diff --git a/pkg/uploader/kopia/snapshot.go b/pkg/uploader/kopia/snapshot.go index 3549fe45d..1924ed35b 100644 --- a/pkg/uploader/kopia/snapshot.go +++ b/pkg/uploader/kopia/snapshot.go @@ -38,10 +38,10 @@ import ( "github.com/kopia/kopia/snapshot/snapshotfs" "github.com/pkg/errors" - "github.com/velero-io/velero/pkg/kopia" - "github.com/velero-io/velero/pkg/repository/udmrepo" - "github.com/velero-io/velero/pkg/uploader" - uploaderutil "github.com/velero-io/velero/pkg/uploader/util" + "github.com/vmware-tanzu/velero/pkg/kopia" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/uploader" + uploaderutil "github.com/vmware-tanzu/velero/pkg/uploader/util" ) // All function mainly used to make testing more convenient diff --git a/pkg/uploader/kopia/snapshot_test.go b/pkg/uploader/kopia/snapshot_test.go index 9944ec06c..984b92af5 100644 --- a/pkg/uploader/kopia/snapshot_test.go +++ b/pkg/uploader/kopia/snapshot_test.go @@ -36,9 +36,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - repomocks "github.com/velero-io/velero/pkg/repository/mocks" - "github.com/velero-io/velero/pkg/uploader" - uploadermocks "github.com/velero-io/velero/pkg/uploader/mocks" + repomocks "github.com/vmware-tanzu/velero/pkg/repository/mocks" + "github.com/vmware-tanzu/velero/pkg/uploader" + uploadermocks "github.com/vmware-tanzu/velero/pkg/uploader/mocks" ) type snapshotMockes struct { diff --git a/pkg/uploader/provider/block.go b/pkg/uploader/provider/block.go index 1b42e5391..b1eed428a 100644 --- a/pkg/uploader/provider/block.go +++ b/pkg/uploader/provider/block.go @@ -23,11 +23,11 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/velero-io/velero/internal/credentials" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - repokeys "github.com/velero-io/velero/pkg/repository/keys" - "github.com/velero-io/velero/pkg/repository/udmrepo" - "github.com/velero-io/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/internal/credentials" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + repokeys "github.com/vmware-tanzu/velero/pkg/repository/keys" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/uploader" ) type blockProvider struct { diff --git a/pkg/uploader/provider/block_test.go b/pkg/uploader/provider/block_test.go index f6834c82c..a48b0a862 100644 --- a/pkg/uploader/provider/block_test.go +++ b/pkg/uploader/provider/block_test.go @@ -26,12 +26,12 @@ import ( "github.com/stretchr/testify/require" corev1api "k8s.io/api/core/v1" - "github.com/velero-io/velero/internal/credentials" - "github.com/velero-io/velero/internal/credentials/mocks" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/repository" - "github.com/velero-io/velero/pkg/repository/udmrepo" - udmrepomocks "github.com/velero-io/velero/pkg/repository/udmrepo/mocks" + "github.com/vmware-tanzu/velero/internal/credentials" + "github.com/vmware-tanzu/velero/internal/credentials/mocks" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/repository" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + udmrepomocks "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/mocks" ) func TestNewBlockUploaderProvider(t *testing.T) { diff --git a/pkg/uploader/provider/kopia.go b/pkg/uploader/provider/kopia.go index 684a6d12f..620b0776d 100644 --- a/pkg/uploader/provider/kopia.go +++ b/pkg/uploader/provider/kopia.go @@ -26,14 +26,14 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/uploader/kopia" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/uploader/kopia" - "github.com/velero-io/velero/internal/credentials" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - repokeys "github.com/velero-io/velero/pkg/repository/keys" - "github.com/velero-io/velero/pkg/repository/udmrepo" - "github.com/velero-io/velero/pkg/repository/udmrepo/service" + "github.com/vmware-tanzu/velero/internal/credentials" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + repokeys "github.com/vmware-tanzu/velero/pkg/repository/keys" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/service" ) var kopiaBackupFunc = kopia.Backup diff --git a/pkg/uploader/provider/kopia_test.go b/pkg/uploader/provider/kopia_test.go index eb1e0ab21..092333a24 100644 --- a/pkg/uploader/provider/kopia_test.go +++ b/pkg/uploader/provider/kopia_test.go @@ -33,15 +33,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/velero-io/velero/internal/credentials" - "github.com/velero-io/velero/internal/credentials/mocks" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/repository" - udmrepo "github.com/velero-io/velero/pkg/repository/udmrepo" - udmrepomocks "github.com/velero-io/velero/pkg/repository/udmrepo/mocks" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/uploader/kopia" - "github.com/velero-io/velero/pkg/util" + "github.com/vmware-tanzu/velero/internal/credentials" + "github.com/vmware-tanzu/velero/internal/credentials/mocks" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/repository" + udmrepo "github.com/vmware-tanzu/velero/pkg/repository/udmrepo" + udmrepomocks "github.com/vmware-tanzu/velero/pkg/repository/udmrepo/mocks" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/uploader/kopia" + "github.com/vmware-tanzu/velero/pkg/util" ) type FakeBackupProgressUpdater struct { diff --git a/pkg/uploader/provider/mocks/Provider.go b/pkg/uploader/provider/mocks/Provider.go index d84850129..71e60b84e 100644 --- a/pkg/uploader/provider/mocks/Provider.go +++ b/pkg/uploader/provider/mocks/Provider.go @@ -8,8 +8,8 @@ import ( "context" mock "github.com/stretchr/testify/mock" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/uploader/provider" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/uploader/provider" ) // NewProvider creates a new instance of Provider. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. diff --git a/pkg/uploader/provider/provider.go b/pkg/uploader/provider/provider.go index 146f89e91..0c1caaffe 100644 --- a/pkg/uploader/provider/provider.go +++ b/pkg/uploader/provider/provider.go @@ -27,10 +27,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/credentials" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/cbtservice" - "github.com/velero-io/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/internal/credentials" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/cbtservice" + "github.com/vmware-tanzu/velero/pkg/uploader" ) const restoreProgressCheckInterval = 10 * time.Second diff --git a/pkg/uploader/provider/provider_test.go b/pkg/uploader/provider/provider_test.go index 91a35c274..8f447725b 100644 --- a/pkg/uploader/provider/provider_test.go +++ b/pkg/uploader/provider/provider_test.go @@ -25,10 +25,10 @@ import ( corev1api "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/velero-io/velero/internal/credentials" - "github.com/velero-io/velero/internal/credentials/mocks" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/util" + "github.com/vmware-tanzu/velero/internal/credentials" + "github.com/vmware-tanzu/velero/internal/credentials/mocks" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/util" ) type NewUploaderProviderTestCase struct { diff --git a/pkg/uploader/util/uploader_config.go b/pkg/uploader/util/uploader_config.go index 51499129e..5584ffbce 100644 --- a/pkg/uploader/util/uploader_config.go +++ b/pkg/uploader/util/uploader_config.go @@ -21,7 +21,7 @@ import ( "github.com/pkg/errors" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) const ( diff --git a/pkg/uploader/util/uploader_config_test.go b/pkg/uploader/util/uploader_config_test.go index f03538116..593bce4f0 100644 --- a/pkg/uploader/util/uploader_config_test.go +++ b/pkg/uploader/util/uploader_config_test.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) func TestStoreBackupConfig(t *testing.T) { diff --git a/pkg/util/actionhelpers/pod_helper.go b/pkg/util/actionhelpers/pod_helper.go index 6d9514bdc..72c42936c 100644 --- a/pkg/util/actionhelpers/pod_helper.go +++ b/pkg/util/actionhelpers/pod_helper.go @@ -20,8 +20,8 @@ import ( "github.com/sirupsen/logrus" corev1api "k8s.io/api/core/v1" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) func RelatedItemsForPod(pod *corev1api.Pod, log logrus.FieldLogger) []velero.ResourceIdentifier { diff --git a/pkg/util/actionhelpers/pvc_helper.go b/pkg/util/actionhelpers/pvc_helper.go index e496d5a1e..f6a72eeaa 100644 --- a/pkg/util/actionhelpers/pvc_helper.go +++ b/pkg/util/actionhelpers/pvc_helper.go @@ -20,8 +20,8 @@ import ( "github.com/sirupsen/logrus" corev1api "k8s.io/api/core/v1" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) func RelatedItemsForPVC(pvc *corev1api.PersistentVolumeClaim, log logrus.FieldLogger) []velero.ResourceIdentifier { diff --git a/pkg/util/actionhelpers/service_account_helper.go b/pkg/util/actionhelpers/service_account_helper.go index 7f529f121..0474e1a9b 100644 --- a/pkg/util/actionhelpers/service_account_helper.go +++ b/pkg/util/actionhelpers/service_account_helper.go @@ -22,9 +22,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" - velerodiscovery "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/plugin/velero" + velerodiscovery "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" ) func ClusterRoleBindingsForAction(clusterRoleBindingListers map[string]ClusterRoleBindingLister, discoveryHelper velerodiscovery.Helper) ([]ClusterRoleBinding, error) { diff --git a/pkg/util/azure/storage.go b/pkg/util/azure/storage.go index c5ba18c3a..49943a3f9 100644 --- a/pkg/util/azure/storage.go +++ b/pkg/util/azure/storage.go @@ -33,7 +33,7 @@ import ( const ( // the keys of Azure BSL config: - // https://github.com/velero-io/velero-plugin-for-microsoft-azure/blob/main/backupstoragelocation.md + // https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/main/backupstoragelocation.md BSLConfigResourceGroup = "resourceGroup" BSLConfigStorageAccount = "storageAccount" BSLConfigStorageAccountAccessKeyName = "storageAccountKeyEnvVar" @@ -162,7 +162,7 @@ func GetStorageAccountCredentials(bslCfg map[string]string, creds map[string]str // getStorageAccountURI returns the storage account URI by the following order: // 1. Return the storage account URI directly if it is specified in BSL config -// 2. Try to call Azure API to get the storage account URI if possible(Background: https://github.com/velero-io/velero/issues/6163) +// 2. Try to call Azure API to get the storage account URI if possible(Background: https://github.com/vmware-tanzu/velero/issues/6163) // 3. Fall back to return the default URI func getStorageAccountURI(log logrus.FieldLogger, bslCfg map[string]string, creds map[string]string) (string, error) { // if the URI is specified in the BSL, return it directly diff --git a/pkg/util/collections/includes_excludes.go b/pkg/util/collections/includes_excludes.go index d5efd6c15..f326a4124 100644 --- a/pkg/util/collections/includes_excludes.go +++ b/pkg/util/collections/includes_excludes.go @@ -19,7 +19,7 @@ package collections import ( "strings" - "github.com/velero-io/velero/internal/resourcepolicies" + "github.com/vmware-tanzu/velero/internal/resourcepolicies" "github.com/gobwas/glob" "github.com/pkg/errors" @@ -28,11 +28,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/discovery" - "github.com/velero-io/velero/pkg/kuberesource" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/wildcard" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/discovery" + "github.com/vmware-tanzu/velero/pkg/kuberesource" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/wildcard" ) type globStringSet struct { @@ -274,7 +274,7 @@ func GetResourceIncludesExcludes(helper discovery.Helper, includes, excludes []s if err != nil { // If we can't resolve it, return it as-is. This prevents the generated // includes-excludes list from including *everything*, if none of the includes - // can be resolved. ref. https://github.com/velero-io/velero/issues/2461 + // can be resolved. ref. https://github.com/vmware-tanzu/velero/issues/2461 return item } diff --git a/pkg/util/collections/includes_excludes_test.go b/pkg/util/collections/includes_excludes_test.go index 7b260e4b5..1d700a729 100644 --- a/pkg/util/collections/includes_excludes_test.go +++ b/pkg/util/collections/includes_excludes_test.go @@ -19,7 +19,7 @@ package collections import ( "testing" - "github.com/velero-io/velero/internal/resourcepolicies" + "github.com/vmware-tanzu/velero/internal/resourcepolicies" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -29,9 +29,9 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/test" ) func TestShouldInclude(t *testing.T) { diff --git a/pkg/util/csi/util.go b/pkg/util/csi/util.go index d1b151a1e..bcc424d1b 100644 --- a/pkg/util/csi/util.go +++ b/pkg/util/csi/util.go @@ -19,8 +19,8 @@ package csi import ( "strings" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/features" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/features" ) const ( diff --git a/pkg/util/csi/util_test.go b/pkg/util/csi/util_test.go index e2f548189..8a3ea3cc1 100644 --- a/pkg/util/csi/util_test.go +++ b/pkg/util/csi/util_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/features" + "github.com/vmware-tanzu/velero/pkg/features" ) func TestCSIFeatureNotEnabledAndPluginIsFromCSI(t *testing.T) { diff --git a/pkg/util/csi/volume_snapshot.go b/pkg/util/csi/volume_snapshot.go index 5fbc1e7fb..ed6371f7b 100644 --- a/pkg/util/csi/volume_snapshot.go +++ b/pkg/util/csi/volume_snapshot.go @@ -36,10 +36,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" crclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/stringptr" - "github.com/velero-io/velero/pkg/util/stringslice" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/stringptr" + "github.com/vmware-tanzu/velero/pkg/util/stringslice" ) const ( diff --git a/pkg/util/csi/volume_snapshot_test.go b/pkg/util/csi/volume_snapshot_test.go index f00a09480..67a07d135 100644 --- a/pkg/util/csi/volume_snapshot_test.go +++ b/pkg/util/csi/volume_snapshot_test.go @@ -36,13 +36,13 @@ import ( clientTesting "k8s.io/client-go/testing" crclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/test" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/util/boolptr" - "github.com/velero-io/velero/pkg/util/logging" - "github.com/velero-io/velero/pkg/util/stringptr" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/logging" + "github.com/vmware-tanzu/velero/pkg/util/stringptr" ) type reactor struct { diff --git a/pkg/util/encode/encode.go b/pkg/util/encode/encode.go index 1f783f823..b7cbdc1c7 100644 --- a/pkg/util/encode/encode.go +++ b/pkg/util/encode/encode.go @@ -27,8 +27,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/util" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/util" ) // Encode converts the provided object to the specified format diff --git a/pkg/util/kube/client.go b/pkg/util/kube/client.go index fc2f1eff1..801f7ab33 100644 --- a/pkg/util/kube/client.go +++ b/pkg/util/kube/client.go @@ -22,7 +22,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - veleroPkgClient "github.com/velero-io/velero/pkg/client" + veleroPkgClient "github.com/vmware-tanzu/velero/pkg/client" ) func PatchResource(original, updated client.Object, kbClient client.Client) error { diff --git a/pkg/util/kube/event_test.go b/pkg/util/kube/event_test.go index 76969a12f..645d1da2d 100644 --- a/pkg/util/kube/event_test.go +++ b/pkg/util/kube/event_test.go @@ -30,7 +30,7 @@ import ( corev1api "k8s.io/api/core/v1" - velerotest "github.com/velero-io/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestEvent(t *testing.T) { diff --git a/pkg/util/kube/list_watch_test.go b/pkg/util/kube/list_watch_test.go index 64521b6df..a0ed9760e 100644 --- a/pkg/util/kube/list_watch_test.go +++ b/pkg/util/kube/list_watch_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/client-go/tools/cache" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestInternalLW(t *testing.T) { diff --git a/pkg/util/kube/node_test.go b/pkg/util/kube/node_test.go index c9a929891..9f14c380b 100644 --- a/pkg/util/kube/node_test.go +++ b/pkg/util/kube/node_test.go @@ -24,13 +24,13 @@ import ( corev1api "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/builder" kubeClientFake "k8s.io/client-go/kubernetes/fake" clientTesting "k8s.io/client-go/testing" clientFake "sigs.k8s.io/controller-runtime/pkg/client/fake" - velerotest "github.com/velero-io/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestIsLinuxNode(t *testing.T) { diff --git a/pkg/util/kube/periodical_enqueue_source_test.go b/pkg/util/kube/periodical_enqueue_source_test.go index b4a2e4f9d..b5e97321a 100644 --- a/pkg/util/kube/periodical_enqueue_source_test.go +++ b/pkg/util/kube/periodical_enqueue_source_test.go @@ -33,8 +33,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/velero-io/velero/internal/storage" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/internal/storage" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) func TestStart(t *testing.T) { diff --git a/pkg/util/kube/pod_test.go b/pkg/util/kube/pod_test.go index 90301c62c..aa8d4db99 100644 --- a/pkg/util/kube/pod_test.go +++ b/pkg/util/kube/pod_test.go @@ -39,7 +39,7 @@ import ( clientTesting "k8s.io/client-go/testing" - velerotest "github.com/velero-io/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" ) diff --git a/pkg/util/kube/predicate_test.go b/pkg/util/kube/predicate_test.go index 2cc956a75..eb00e2fed 100644 --- a/pkg/util/kube/predicate_test.go +++ b/pkg/util/kube/predicate_test.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/event" - velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) func TestSpecChangePredicate(t *testing.T) { diff --git a/pkg/util/kube/priority_class_test.go b/pkg/util/kube/priority_class_test.go index d552f76d1..9d6a52599 100644 --- a/pkg/util/kube/priority_class_test.go +++ b/pkg/util/kube/priority_class_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/client-go/kubernetes/fake" k8stesting "k8s.io/client-go/testing" - velerotesting "github.com/velero-io/velero/pkg/test" + velerotesting "github.com/vmware-tanzu/velero/pkg/test" ) func TestValidatePriorityClass(t *testing.T) { diff --git a/pkg/util/kube/pvc_pv_test.go b/pkg/util/kube/pvc_pv_test.go index 8ba298c52..63b8e1edd 100644 --- a/pkg/util/kube/pvc_pv_test.go +++ b/pkg/util/kube/pvc_pv_test.go @@ -33,8 +33,8 @@ import ( clientTesting "k8s.io/client-go/testing" - "github.com/velero-io/velero/pkg/builder" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/builder" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) type reactor struct { diff --git a/pkg/util/kube/resource_requirements.go b/pkg/util/kube/resource_requirements.go index 5e385254c..12cf7a79c 100644 --- a/pkg/util/kube/resource_requirements.go +++ b/pkg/util/kube/resource_requirements.go @@ -21,7 +21,7 @@ import ( corev1api "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "github.com/velero-io/velero/pkg/constant" + "github.com/vmware-tanzu/velero/pkg/constant" ) // ParseCPUAndMemoryResources is a helper function that parses CPU and memory requests and limits, diff --git a/pkg/util/kube/secrets_test.go b/pkg/util/kube/secrets_test.go index 120a9c457..8707c9be3 100644 --- a/pkg/util/kube/secrets_test.go +++ b/pkg/util/kube/secrets_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" corev1api "k8s.io/api/core/v1" - "github.com/velero-io/velero/pkg/builder" - velerotest "github.com/velero-io/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/builder" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestGetSecretKey(t *testing.T) { diff --git a/pkg/util/kube/security_context_test.go b/pkg/util/kube/security_context_test.go index 4153b37ee..6ba857bc7 100644 --- a/pkg/util/kube/security_context_test.go +++ b/pkg/util/kube/security_context_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" corev1api "k8s.io/api/core/v1" - "github.com/velero-io/velero/pkg/util/boolptr" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" ) func TestParseSecurityContext(t *testing.T) { diff --git a/pkg/util/kube/utils.go b/pkg/util/kube/utils.go index 89c838615..5e5e97603 100644 --- a/pkg/util/kube/utils.go +++ b/pkg/util/kube/utils.go @@ -37,10 +37,10 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/label" - "github.com/velero-io/velero/pkg/uploader" - "github.com/velero-io/velero/pkg/util/filesystem" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/label" + "github.com/vmware-tanzu/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/util/filesystem" ) // These annotations are taken from the Kubernetes persistent volume/persistent volume claim controller. @@ -244,7 +244,7 @@ func isProvisionedByCSI(log logrus.FieldLogger, pv *corev1api.PersistentVolume, return true, nil } // Although the pv.Spec.CSI is nil, the volume could be provisioned by a CSI driver when enabling the CSI migration - // Refer to https://github.com/velero-io/velero/issues/4496 for more details + // Refer to https://github.com/vmware-tanzu/velero/issues/4496 for more details if pv.Annotations != nil { driverName := pv.Annotations[KubeAnnDynamicallyProvisioned] migratedDriver := pv.Annotations[KubeAnnMigratedTo] diff --git a/pkg/util/kube/utils_test.go b/pkg/util/kube/utils_test.go index 04de4e0a2..df23903a0 100644 --- a/pkg/util/kube/utils_test.go +++ b/pkg/util/kube/utils_test.go @@ -35,9 +35,9 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes/fake" - "github.com/velero-io/velero/pkg/builder" - velerotest "github.com/velero-io/velero/pkg/test" - "github.com/velero-io/velero/pkg/uploader" + "github.com/vmware-tanzu/velero/pkg/builder" + velerotest "github.com/vmware-tanzu/velero/pkg/test" + "github.com/vmware-tanzu/velero/pkg/uploader" ) func TestNamespaceAndName(t *testing.T) { diff --git a/pkg/util/logging/dual_mode_logger_test.go b/pkg/util/logging/dual_mode_logger_test.go index c96ed5a8c..c22d19dca 100644 --- a/pkg/util/logging/dual_mode_logger_test.go +++ b/pkg/util/logging/dual_mode_logger_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - velerotest "github.com/velero-io/velero/pkg/test" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestDualModeLogger(t *testing.T) { diff --git a/pkg/util/logging/error_location_hook_test.go b/pkg/util/logging/error_location_hook_test.go index 664b275a0..f6f230c02 100644 --- a/pkg/util/logging/error_location_hook_test.go +++ b/pkg/util/logging/error_location_hook_test.go @@ -55,7 +55,7 @@ func TestFire(t *testing.T) { expectedEntryFields: map[string]any{ logrus.ErrorKey: pkgerrs.New("a pkg/errors error"), errorFileField: "", - errorFunctionField: "github.com/velero-io/velero/pkg/util/logging.TestFire", + errorFunctionField: "github.com/vmware-tanzu/velero/pkg/util/logging.TestFire", }, }, { diff --git a/pkg/util/logging/format_flag.go b/pkg/util/logging/format_flag.go index d49af16a3..c757a17dd 100644 --- a/pkg/util/logging/format_flag.go +++ b/pkg/util/logging/format_flag.go @@ -15,7 +15,7 @@ limitations under the License. */ package logging -import "github.com/velero-io/velero/pkg/cmd/util/flag" +import "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" // Format is a string representation of the desired output format for logs type Format string diff --git a/pkg/util/logging/log_counter_hook.go b/pkg/util/logging/log_counter_hook.go index 52e453fc3..63c9342df 100644 --- a/pkg/util/logging/log_counter_hook.go +++ b/pkg/util/logging/log_counter_hook.go @@ -23,7 +23,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/velero-io/velero/pkg/util/results" + "github.com/vmware-tanzu/velero/pkg/util/results" ) // LogHook is a logrus hook that counts the number of log diff --git a/pkg/util/logging/log_counter_hook_test.go b/pkg/util/logging/log_counter_hook_test.go index 989e155fc..1afd2bc29 100644 --- a/pkg/util/logging/log_counter_hook_test.go +++ b/pkg/util/logging/log_counter_hook_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/velero-io/velero/pkg/util/results" + "github.com/vmware-tanzu/velero/pkg/util/results" ) func TestLogHook_Fire(t *testing.T) { diff --git a/pkg/util/logging/log_level_flag.go b/pkg/util/logging/log_level_flag.go index 1dd7fd111..ff0f0efb2 100644 --- a/pkg/util/logging/log_level_flag.go +++ b/pkg/util/logging/log_level_flag.go @@ -21,7 +21,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/velero-io/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" ) var sortedLogLevels = sortLogLevels() diff --git a/pkg/util/logging/log_location_hook.go b/pkg/util/logging/log_location_hook.go index c2abf512f..a0e88813a 100644 --- a/pkg/util/logging/log_location_hook.go +++ b/pkg/util/logging/log_location_hook.go @@ -28,7 +28,7 @@ const ( logSourceField = "logSource" logSourceSetMarkerField = "@logSourceSetBy" logrusPackage = "github.com/sirupsen/logrus" - veleroPackage = "github.com/velero-io/velero/" + veleroPackage = "github.com/vmware-tanzu/velero/" veleroPackageLen = len(veleroPackage) ) @@ -60,7 +60,7 @@ func (h *LogLocationHook) Fire(entry *logrus.Entry) error { // skip 2 frames: // runtime.Callers - // github.com/velero-io/velero/pkg/util/logging/(*LogLocationHook).Fire + // github.com/vmware-tanzu/velero/pkg/util/logging/(*LogLocationHook).Fire n := runtime.Callers(2, pcs) // re-slice pcs based on the number of entries written @@ -122,7 +122,7 @@ func getLogSourceSetMarker(entry *logrus.Entry) string { func removeVeleroPackagePrefix(file string) string { if index := strings.Index(file, veleroPackage); index != -1 { - // strip off .../github.com/velero-io/velero/ so we just have pkg/... + // strip off .../github.com/vmware-tanzu/velero/ so we just have pkg/... return file[index+veleroPackageLen:] } diff --git a/pkg/util/logging/log_location_hook_test.go b/pkg/util/logging/log_location_hook_test.go index 8fc23daad..74f007a0b 100644 --- a/pkg/util/logging/log_location_hook_test.go +++ b/pkg/util/logging/log_location_hook_test.go @@ -23,6 +23,6 @@ import ( ) func TestRemoveVeleroPackagePrefix(t *testing.T) { - assert.Equal(t, "pkg/foo.go", removeVeleroPackagePrefix("github.com/velero-io/velero/pkg/foo.go")) - assert.Equal(t, "github.com/velero-io/velero-plugin-example/foo.go", removeVeleroPackagePrefix("github.com/velero-io/velero-plugin-example/foo.go")) + assert.Equal(t, "pkg/foo.go", removeVeleroPackagePrefix("github.com/vmware-tanzu/velero/pkg/foo.go")) + assert.Equal(t, "github.com/vmware-tanzu/velero-plugin-example/foo.go", removeVeleroPackagePrefix("github.com/vmware-tanzu/velero-plugin-example/foo.go")) } diff --git a/pkg/util/podvolume/pod_volume.go b/pkg/util/podvolume/pod_volume.go index 42a36fcbb..7c7e0f9c4 100644 --- a/pkg/util/podvolume/pod_volume.go +++ b/pkg/util/podvolume/pod_volume.go @@ -26,8 +26,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" crclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/util" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/util" ) // PVCPodCache provides a cached mapping from PVC to the pods that use it. diff --git a/pkg/util/podvolume/pod_volume_test.go b/pkg/util/podvolume/pod_volume_test.go index 894a88034..87a6f3a0f 100644 --- a/pkg/util/podvolume/pod_volume_test.go +++ b/pkg/util/podvolume/pod_volume_test.go @@ -26,8 +26,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerotest "github.com/velero-io/velero/pkg/test" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerotest "github.com/vmware-tanzu/velero/pkg/test" ) func TestGetVolumesToBackup(t *testing.T) { diff --git a/pkg/util/scheme.go b/pkg/util/scheme.go index 893594e12..c398e4196 100644 --- a/pkg/util/scheme.go +++ b/pkg/util/scheme.go @@ -20,8 +20,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" ) var VeleroScheme = runtime.NewScheme() diff --git a/pkg/util/velero/restore/util.go b/pkg/util/velero/restore/util.go index b054ae606..e0812884b 100644 --- a/pkg/util/velero/restore/util.go +++ b/pkg/util/velero/restore/util.go @@ -1,7 +1,7 @@ package restore import ( - api "github.com/velero-io/velero/pkg/apis/velero/v1" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) func IsResourcePolicyValid(resourcePolicy string) bool { diff --git a/pkg/util/velero/restore/util_test.go b/pkg/util/velero/restore/util_test.go index dc1f82d22..be72ff8ba 100644 --- a/pkg/util/velero/restore/util_test.go +++ b/pkg/util/velero/restore/util_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) func TestIsResourcePolicyValid(t *testing.T) { diff --git a/pkg/util/velero/velero.go b/pkg/util/velero/velero.go index a47312775..a58d6e76b 100644 --- a/pkg/util/velero/velero.go +++ b/pkg/util/velero/velero.go @@ -20,7 +20,7 @@ import ( appsv1api "k8s.io/api/apps/v1" corev1api "k8s.io/api/core/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" ) // GetNodeSelectorFromVeleroServer get the node selector from the Velero server deployment diff --git a/pkg/util/velero/velero_test.go b/pkg/util/velero/velero_test.go index 9d2060341..c4e201780 100644 --- a/pkg/util/velero/velero_test.go +++ b/pkg/util/velero/velero_test.go @@ -26,9 +26,9 @@ import ( corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/pkg/util/boolptr" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" ) func TestGetNodeSelectorFromVeleroServer(t *testing.T) { diff --git a/restore-hooks_product-requirements.md b/restore-hooks_product-requirements.md index cb62c6818..1b943fe82 100644 --- a/restore-hooks_product-requirements.md +++ b/restore-hooks_product-requirements.md @@ -2,7 +2,7 @@ Velero Restore Hooks - PRD (Product Requirements Document) MVP Feature Set -Relates to: [https://github.com/velero-io/velero/issues/2116](https://github.com/velero-io/velero/issues/2116) +Relates to: [https://github.com/vmware-tanzu/velero/issues/2116](https://github.com/vmware-tanzu/velero/issues/2116) # **Change tracking** @@ -23,9 +23,9 @@ _This is a live document, you can reach me on the following channels for more in -* [https://app.zenhub.com/workspaces/velero-5c59c15e39d47b774b5864e3/issues/velero-io/velero/2465](https://app.zenhub.com/workspaces/velero-5c59c15e39d47b774b5864e3/issues/velero-io/velero/2465) - * [https://github.com/velero-io/velero/pull/2465/files?short_path=140e0c6#diff-140e0c6b370f250ee97f6ecafc8dbb7a](https://github.com/velero-io/velero/pull/2465/files?short_path=140e0c6#diff-140e0c6b370f250ee97f6ecafc8dbb7a) -* [https://github.com/velero-io/velero/issues/1150](https://github.com/velero-io/velero/issues/1150) +* [https://app.zenhub.com/workspaces/velero-5c59c15e39d47b774b5864e3/issues/vmware-tanzu/velero/2465](https://app.zenhub.com/workspaces/velero-5c59c15e39d47b774b5864e3/issues/vmware-tanzu/velero/2465) + * [https://github.com/vmware-tanzu/velero/pull/2465/files?short_path=140e0c6#diff-140e0c6b370f250ee97f6ecafc8dbb7a](https://github.com/vmware-tanzu/velero/pull/2465/files?short_path=140e0c6#diff-140e0c6b370f250ee97f6ecafc8dbb7a) +* [https://github.com/vmware-tanzu/velero/issues/1150](https://github.com/vmware-tanzu/velero/issues/1150) Background @@ -79,7 +79,7 @@ MVP Use Cases The following use cases must be included as part of the Velero restore hooks MVP (minimum viable product). -**Note: **Processing of concurrent vs sequential workloads is slated later in the Velero roadmap (see [https://github.com/velero-io/velero/pull/2548/files](https://github.com/velero-io/velero/pull/2548/files)). The MVP for this feature set will align with restore of single workloads vs concurrent workload restores. A second epic will be created to address the concurrent restore operations and will be added to the backlog for priority visibility. +**Note: **Processing of concurrent vs sequential workloads is slated later in the Velero roadmap (see [https://github.com/vmware-tanzu/velero/pull/2548/files](https://github.com/vmware-tanzu/velero/pull/2548/files)). The MVP for this feature set will align with restore of single workloads vs concurrent workload restores. A second epic will be created to address the concurrent restore operations and will be added to the backlog for priority visibility. **Note: **Please refer to the Requirements section of this document for more details on what items are P0 (must have in the MVP), P1 (should not ship without for the MVP), P2 (nice to haves). diff --git a/test/e2e/README.md b/test/e2e/README.md index 583606971..f4e7714af 100644 --- a/test/e2e/README.md +++ b/test/e2e/README.md @@ -180,8 +180,8 @@ make test-e2e ``` Please refer to `velero-plugin-for-microsoft-azure` documentation for instruction: -* [set up permissions for Velero](https://github.com/velero-io/velero-plugin-for-microsoft-azure#set-permissions-for-velero) -* [set up azure storage account and blob container](https://github.com/velero-io/velero-plugin-for-microsoft-azure#setup-azure-storage-account-and-blob-container) +* [set up permissions for Velero](https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure#set-permissions-for-velero) +* [set up azure storage account and blob container](https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure#setup-azure-storage-account-and-blob-container) 1. Run Multi-API group and version tests using MinIO as the backup storage location: ``` bash diff --git a/test/e2e/backup/backup.go b/test/e2e/backup/backup.go index 91b0fcae0..43a6f4f23 100644 --- a/test/e2e/backup/backup.go +++ b/test/e2e/backup/backup.go @@ -25,11 +25,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/velero-io/velero/test" - "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/k8s" - . "github.com/velero-io/velero/test/util/kibishii" - . "github.com/velero-io/velero/test/util/velero" + . "github.com/vmware-tanzu/velero/test" + "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/kibishii" + . "github.com/vmware-tanzu/velero/test/util/velero" ) type BackupRestoreTestConfig struct { @@ -208,7 +208,7 @@ func BackupRestoreTest(backupRestoreTestConfig BackupRestoreTestConfig) { )).To(Succeed()) // We limit the length of backup name here to avoid the issue of vsphere plugin - // https://github.com/velero-io/velero-plugin-for-vsphere/issues/370 + // https://github.com/vmware-tanzu/velero-plugin-for-vsphere/issues/370 // We can remove the logic once the issue is fixed backupName = "backup-" + common.AdditionalBSLName restoreName = "restore-" + common.AdditionalBSLName diff --git a/test/e2e/backups/deletion.go b/test/e2e/backups/deletion.go index ccffcec55..54388b70a 100644 --- a/test/e2e/backups/deletion.go +++ b/test/e2e/backups/deletion.go @@ -27,11 +27,11 @@ import ( . "github.com/onsi/gomega" "github.com/pkg/errors" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/util/k8s" - . "github.com/velero-io/velero/test/util/kibishii" - . "github.com/velero-io/velero/test/util/providers" - . "github.com/velero-io/velero/test/util/velero" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/kibishii" + . "github.com/vmware-tanzu/velero/test/util/providers" + . "github.com/vmware-tanzu/velero/test/util/velero" ) // Test backup and restore of Kibishii using restic diff --git a/test/e2e/backups/sync_backups.go b/test/e2e/backups/sync_backups.go index cbbba10c1..447fc735b 100644 --- a/test/e2e/backups/sync_backups.go +++ b/test/e2e/backups/sync_backups.go @@ -16,7 +16,7 @@ * / */ -// Refer to https://github.com/velero-io/velero/issues/4253 +// Refer to https://github.com/vmware-tanzu/velero/issues/4253 package backups import ( @@ -30,10 +30,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/util/k8s" - . "github.com/velero-io/velero/test/util/providers" - . "github.com/velero-io/velero/test/util/velero" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/providers" + . "github.com/vmware-tanzu/velero/test/util/velero" ) type SyncBackups struct { diff --git a/test/e2e/backups/ttl.go b/test/e2e/backups/ttl.go index 998e55f19..f781c32d4 100644 --- a/test/e2e/backups/ttl.go +++ b/test/e2e/backups/ttl.go @@ -30,11 +30,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/util/k8s" - . "github.com/velero-io/velero/test/util/kibishii" - . "github.com/velero-io/velero/test/util/providers" - . "github.com/velero-io/velero/test/util/velero" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/kibishii" + . "github.com/vmware-tanzu/velero/test/util/providers" + . "github.com/vmware-tanzu/velero/test/util/velero" ) type TTL struct { diff --git a/test/e2e/basic/api-group/enable_api_group_extentions.go b/test/e2e/basic/api-group/enable_api_group_extentions.go index 11a057f3e..546d2f721 100644 --- a/test/e2e/basic/api-group/enable_api_group_extentions.go +++ b/test/e2e/basic/api-group/enable_api_group_extentions.go @@ -24,9 +24,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/util/k8s" - . "github.com/velero-io/velero/test/util/velero" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/velero" ) func APIExtensionsVersionsTest() { diff --git a/test/e2e/basic/api-group/enable_api_group_versions.go b/test/e2e/basic/api-group/enable_api_group_versions.go index 5155b8497..13ee3a39e 100644 --- a/test/e2e/basic/api-group/enable_api_group_versions.go +++ b/test/e2e/basic/api-group/enable_api_group_versions.go @@ -34,11 +34,11 @@ import ( corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/velero-io/velero/pkg/builder" - veleroexec "github.com/velero-io/velero/pkg/util/exec" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/util/k8s" - . "github.com/velero-io/velero/test/util/velero" + "github.com/vmware-tanzu/velero/pkg/builder" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/velero" ) var veleroCfg VeleroConfig diff --git a/test/e2e/basic/backup-volume-info/base.go b/test/e2e/basic/backup-volume-info/base.go index 8f2da8772..2cd574b5c 100644 --- a/test/e2e/basic/backup-volume-info/base.go +++ b/test/e2e/basic/backup-volume-info/base.go @@ -27,11 +27,11 @@ import ( "github.com/pkg/errors" corev1api "k8s.io/api/core/v1" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/e2e/test" - "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/e2e/test" + "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) type BackupVolumeInfo struct { @@ -144,7 +144,7 @@ func (v *BackupVolumeInfo) CreateResources() error { for _, pod := range podList.Items { for i := 0; i <= pvcCount-1; i++ { - // Hitting issue https://github.com/velero-io/velero/issues/7388 + // Hitting issue https://github.com/vmware-tanzu/velero/issues/7388 // So populate data only to some of pods, leave other pods empty to verify empty PV datamover if i%2 == 0 { Expect(CreateFileToPod( diff --git a/test/e2e/basic/backup-volume-info/csi_data_mover.go b/test/e2e/basic/backup-volume-info/csi_data_mover.go index 9731c7d4b..43edb0ddb 100644 --- a/test/e2e/basic/backup-volume-info/csi_data_mover.go +++ b/test/e2e/basic/backup-volume-info/csi_data_mover.go @@ -21,9 +21,9 @@ import ( . "github.com/onsi/gomega" - . "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/util/providers" - . "github.com/velero-io/velero/test/util/velero" + . "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/util/providers" + . "github.com/vmware-tanzu/velero/test/util/velero" ) var CSIDataMoverVolumeInfoTest func() = TestFunc(&CSIDataMoverVolumeInfo{ diff --git a/test/e2e/basic/backup-volume-info/csi_snapshot.go b/test/e2e/basic/backup-volume-info/csi_snapshot.go index fe008baaa..5eddb4ea2 100644 --- a/test/e2e/basic/backup-volume-info/csi_snapshot.go +++ b/test/e2e/basic/backup-volume-info/csi_snapshot.go @@ -21,9 +21,9 @@ import ( . "github.com/onsi/gomega" - . "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/util/providers" - . "github.com/velero-io/velero/test/util/velero" + . "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/util/providers" + . "github.com/vmware-tanzu/velero/test/util/velero" ) var CSISnapshotVolumeInfoTest func() = TestFunc(&CSISnapshotVolumeInfo{ diff --git a/test/e2e/basic/backup-volume-info/filesystem_upload.go b/test/e2e/basic/backup-volume-info/filesystem_upload.go index 7c176fc50..e6266c0c6 100644 --- a/test/e2e/basic/backup-volume-info/filesystem_upload.go +++ b/test/e2e/basic/backup-volume-info/filesystem_upload.go @@ -21,9 +21,9 @@ import ( . "github.com/onsi/gomega" - . "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/util/providers" - . "github.com/velero-io/velero/test/util/velero" + . "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/util/providers" + . "github.com/vmware-tanzu/velero/test/util/velero" ) var FilesystemUploadVolumeInfoTest func() = TestFunc(&FilesystemUploadVolumeInfo{ diff --git a/test/e2e/basic/backup-volume-info/native_snapshot.go b/test/e2e/basic/backup-volume-info/native_snapshot.go index 725755f5b..13a75d2e6 100644 --- a/test/e2e/basic/backup-volume-info/native_snapshot.go +++ b/test/e2e/basic/backup-volume-info/native_snapshot.go @@ -21,9 +21,9 @@ import ( . "github.com/onsi/gomega" - . "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/util/providers" - . "github.com/velero-io/velero/test/util/velero" + . "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/util/providers" + . "github.com/vmware-tanzu/velero/test/util/velero" ) var NativeSnapshotVolumeInfoTest func() = TestFunc(&NativeSnapshotVolumeInfo{ diff --git a/test/e2e/basic/backup-volume-info/skipped_volumes.go b/test/e2e/basic/backup-volume-info/skipped_volumes.go index 755c527b9..2fc801a5f 100644 --- a/test/e2e/basic/backup-volume-info/skipped_volumes.go +++ b/test/e2e/basic/backup-volume-info/skipped_volumes.go @@ -21,9 +21,9 @@ import ( . "github.com/onsi/gomega" - . "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/util/providers" - . "github.com/velero-io/velero/test/util/velero" + . "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/util/providers" + . "github.com/vmware-tanzu/velero/test/util/velero" ) var SkippedVolumeInfoTest func() = TestFunc(&SkippedVolumeInfo{ diff --git a/test/e2e/basic/namespace-mapping.go b/test/e2e/basic/namespace-mapping.go index 54314e5dc..6816b2df0 100644 --- a/test/e2e/basic/namespace-mapping.go +++ b/test/e2e/basic/namespace-mapping.go @@ -8,9 +8,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/util/k8s" - . "github.com/velero-io/velero/test/util/kibishii" + . "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/kibishii" ) type NamespaceMapping struct { diff --git a/test/e2e/basic/nodeport.go b/test/e2e/basic/nodeport.go index 18f11fa1e..b561295a1 100644 --- a/test/e2e/basic/nodeport.go +++ b/test/e2e/basic/nodeport.go @@ -10,10 +10,10 @@ import ( corev1api "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - . "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/util/k8s" - . "github.com/velero-io/velero/test/util/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + . "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/velero" ) type NodePort struct { diff --git a/test/e2e/basic/resources-check/namespaces.go b/test/e2e/basic/resources-check/namespaces.go index c2f8e7d33..922e4ed07 100644 --- a/test/e2e/basic/resources-check/namespaces.go +++ b/test/e2e/basic/resources-check/namespaces.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - . "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) type MultiNSBackup struct { diff --git a/test/e2e/basic/resources-check/namespaces_annotation.go b/test/e2e/basic/resources-check/namespaces_annotation.go index e835b99f7..e698d4818 100644 --- a/test/e2e/basic/resources-check/namespaces_annotation.go +++ b/test/e2e/basic/resources-check/namespaces_annotation.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - . "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) type NSAnnotationCase struct { diff --git a/test/e2e/basic/resources-check/rbac.go b/test/e2e/basic/resources-check/rbac.go index 9ab4a4e90..b79c3615f 100644 --- a/test/e2e/basic/resources-check/rbac.go +++ b/test/e2e/basic/resources-check/rbac.go @@ -39,8 +39,8 @@ import ( . "github.com/onsi/ginkgo/v2" "github.com/pkg/errors" - . "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) type RBACCase struct { diff --git a/test/e2e/basic/resources-check/resources_check.go b/test/e2e/basic/resources-check/resources_check.go index b656300c4..880063657 100644 --- a/test/e2e/basic/resources-check/resources_check.go +++ b/test/e2e/basic/resources-check/resources_check.go @@ -33,7 +33,7 @@ limitations under the License. package basic import ( - . "github.com/velero-io/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/e2e/test" ) func GetResourcesCheckTestCases() []VeleroBackupRestoreTest { diff --git a/test/e2e/basic/restore_exec_hooks.go b/test/e2e/basic/restore_exec_hooks.go index 10757feff..fc1b8ceb8 100644 --- a/test/e2e/basic/restore_exec_hooks.go +++ b/test/e2e/basic/restore_exec_hooks.go @@ -24,10 +24,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/e2e/test" - "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/k8s" + "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/e2e/test" + "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) // RestoreExecHooks tests that a pod with multiple restore exec hooks does not hang diff --git a/test/e2e/basic/storage-class-changing.go b/test/e2e/basic/storage-class-changing.go index 9a0aa17cb..08481d4ad 100644 --- a/test/e2e/basic/storage-class-changing.go +++ b/test/e2e/basic/storage-class-changing.go @@ -7,12 +7,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/e2e/test" - "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/k8s" - . "github.com/velero-io/velero/test/util/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/e2e/test" + "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/velero" ) type StorageClasssChanging struct { diff --git a/test/e2e/bsl-mgmt/deletion.go b/test/e2e/bsl-mgmt/deletion.go index 9088dee01..838aa67b5 100644 --- a/test/e2e/bsl-mgmt/deletion.go +++ b/test/e2e/bsl-mgmt/deletion.go @@ -27,11 +27,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/util/k8s" - . "github.com/velero-io/velero/test/util/kibishii" - . "github.com/velero-io/velero/test/util/providers" - . "github.com/velero-io/velero/test/util/velero" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/kibishii" + . "github.com/vmware-tanzu/velero/test/util/providers" + . "github.com/vmware-tanzu/velero/test/util/velero" ) const ( @@ -143,7 +143,7 @@ func BslDeletionTest(useVolumeSnapshots bool) { podName2 := "kibishii-deployment-1" label1 := "for=1" - // TODO remove when issue https://github.com/velero-io/velero/issues/4724 is fixed + // TODO remove when issue https://github.com/vmware-tanzu/velero/issues/4724 is fixed //label2 := "for!=1" label2 := "for=2" By("Create namespace for sample workload", func() { diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index dadd3a2b9..909cc8074 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -29,30 +29,30 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/velero-io/velero/pkg/cmd/cli/install" - "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/e2e/backup" - . "github.com/velero-io/velero/test/e2e/backups" - . "github.com/velero-io/velero/test/e2e/basic" - . "github.com/velero-io/velero/test/e2e/basic/api-group" - . "github.com/velero-io/velero/test/e2e/basic/backup-volume-info" - . "github.com/velero-io/velero/test/e2e/basic/resources-check" - . "github.com/velero-io/velero/test/e2e/bsl-mgmt" - . "github.com/velero-io/velero/test/e2e/migration" - . "github.com/velero-io/velero/test/e2e/nodeagentconfig" - . "github.com/velero-io/velero/test/e2e/parallelfilesdownload" - . "github.com/velero-io/velero/test/e2e/parallelfilesupload" - . "github.com/velero-io/velero/test/e2e/privilegesmgmt" - . "github.com/velero-io/velero/test/e2e/pv-backup" - . "github.com/velero-io/velero/test/e2e/repomaintenance" - . "github.com/velero-io/velero/test/e2e/resource-filtering" - . "github.com/velero-io/velero/test/e2e/resourcemodifiers" - . "github.com/velero-io/velero/test/e2e/resourcepolicies" - . "github.com/velero-io/velero/test/e2e/scale" - . "github.com/velero-io/velero/test/e2e/schedule" - . "github.com/velero-io/velero/test/e2e/upgrade" - "github.com/velero-io/velero/test/util/k8s" - veleroutil "github.com/velero-io/velero/test/util/velero" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/install" + "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/e2e/backup" + . "github.com/vmware-tanzu/velero/test/e2e/backups" + . "github.com/vmware-tanzu/velero/test/e2e/basic" + . "github.com/vmware-tanzu/velero/test/e2e/basic/api-group" + . "github.com/vmware-tanzu/velero/test/e2e/basic/backup-volume-info" + . "github.com/vmware-tanzu/velero/test/e2e/basic/resources-check" + . "github.com/vmware-tanzu/velero/test/e2e/bsl-mgmt" + . "github.com/vmware-tanzu/velero/test/e2e/migration" + . "github.com/vmware-tanzu/velero/test/e2e/nodeagentconfig" + . "github.com/vmware-tanzu/velero/test/e2e/parallelfilesdownload" + . "github.com/vmware-tanzu/velero/test/e2e/parallelfilesupload" + . "github.com/vmware-tanzu/velero/test/e2e/privilegesmgmt" + . "github.com/vmware-tanzu/velero/test/e2e/pv-backup" + . "github.com/vmware-tanzu/velero/test/e2e/repomaintenance" + . "github.com/vmware-tanzu/velero/test/e2e/resource-filtering" + . "github.com/vmware-tanzu/velero/test/e2e/resourcemodifiers" + . "github.com/vmware-tanzu/velero/test/e2e/resourcepolicies" + . "github.com/vmware-tanzu/velero/test/e2e/scale" + . "github.com/vmware-tanzu/velero/test/e2e/schedule" + . "github.com/vmware-tanzu/velero/test/e2e/upgrade" + "github.com/vmware-tanzu/velero/test/util/k8s" + veleroutil "github.com/vmware-tanzu/velero/test/util/velero" ) func init() { diff --git a/test/e2e/migration/migration.go b/test/e2e/migration/migration.go index faeafc2c8..e890189c3 100644 --- a/test/e2e/migration/migration.go +++ b/test/e2e/migration/migration.go @@ -24,14 +24,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/velero-io/velero/test" - framework "github.com/velero-io/velero/test/e2e/test" - "github.com/velero-io/velero/test/util/common" - util "github.com/velero-io/velero/test/util/csi" - k8sutil "github.com/velero-io/velero/test/util/k8s" - "github.com/velero-io/velero/test/util/kibishii" - "github.com/velero-io/velero/test/util/providers" - veleroutil "github.com/velero-io/velero/test/util/velero" + "github.com/vmware-tanzu/velero/test" + framework "github.com/vmware-tanzu/velero/test/e2e/test" + "github.com/vmware-tanzu/velero/test/util/common" + util "github.com/vmware-tanzu/velero/test/util/csi" + k8sutil "github.com/vmware-tanzu/velero/test/util/k8s" + "github.com/vmware-tanzu/velero/test/util/kibishii" + "github.com/vmware-tanzu/velero/test/util/providers" + veleroutil "github.com/vmware-tanzu/velero/test/util/velero" ) const BackupObjectsPrefix = "backups" @@ -283,7 +283,7 @@ func (m *migrationE2E) Backup() error { }) } else { // the snapshots of AWS may be still in pending status when do the restore. - // wait for a while to avoid this https://github.com/velero-io/velero/issues/1799 + // wait for a while to avoid this https://github.com/vmware-tanzu/velero/issues/1799 if OriginVeleroCfg.CloudProvider == test.Azure && strings.EqualFold(OriginVeleroCfg.Features, test.FeatureCSI) || OriginVeleroCfg.CloudProvider == test.AWS { diff --git a/test/e2e/nodeagentconfig/cache_pvc.go b/test/e2e/nodeagentconfig/cache_pvc.go index 2f5029215..9104946c7 100644 --- a/test/e2e/nodeagentconfig/cache_pvc.go +++ b/test/e2e/nodeagentconfig/cache_pvc.go @@ -29,13 +29,13 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/builder" - "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/e2e/test" - k8sutil "github.com/velero-io/velero/test/util/k8s" - veleroutil "github.com/velero-io/velero/test/util/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/builder" + "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/e2e/test" + k8sutil "github.com/vmware-tanzu/velero/test/util/k8s" + veleroutil "github.com/vmware-tanzu/velero/test/util/velero" ) type CachePVCTestCase struct { diff --git a/test/e2e/nodeagentconfig/node-agent-config.go b/test/e2e/nodeagentconfig/node-agent-config.go index 115594197..5266bffc5 100644 --- a/test/e2e/nodeagentconfig/node-agent-config.go +++ b/test/e2e/nodeagentconfig/node-agent-config.go @@ -31,15 +31,15 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" - "github.com/velero-io/velero/pkg/builder" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/e2e/test" - k8sutil "github.com/velero-io/velero/test/util/k8s" - veleroutil "github.com/velero-io/velero/test/util/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" + "github.com/vmware-tanzu/velero/pkg/builder" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/e2e/test" + k8sutil "github.com/vmware-tanzu/velero/test/util/k8s" + veleroutil "github.com/vmware-tanzu/velero/test/util/velero" ) type NodeAgentConfigTestCase struct { diff --git a/test/e2e/parallelfilesdownload/parallel_files_download.go b/test/e2e/parallelfilesdownload/parallel_files_download.go index b67af2324..bc4d61323 100644 --- a/test/e2e/parallelfilesdownload/parallel_files_download.go +++ b/test/e2e/parallelfilesdownload/parallel_files_download.go @@ -22,10 +22,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/e2e/test" - "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/e2e/test" + "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) type ParallelFilesDownload struct { diff --git a/test/e2e/parallelfilesupload/parallel_files_upload.go b/test/e2e/parallelfilesupload/parallel_files_upload.go index bc9b6e4c0..b11e3382b 100644 --- a/test/e2e/parallelfilesupload/parallel_files_upload.go +++ b/test/e2e/parallelfilesupload/parallel_files_upload.go @@ -22,10 +22,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/e2e/test" - "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/e2e/test" + "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) type ParallelFilesUpload struct { diff --git a/test/e2e/privilegesmgmt/ssr.go b/test/e2e/privilegesmgmt/ssr.go index e6c7fea7b..9b0e99a0f 100644 --- a/test/e2e/privilegesmgmt/ssr.go +++ b/test/e2e/privilegesmgmt/ssr.go @@ -29,10 +29,10 @@ import ( waitutil "k8s.io/apimachinery/pkg/util/wait" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - v1 "github.com/velero-io/velero/pkg/apis/velero/v1" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/util/k8s" - . "github.com/velero-io/velero/test/util/velero" + v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/velero" ) func SSRTest() { diff --git a/test/e2e/pv-backup/pv-backup-filter.go b/test/e2e/pv-backup/pv-backup-filter.go index df3ae2333..5a6730551 100644 --- a/test/e2e/pv-backup/pv-backup-filter.go +++ b/test/e2e/pv-backup/pv-backup-filter.go @@ -10,11 +10,11 @@ import ( . "github.com/onsi/gomega" "github.com/pkg/errors" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/e2e/test" - "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/e2e/test" + "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) type PVBackupFiltering struct { diff --git a/test/e2e/repomaintenance/repo_maintenance_config.go b/test/e2e/repomaintenance/repo_maintenance_config.go index f874896ec..c0092c4bf 100644 --- a/test/e2e/repomaintenance/repo_maintenance_config.go +++ b/test/e2e/repomaintenance/repo_maintenance_config.go @@ -29,15 +29,15 @@ import ( "k8s.io/apimachinery/pkg/labels" "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - velerotypes "github.com/velero-io/velero/pkg/types" - "github.com/velero-io/velero/pkg/util/kube" - velerokubeutil "github.com/velero-io/velero/pkg/util/kube" - "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/e2e/test" - k8sutil "github.com/velero-io/velero/test/util/k8s" - veleroutil "github.com/velero-io/velero/test/util/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + velerotypes "github.com/vmware-tanzu/velero/pkg/types" + "github.com/vmware-tanzu/velero/pkg/util/kube" + velerokubeutil "github.com/vmware-tanzu/velero/pkg/util/kube" + "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/e2e/test" + k8sutil "github.com/vmware-tanzu/velero/test/util/k8s" + veleroutil "github.com/vmware-tanzu/velero/test/util/velero" ) type RepoMaintenanceTestCase struct { diff --git a/test/e2e/resource-filtering/base.go b/test/e2e/resource-filtering/base.go index 021dac7cc..f4070d9e7 100644 --- a/test/e2e/resource-filtering/base.go +++ b/test/e2e/resource-filtering/base.go @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - . "github.com/velero-io/velero/test/e2e/test" - "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/e2e/test" + "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) type FilteringCase struct { diff --git a/test/e2e/resource-filtering/exclude_label.go b/test/e2e/resource-filtering/exclude_label.go index bd1c297bf..695d7d8ed 100644 --- a/test/e2e/resource-filtering/exclude_label.go +++ b/test/e2e/resource-filtering/exclude_label.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - . "github.com/velero-io/velero/test/e2e/test" - "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/k8s" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + . "github.com/vmware-tanzu/velero/test/e2e/test" + "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) /* diff --git a/test/e2e/resource-filtering/exclude_namespaces.go b/test/e2e/resource-filtering/exclude_namespaces.go index e4be6302f..1b8e5da55 100644 --- a/test/e2e/resource-filtering/exclude_namespaces.go +++ b/test/e2e/resource-filtering/exclude_namespaces.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" - . "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) /* diff --git a/test/e2e/resource-filtering/exclude_resources.go b/test/e2e/resource-filtering/exclude_resources.go index dcee6c7aa..b8a7d2e73 100644 --- a/test/e2e/resource-filtering/exclude_resources.go +++ b/test/e2e/resource-filtering/exclude_resources.go @@ -24,9 +24,9 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) /* diff --git a/test/e2e/resource-filtering/include_namespaces.go b/test/e2e/resource-filtering/include_namespaces.go index 363e4b9a9..d511de212 100644 --- a/test/e2e/resource-filtering/include_namespaces.go +++ b/test/e2e/resource-filtering/include_namespaces.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" - . "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) /* diff --git a/test/e2e/resource-filtering/include_resources.go b/test/e2e/resource-filtering/include_resources.go index 2b86dc59e..22d7e968b 100644 --- a/test/e2e/resource-filtering/include_resources.go +++ b/test/e2e/resource-filtering/include_resources.go @@ -24,8 +24,8 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - . "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) /* diff --git a/test/e2e/resource-filtering/label_selector.go b/test/e2e/resource-filtering/label_selector.go index 6f310f863..9ecc66a0c 100644 --- a/test/e2e/resource-filtering/label_selector.go +++ b/test/e2e/resource-filtering/label_selector.go @@ -24,9 +24,9 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - . "github.com/velero-io/velero/test/e2e/test" - "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/e2e/test" + "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) /* diff --git a/test/e2e/resource-filtering/wildcard_namespaces.go b/test/e2e/resource-filtering/wildcard_namespaces.go index aab0bc3b2..c3cd50071 100644 --- a/test/e2e/resource-filtering/wildcard_namespaces.go +++ b/test/e2e/resource-filtering/wildcard_namespaces.go @@ -23,8 +23,8 @@ import ( . "github.com/onsi/gomega" apierrors "k8s.io/apimachinery/pkg/api/errors" - . "github.com/velero-io/velero/test/e2e/test" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/e2e/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) // WildcardNamespaces tests the inclusion and exclusion of namespaces using wildcards diff --git a/test/e2e/resourcemodifiers/resource_modifiers.go b/test/e2e/resourcemodifiers/resource_modifiers.go index 4e20cd613..06cbd91f1 100644 --- a/test/e2e/resourcemodifiers/resource_modifiers.go +++ b/test/e2e/resourcemodifiers/resource_modifiers.go @@ -24,9 +24,9 @@ import ( . "github.com/onsi/gomega" "github.com/pkg/errors" - . "github.com/velero-io/velero/test/e2e/test" - "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/e2e/test" + "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) var yamlData = ` diff --git a/test/e2e/resourcepolicies/resource_policies.go b/test/e2e/resourcepolicies/resource_policies.go index da68e44f7..f3254eb04 100644 --- a/test/e2e/resourcepolicies/resource_policies.go +++ b/test/e2e/resourcepolicies/resource_policies.go @@ -27,10 +27,10 @@ import ( corev1api "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/e2e/test" - "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/e2e/test" + "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) const FileName = "test-data.txt" diff --git a/test/e2e/scale/multiple_namespaces.go b/test/e2e/scale/multiple_namespaces.go index 4a55539b3..6bc4e4f9a 100644 --- a/test/e2e/scale/multiple_namespaces.go +++ b/test/e2e/scale/multiple_namespaces.go @@ -17,8 +17,8 @@ limitations under the License. package scale import ( - basic "github.com/velero-io/velero/test/e2e/basic/resources-check" - . "github.com/velero-io/velero/test/e2e/test" + basic "github.com/vmware-tanzu/velero/test/e2e/basic/resources-check" + . "github.com/vmware-tanzu/velero/test/e2e/test" ) var MultiNSBackupRestore func() = TestFunc(&basic.MultiNSBackup{IsScaleTest: true}) diff --git a/test/e2e/schedule/in_progress.go b/test/e2e/schedule/in_progress.go index 651905449..060740c3f 100644 --- a/test/e2e/schedule/in_progress.go +++ b/test/e2e/schedule/in_progress.go @@ -11,12 +11,12 @@ import ( "k8s.io/apimachinery/pkg/util/wait" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/test" - framework "github.com/velero-io/velero/test/e2e/test" - "github.com/velero-io/velero/test/util/common" - k8sutil "github.com/velero-io/velero/test/util/k8s" - veleroutil "github.com/velero-io/velero/test/util/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/test" + framework "github.com/vmware-tanzu/velero/test/e2e/test" + "github.com/vmware-tanzu/velero/test/util/common" + k8sutil "github.com/vmware-tanzu/velero/test/util/k8s" + veleroutil "github.com/vmware-tanzu/velero/test/util/velero" ) var ScheduleInProgressTest func() = framework.TestFunc(&InProgressCase{}) diff --git a/test/e2e/schedule/ordered_resources.go b/test/e2e/schedule/ordered_resources.go index d0464bd3a..df0d8b972 100644 --- a/test/e2e/schedule/ordered_resources.go +++ b/test/e2e/schedule/ordered_resources.go @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -//the ordered resources test related to https://github.com/velero-io/velero/issues/4561 +//the ordered resources test related to https://github.com/vmware-tanzu/velero/issues/4561 import ( "context" "fmt" @@ -30,11 +30,11 @@ import ( waitutil "k8s.io/apimachinery/pkg/util/wait" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - framework "github.com/velero-io/velero/test/e2e/test" - "github.com/velero-io/velero/test/util/common" - k8sutil "github.com/velero-io/velero/test/util/k8s" - veleroutil "github.com/velero-io/velero/test/util/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + framework "github.com/vmware-tanzu/velero/test/e2e/test" + "github.com/vmware-tanzu/velero/test/util/common" + k8sutil "github.com/vmware-tanzu/velero/test/util/k8s" + veleroutil "github.com/vmware-tanzu/velero/test/util/velero" ) var ScheduleOrderedResources func() = framework.TestFunc(&OrderedResources{}) diff --git a/test/e2e/schedule/periodical.go b/test/e2e/schedule/periodical.go index cb904d00e..330356e99 100644 --- a/test/e2e/schedule/periodical.go +++ b/test/e2e/schedule/periodical.go @@ -10,10 +10,10 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/util/wait" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - framework "github.com/velero-io/velero/test/e2e/test" - k8sutil "github.com/velero-io/velero/test/util/k8s" - veleroutil "github.com/velero-io/velero/test/util/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + framework "github.com/vmware-tanzu/velero/test/e2e/test" + k8sutil "github.com/vmware-tanzu/velero/test/util/k8s" + veleroutil "github.com/vmware-tanzu/velero/test/util/velero" ) type PeriodicalCase struct { diff --git a/test/e2e/test/test.go b/test/e2e/test/test.go index dda3f3870..1a91c115f 100644 --- a/test/e2e/test/test.go +++ b/test/e2e/test/test.go @@ -27,10 +27,10 @@ import ( . "github.com/onsi/gomega" "github.com/pkg/errors" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/util/k8s" - . "github.com/velero-io/velero/test/util/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/velero" ) /* @@ -146,8 +146,8 @@ func (t *TestCase) Restore() error { veleroCfg := t.GetTestCase().VeleroCfg // the snapshots of AWS may be still in pending status when do the restore, wait for a while - // to avoid this https://github.com/velero-io/velero/issues/1799 - // TODO remove this after https://github.com/velero-io/velero/issues/3533 is fixed + // to avoid this https://github.com/vmware-tanzu/velero/issues/1799 + // TODO remove this after https://github.com/vmware-tanzu/velero/issues/3533 is fixed By("Waiting 5 minutes to make sure the snapshots are ready...", func() { if t.UseVolumeSnapshots && veleroCfg.CloudProvider != Vsphere { time.Sleep(5 * time.Minute) diff --git a/test/e2e/upgrade/upgrade.go b/test/e2e/upgrade/upgrade.go index 91ade0cfa..6d081f1c1 100644 --- a/test/e2e/upgrade/upgrade.go +++ b/test/e2e/upgrade/upgrade.go @@ -26,11 +26,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/util/k8s" - . "github.com/velero-io/velero/test/util/kibishii" - . "github.com/velero-io/velero/test/util/providers" - . "github.com/velero-io/velero/test/util/velero" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/kibishii" + . "github.com/vmware-tanzu/velero/test/util/providers" + . "github.com/vmware-tanzu/velero/test/util/velero" ) var upgradeNamespace string @@ -236,8 +236,8 @@ func BackupUpgradeRestoreTest(useVolumeSnapshots bool, veleroCLI2Version VeleroC }) } // the snapshots of AWS may be still in pending status when do the restore, wait for a while - // to avoid this https://github.com/velero-io/velero/issues/1799 - // TODO remove this after https://github.com/velero-io/velero/issues/3533 is fixed + // to avoid this https://github.com/vmware-tanzu/velero/issues/1799 + // TODO remove this after https://github.com/vmware-tanzu/velero/issues/3533 is fixed if tmpCfg.CloudProvider == AWS && useVolumeSnapshots { fmt.Println("Waiting 5 minutes to make sure the snapshots are ready...") time.Sleep(5 * time.Minute) diff --git a/test/perf/README.md b/test/perf/README.md index 79e99d95d..a3dd295ba 100644 --- a/test/perf/README.md +++ b/test/perf/README.md @@ -2,4 +2,4 @@ Document for running Velero end-to-end performance test suite. -And the data generate tool for performance test could be found in [here](https://github.com/velero-io/velero-performance-test) \ No newline at end of file +And the data generate tool for performance test could be found in [here](https://github.com/vmware-tanzu/velero-performance-test) \ No newline at end of file diff --git a/test/perf/backup/backup.go b/test/perf/backup/backup.go index 91c5ff9b0..c8c39a6e1 100644 --- a/test/perf/backup/backup.go +++ b/test/perf/backup/backup.go @@ -21,8 +21,8 @@ import ( "strings" "time" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/perf/test" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/perf/test" ) type BackupTest struct { diff --git a/test/perf/basic/basic.go b/test/perf/basic/basic.go index 5ebbf70c1..76bf605a6 100644 --- a/test/perf/basic/basic.go +++ b/test/perf/basic/basic.go @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/perf/test" - "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/perf/test" + "github.com/vmware-tanzu/velero/test/util/k8s" ) type BasicTest struct { diff --git a/test/perf/e2e_suite_test.go b/test/perf/e2e_suite_test.go index a54215dc5..48a5ceec9 100644 --- a/test/perf/e2e_suite_test.go +++ b/test/perf/e2e_suite_test.go @@ -27,15 +27,15 @@ import ( . "github.com/onsi/gomega" "github.com/pkg/errors" - "github.com/velero-io/velero/pkg/cmd/cli/install" - . "github.com/velero-io/velero/test" - "github.com/velero-io/velero/test/perf/backup" - "github.com/velero-io/velero/test/perf/basic" - "github.com/velero-io/velero/test/perf/restore" - "github.com/velero-io/velero/test/perf/test" - . "github.com/velero-io/velero/test/util/k8s" - "github.com/velero-io/velero/test/util/report" - . "github.com/velero-io/velero/test/util/velero" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/install" + . "github.com/vmware-tanzu/velero/test" + "github.com/vmware-tanzu/velero/test/perf/backup" + "github.com/vmware-tanzu/velero/test/perf/basic" + "github.com/vmware-tanzu/velero/test/perf/restore" + "github.com/vmware-tanzu/velero/test/perf/test" + . "github.com/vmware-tanzu/velero/test/util/k8s" + "github.com/vmware-tanzu/velero/test/util/report" + . "github.com/vmware-tanzu/velero/test/util/velero" ) func init() { diff --git a/test/perf/metrics/minio.go b/test/perf/metrics/minio.go index ecb20a3d3..8ea7ae4c3 100644 --- a/test/perf/metrics/minio.go +++ b/test/perf/metrics/minio.go @@ -19,7 +19,7 @@ package metrics import ( "github.com/pkg/errors" - "github.com/velero-io/velero/test/util/metrics" + "github.com/vmware-tanzu/velero/test/util/metrics" ) const MinioDesc = "Minio disk usage" diff --git a/test/perf/metrics/nfs.go b/test/perf/metrics/nfs.go index 6b0946342..043a4f976 100644 --- a/test/perf/metrics/nfs.go +++ b/test/perf/metrics/nfs.go @@ -21,7 +21,7 @@ import ( "github.com/pkg/errors" - "github.com/velero-io/velero/test/util/metrics" + "github.com/vmware-tanzu/velero/test/util/metrics" ) const NFSDesc = "NFS disk usage" diff --git a/test/perf/metrics/pod.go b/test/perf/metrics/pod.go index cedb89cdc..56572f672 100644 --- a/test/perf/metrics/pod.go +++ b/test/perf/metrics/pod.go @@ -26,7 +26,7 @@ import ( metricsclientset "k8s.io/metrics/pkg/client/clientset/versioned" - "github.com/velero-io/velero/test/util/metrics" + "github.com/vmware-tanzu/velero/test/util/metrics" ) const PodResourceDesc = "Resource consumption" diff --git a/test/perf/restore/restore.go b/test/perf/restore/restore.go index 2aedc4d48..6adbff5f4 100644 --- a/test/perf/restore/restore.go +++ b/test/perf/restore/restore.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" - . "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test/perf/test" - "github.com/velero-io/velero/test/util/k8s" - . "github.com/velero-io/velero/test/util/velero" + . "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test/perf/test" + "github.com/vmware-tanzu/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/velero" ) type RestoreTest struct { diff --git a/test/perf/test/test.go b/test/perf/test/test.go index f40165cd9..1bc8a3fc0 100644 --- a/test/perf/test/test.go +++ b/test/perf/test/test.go @@ -26,13 +26,13 @@ import ( . "github.com/onsi/gomega" "github.com/pkg/errors" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - . "github.com/velero-io/velero/test" - "github.com/velero-io/velero/test/perf/metrics" - . "github.com/velero-io/velero/test/util/k8s" - "github.com/velero-io/velero/test/util/report" - "github.com/velero-io/velero/test/util/velero" - . "github.com/velero-io/velero/test/util/velero" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + . "github.com/vmware-tanzu/velero/test" + "github.com/vmware-tanzu/velero/test/perf/metrics" + . "github.com/vmware-tanzu/velero/test/util/k8s" + "github.com/vmware-tanzu/velero/test/util/report" + "github.com/vmware-tanzu/velero/test/util/velero" + . "github.com/vmware-tanzu/velero/test/util/velero" ) /* diff --git a/test/pkg/client/client.go b/test/pkg/client/client.go index 9ac1f1d55..331b786f2 100644 --- a/test/pkg/client/client.go +++ b/test/pkg/client/client.go @@ -24,7 +24,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "github.com/velero-io/velero/pkg/buildinfo" + "github.com/vmware-tanzu/velero/pkg/buildinfo" ) func buildConfigFromFlags(context, kubeconfigPath string, precedence []string) (*rest.Config, error) { diff --git a/test/pkg/client/factory.go b/test/pkg/client/factory.go index c5d089ea5..340cba587 100644 --- a/test/pkg/client/factory.go +++ b/test/pkg/client/factory.go @@ -32,8 +32,8 @@ import ( "k8s.io/client-go/rest" metricsclientset "k8s.io/metrics/pkg/client/clientset/versioned" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1" ) // Factory knows how to create a VeleroClient and Kubernetes client. diff --git a/test/types.go b/test/types.go index f2aa135c3..ef9582ce3 100644 --- a/test/types.go +++ b/test/types.go @@ -21,8 +21,8 @@ import ( "github.com/google/uuid" - "github.com/velero-io/velero/pkg/cmd/cli/install" - "github.com/velero-io/velero/test/util/k8s" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/install" + "github.com/vmware-tanzu/velero/test/util/k8s" ) // e2e-storage-class is the default StorageClass for E2E. diff --git a/test/util/csi/common.go b/test/util/csi/common.go index 0d36cb530..373bc1502 100644 --- a/test/util/csi/common.go +++ b/test/util/csi/common.go @@ -28,7 +28,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - . "github.com/velero-io/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) func GetClients() (*kubernetes.Clientset, *snapshotterClientSet.Clientset, error) { diff --git a/test/util/eks/eks.go b/test/util/eks/eks.go index 56a1d0736..f2e491c1f 100644 --- a/test/util/eks/eks.go +++ b/test/util/eks/eks.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" - veleroexec "github.com/velero-io/velero/pkg/util/exec" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) func KubectlDeleteIAMServiceAcount(ctx context.Context, name, namespace, cluster string) error { diff --git a/test/util/k8s/client.go b/test/util/k8s/client.go index 5c1779f61..1018e3bdf 100644 --- a/test/util/k8s/client.go +++ b/test/util/k8s/client.go @@ -21,7 +21,7 @@ import ( metricsclientset "k8s.io/metrics/pkg/client/clientset/versioned" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/test/pkg/client" + "github.com/vmware-tanzu/velero/test/pkg/client" ) // TestClient contains different API clients that are in use throughout diff --git a/test/util/k8s/clusterrolebinding.go b/test/util/k8s/clusterrolebinding.go index 95b804304..e682c0bdc 100644 --- a/test/util/k8s/clusterrolebinding.go +++ b/test/util/k8s/clusterrolebinding.go @@ -23,7 +23,7 @@ import ( "context" - veleroexec "github.com/velero-io/velero/pkg/util/exec" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) func KubectlDeleteClusterRoleBinding(ctx context.Context, name string) error { diff --git a/test/util/k8s/common.go b/test/util/k8s/common.go index 368da15b6..8869caab3 100644 --- a/test/util/k8s/common.go +++ b/test/util/k8s/common.go @@ -30,9 +30,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - "github.com/velero-io/velero/pkg/builder" - veleroexec "github.com/velero-io/velero/pkg/util/exec" - common "github.com/velero-io/velero/test/util/common" + "github.com/vmware-tanzu/velero/pkg/builder" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" + common "github.com/vmware-tanzu/velero/test/util/common" ) // ensureClusterExists returns whether or not a Kubernetes cluster exists for tests to be run on. diff --git a/test/util/k8s/crd.go b/test/util/k8s/crd.go index 5d1379b64..fe17fb0ae 100644 --- a/test/util/k8s/crd.go +++ b/test/util/k8s/crd.go @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" - veleroexec "github.com/velero-io/velero/pkg/util/exec" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) func InstallCRD(ctx context.Context, yaml string) error { diff --git a/test/util/k8s/deployment.go b/test/util/k8s/deployment.go index c172604ff..42e2d6ac7 100644 --- a/test/util/k8s/deployment.go +++ b/test/util/k8s/deployment.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" - "github.com/velero-io/velero/pkg/util/boolptr" - common "github.com/velero-io/velero/test/util/common" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + common "github.com/vmware-tanzu/velero/test/util/common" ) const ( diff --git a/test/util/k8s/namespace.go b/test/util/k8s/namespace.go index 59454c1a7..b46075fee 100644 --- a/test/util/k8s/namespace.go +++ b/test/util/k8s/namespace.go @@ -31,8 +31,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" waitutil "k8s.io/apimachinery/pkg/util/wait" - "github.com/velero-io/velero/pkg/builder" - veleroexec "github.com/velero-io/velero/pkg/util/exec" + "github.com/vmware-tanzu/velero/pkg/builder" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) func CreateNamespace(ctx context.Context, client TestClient, namespace string) error { diff --git a/test/util/k8s/node.go b/test/util/k8s/node.go index 949c75aaf..5fd1dafc6 100644 --- a/test/util/k8s/node.go +++ b/test/util/k8s/node.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - common "github.com/velero-io/velero/test/util/common" + common "github.com/vmware-tanzu/velero/test/util/common" ) func GetWorkerNodes(ctx context.Context, workerOS string) ([]string, error) { diff --git a/test/util/k8s/pod.go b/test/util/k8s/pod.go index 7b8e04a83..9906e08b5 100644 --- a/test/util/k8s/pod.go +++ b/test/util/k8s/pod.go @@ -27,8 +27,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/velero-io/velero/pkg/util/boolptr" - common "github.com/velero-io/velero/test/util/common" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" + common "github.com/vmware-tanzu/velero/test/util/common" ) func CreatePod( diff --git a/test/util/k8s/serviceaccount.go b/test/util/k8s/serviceaccount.go index 7f6b0fa8e..31773d846 100644 --- a/test/util/k8s/serviceaccount.go +++ b/test/util/k8s/serviceaccount.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" - "github.com/velero-io/velero/pkg/builder" + "github.com/vmware-tanzu/velero/pkg/builder" ) func WaitUntilServiceAccountCreated(ctx context.Context, client TestClient, namespace, serviceAccount string, timeout time.Duration) error { diff --git a/test/util/k8s/statefulset.go b/test/util/k8s/statefulset.go index 6699a731b..f0ac3a651 100644 --- a/test/util/k8s/statefulset.go +++ b/test/util/k8s/statefulset.go @@ -24,7 +24,7 @@ import ( "github.com/pkg/errors" - veleroexec "github.com/velero-io/velero/pkg/util/exec" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) func ScaleStatefulSet(ctx context.Context, namespace, name string, replicas int) error { diff --git a/test/util/kibishii/kibishii_utils.go b/test/util/kibishii/kibishii_utils.go index 175938438..5948a2c7b 100644 --- a/test/util/kibishii/kibishii_utils.go +++ b/test/util/kibishii/kibishii_utils.go @@ -35,12 +35,12 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/yaml" - veleroexec "github.com/velero-io/velero/pkg/util/exec" - . "github.com/velero-io/velero/test" - "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/k8s" - . "github.com/velero-io/velero/test/util/providers" - . "github.com/velero-io/velero/test/util/velero" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" + . "github.com/vmware-tanzu/velero/test" + "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/k8s" + . "github.com/vmware-tanzu/velero/test/util/providers" + . "github.com/vmware-tanzu/velero/test/util/velero" ) const ( diff --git a/test/util/metrics/minio.go b/test/util/metrics/minio.go index 1f0dc44cd..163212713 100644 --- a/test/util/metrics/minio.go +++ b/test/util/metrics/minio.go @@ -19,7 +19,7 @@ package metrics import ( "github.com/pkg/errors" - "github.com/velero-io/velero/test/util/providers" + "github.com/vmware-tanzu/velero/test/util/providers" ) func GetMinioDiskUsage(cloudCredentialsFile string, bslBucket string, bslPrefix string, bslConfig string) (int64, error) { diff --git a/test/util/providers/aws_utils.go b/test/util/providers/aws_utils.go index 7750749f8..7b8916cef 100644 --- a/test/util/providers/aws_utils.go +++ b/test/util/providers/aws_utils.go @@ -38,8 +38,8 @@ import ( s3types "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/pkg/errors" - "github.com/velero-io/velero/pkg/cmd/util/flag" - "github.com/velero-io/velero/test" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" + "github.com/vmware-tanzu/velero/test" ) type AWSStorage string diff --git a/test/util/providers/azure_utils.go b/test/util/providers/azure_utils.go index 79375ec8e..468dbfe40 100644 --- a/test/util/providers/azure_utils.go +++ b/test/util/providers/azure_utils.go @@ -39,8 +39,8 @@ import ( "github.com/joho/godotenv" "github.com/pkg/errors" - "github.com/velero-io/velero/pkg/cmd/util/flag" - . "github.com/velero-io/velero/test" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" + . "github.com/vmware-tanzu/velero/test" ) type AzureStorage string diff --git a/test/util/providers/common.go b/test/util/providers/common.go index 2e915c460..a7c68dc37 100644 --- a/test/util/providers/common.go +++ b/test/util/providers/common.go @@ -27,9 +27,9 @@ import ( "github.com/pkg/errors" - "github.com/velero-io/velero/internal/volume" - velerotest "github.com/velero-io/velero/test" - velero "github.com/velero-io/velero/test/util/velero" + "github.com/vmware-tanzu/velero/internal/volume" + velerotest "github.com/vmware-tanzu/velero/test" + velero "github.com/vmware-tanzu/velero/test/util/velero" ) type ObjectsInStorage interface { diff --git a/test/util/providers/gcloud_utils.go b/test/util/providers/gcloud_utils.go index 571a6f3d9..022d92ff2 100644 --- a/test/util/providers/gcloud_utils.go +++ b/test/util/providers/gcloud_utils.go @@ -32,7 +32,7 @@ import ( "google.golang.org/api/iterator" "google.golang.org/api/option" - "github.com/velero-io/velero/test" + "github.com/vmware-tanzu/velero/test" ) type GCSStorage string diff --git a/test/util/report/report.go b/test/util/report/report.go index 04bc6a209..6d5955392 100644 --- a/test/util/report/report.go +++ b/test/util/report/report.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v3" - "github.com/velero-io/velero/test" + "github.com/vmware-tanzu/velero/test" ) func GenerateYamlReport() error { diff --git a/test/util/velero/install.go b/test/util/velero/install.go index 02eacf28c..e2c57392e 100644 --- a/test/util/velero/install.go +++ b/test/util/velero/install.go @@ -39,13 +39,13 @@ import ( clientset "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/client" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/cmd/cli/install" - velerexec "github.com/velero-io/velero/pkg/util/exec" - "github.com/velero-io/velero/test" - common "github.com/velero-io/velero/test/util/common" - eksutil "github.com/velero-io/velero/test/util/eks" - "github.com/velero-io/velero/test/util/k8s" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/cmd/cli/install" + velerexec "github.com/vmware-tanzu/velero/pkg/util/exec" + "github.com/vmware-tanzu/velero/test" + common "github.com/vmware-tanzu/velero/test/util/common" + eksutil "github.com/vmware-tanzu/velero/test/util/eks" + "github.com/vmware-tanzu/velero/test/util/k8s" ) // we provide more install options other than the standard install.InstallOptions in E2E test @@ -222,7 +222,7 @@ func VeleroInstall(ctx context.Context, veleroCfg *test.VeleroConfig, isStandbyC } // generateVSpherePlugin refers to -// https://github.com/velero-io/velero-plugin-for-vsphere/blob/v1.3.0/docs/vanilla.md +// https://github.com/vmware-tanzu/velero-plugin-for-vsphere/blob/v1.3.0/docs/vanilla.md func generateVSpherePlugin(veleroCfg *test.VeleroConfig) error { cli := veleroCfg.ClientToInstallVelero @@ -927,7 +927,7 @@ func VeleroUninstall(ctx context.Context, veleroCfg test.VeleroConfig) error { } // createVCCredentialSecret refer to -// https://github.com/velero-io/velero-plugin-for-vsphere/blob/v1.3.0/docs/vanilla.md +// https://github.com/vmware-tanzu/velero-plugin-for-vsphere/blob/v1.3.0/docs/vanilla.md func createVCCredentialSecret(c clientset.Interface, veleroNamespace string) error { secret, err := getVCCredentialSecret(c) if err != nil { @@ -970,7 +970,7 @@ func createVCCredentialSecret(c clientset.Interface, veleroNamespace string) err return nil } -// Reference https://github.com/velero-io/velero-plugin-for-vsphere/blob/main/docs/vanilla.md#create-vc-credential-secret +// Reference https://github.com/vmware-tanzu/velero-plugin-for-vsphere/blob/main/docs/vanilla.md#create-vc-credential-secret // Read secret from kube-system namespace first, if not found, try with vmware-system-csi. func getVCCredentialSecret(c clientset.Interface) (secret *corev1api.Secret, err error) { secret, err = k8s.GetSecret(c, test.KubeSystemNamespace, "vsphere-config-secret") diff --git a/test/util/velero/velero_utils.go b/test/util/velero/velero_utils.go index dc1ddc4a8..5c9b39a84 100644 --- a/test/util/velero/velero_utils.go +++ b/test/util/velero/velero_utils.go @@ -45,16 +45,16 @@ import ( "k8s.io/apimachinery/pkg/util/wait" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/volume" - velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" - "github.com/velero-io/velero/pkg/builder" - cliinstall "github.com/velero-io/velero/pkg/cmd/cli/install" - "github.com/velero-io/velero/pkg/cmd/util/flag" - veleroexec "github.com/velero-io/velero/pkg/util/exec" - "github.com/velero-io/velero/test" - . "github.com/velero-io/velero/test" - common "github.com/velero-io/velero/test/util/common" - . "github.com/velero-io/velero/test/util/k8s" + "github.com/vmware-tanzu/velero/internal/volume" + velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" + "github.com/vmware-tanzu/velero/pkg/builder" + cliinstall "github.com/vmware-tanzu/velero/pkg/cmd/cli/install" + "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" + veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" + "github.com/vmware-tanzu/velero/test" + . "github.com/vmware-tanzu/velero/test" + common "github.com/vmware-tanzu/velero/test/util/common" + . "github.com/vmware-tanzu/velero/test/util/k8s" ) const BackupObjectsPrefix = "backups" @@ -477,7 +477,7 @@ func VeleroBackupNamespace(ctx context.Context, veleroCLI, veleroNamespace strin args = append(args, "--default-volumes-to-fs-backup") } - // To workaround https://github.com/velero-io/velero-plugin-for-vsphere/issues/347 for vsphere plugin v1.1.1 + // To workaround https://github.com/vmware-tanzu/velero-plugin-for-vsphere/issues/347 for vsphere plugin v1.1.1 // if the "--snapshot-volumes=false" isn't specified explicitly, the vSphere plugin will always take snapshots // for the volumes even though the "--default-volumes-to-fs-backup" is specified // TODO This can be removed if the logic of vSphere plugin bump up to 1.3 @@ -946,7 +946,7 @@ func InstallVeleroCLI(ctx context.Context, version string) (string, error) { postfix := ".tar.gz" tarball := name + postfix err := wait.PollUntilContextTimeout(ctx, time.Second*5, time.Minute*5, true, func(ctx context.Context) (bool, error) { - tempFile, err := getVeleroCliTarball("https://github.com/velero-io/velero/releases/download/" + version + "/" + tarball) + tempFile, err := getVeleroCliTarball("https://github.com/vmware-tanzu/velero/releases/download/" + version + "/" + tarball) if err != nil { return false, errors.WithMessagef(err, "failed to get Velero CLI tarball") }