diff --git a/.github/workflows/push-builder.yml b/.github/workflows/push-builder.yml index cb0f37486..4460e2322 100644 --- a/.github/workflows/push-builder.yml +++ b/.github/workflows/push-builder.yml @@ -2,7 +2,7 @@ name: build-image on: push: - branches: [ master ] + branches: [ main ] paths: - 'hack/build-image/Dockerfile' diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 996c9780e..ac9fde064 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,8 +1,8 @@ -name: Master CI +name: Main CI on: push: - branches: [ master ] + branches: [ main ] tags: - '*' diff --git a/CHANGELOG.md b/CHANGELOG.md index 83ecf265b..29c8ff58c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,18 +20,18 @@ * [CHANGELOG-0.3.md][1] -[14]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-1.4.md -[13]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-1.3.md -[12]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-1.2.md -[11]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-1.1.md -[10]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-1.0.md -[9]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.11.md -[8]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.10.md -[7]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.9.md -[6]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.8.md -[5]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.7.md -[4]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.6.md -[3]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.5.md -[2]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.4.md -[1]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-0.3.md -[0]: https://github.com/vmware-tanzu/velero/blob/master/changelogs/unreleased +[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/Makefile b/Makefile index 74f83447c..1ad3f0bbf 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ BUILDER_IMAGE_CACHED := $(shell docker images -q ${BUILDER_IMAGE} 2>/dev/null ) local : ARCH ?= $(shell go env GOOS)-$(shell go env GOARCH) ARCH ?= linux-amd64 -VERSION ?= master +VERSION ?= main TAG_LATEST ?= false diff --git a/changelogs/CHANGELOG-0.10.md b/changelogs/CHANGELOG-0.10.md index e4114ad81..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/heptio/ark/blob/master/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/heptio/ark/blob/master/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 @@ -89,7 +89,7 @@ need to be updated for v0.10. - [ec013e6f](https://github.com/heptio/ark/commit/ec013e6f) Document upgrading plugins in the deployment - [d6162e94](https://github.com/heptio/ark/commit/d6162e94) fix goreleaser bugs - [a15df276](https://github.com/heptio/ark/commit/a15df276) Add correct link and change role -- [46bed015](https://github.com/heptio/ark/commit/46bed015) add 0.10 breaking changes warning to readme in master +- [46bed015](https://github.com/heptio/ark/commit/46bed015) add 0.10 breaking changes warning to readme in main - [e3a7d6a2](https://github.com/heptio/ark/commit/e3a7d6a2) add content for issue 994 - [400911e9](https://github.com/heptio/ark/commit/400911e9) address docs issue #978 - [b818cc27](https://github.com/heptio/ark/commit/b818cc27) don't require a default provider VSL if there's only 1 @@ -247,7 +247,7 @@ need to be updated for v0.10. - [5b89f7b6](https://github.com/heptio/ark/commit/5b89f7b6) Skip backup sync if it already exists in k8s - [c6050845](https://github.com/heptio/ark/commit/c6050845) restore controller: switch to 'c' for receiver name - [706ae07d](https://github.com/heptio/ark/commit/706ae07d) enable a schedule to be provided as the source for a restore -- [aea68414](https://github.com/heptio/ark/commit/aea68414) fix up Slack link in troubleshooting on master branch +- [aea68414](https://github.com/heptio/ark/commit/aea68414) fix up Slack link in troubleshooting on main branch - [bb8e2e91](https://github.com/heptio/ark/commit/bb8e2e91) Document how to run the Ark server locally - [dc84e591](https://github.com/heptio/ark/commit/dc84e591) Remove outdated namespace deletion content - [23abbc9a](https://github.com/heptio/ark/commit/23abbc9a) fix paths diff --git a/changelogs/CHANGELOG-0.9.md b/changelogs/CHANGELOG-0.9.md index 5b6b5ad88..4d8cfdfb6 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/heptio/ark/blob/master/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.3.md b/changelogs/CHANGELOG-1.3.md index 78e3a18f6..58dbd7db7 100644 --- a/changelogs/CHANGELOG-1.3.md +++ b/changelogs/CHANGELOG-1.3.md @@ -90,7 +90,7 @@ We fixed a large number of bugs and made some smaller usability improvements in ### All Changes - * Corrected the selfLink for Backup CR in site/docs/master/output-file-format.md (#2292, @RushinthJohn) + * Corrected the selfLink for Backup CR in site/docs/main/output-file-format.md (#2292, @RushinthJohn) * Back up schema-less CustomResourceDefinitions as v1beta1, even if they are retrieved via the v1 endpoint. (#2264, @nrb) * Bug fix: restic backup volume snapshot to the second location failed (#2244, @jenting) * Added support of using PV name from volumesnapshotter('SetVolumeID') in case of PV renaming during the restore (#2216, @mynktl) diff --git a/design/cli-install-changes.md b/design/cli-install-changes.md index 11ba6b6ea..3464ce0e5 100644 --- a/design/cli-install-changes.md +++ b/design/cli-install-changes.md @@ -276,7 +276,7 @@ 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/vmware-tanzu/velero/blob/master/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/vmware-tanzu/velero/pull/2259#discussion_r384700723 for more clarification. @@ -370,4 +370,4 @@ https://github.com/jpeach/contour/tree/1c575c772e9fd747fba72ae41ab99bdae7a01864/ ## Security Considerations -N/A \ No newline at end of file +N/A diff --git a/design/csi-snapshots.md b/design/csi-snapshots.md index 48940e38c..292e8ca53 100644 --- a/design/csi-snapshots.md +++ b/design/csi-snapshots.md @@ -306,16 +306,16 @@ Without these objects, the provider-level snapshots cannot be located in order t [1]: https://kubernetes.io/blog/2018/10/09/introducing-volume-snapshot-alpha-for-kubernetes/ [2]: https://github.com/kubernetes-csi/external-snapshotter/blob/master/pkg/apis/volumesnapshot/v1alpha1/types.go#L41 [3]: https://github.com/kubernetes-csi/external-snapshotter/blob/master/pkg/apis/volumesnapshot/v1alpha1/types.go#L161 -[4]: https://github.com/heptio/velero/blob/master/pkg/volume/snapshot.go#L21 -[5]: https://github.com/heptio/velero/blob/master/pkg/apis/velero/v1/pod_volume_backup.go#L88 +[4]: https://github.com/heptio/velero/blob/main/pkg/volume/snapshot.go#L21 +[5]: https://github.com/heptio/velero/blob/main/pkg/apis/velero/v1/pod_volume_backup.go#L88 [6]: https://github.com/heptio/velero-csi-plugin/ -[7]: https://github.com/heptio/velero/blob/master/pkg/plugin/velero/volume_snapshotter.go#L26 -[8]: https://github.com/heptio/velero/blob/master/pkg/controller/backup_controller.go#L560 -[9]: https://github.com/heptio/velero/blob/master/pkg/persistence/object_store.go#L46 -[10]: https://github.com/heptio/velero/blob/master/pkg/apis/velero/v1/labels_annotations.go#L21 -[11]: https://github.com/heptio/velero/blob/master/pkg/cmd/server/server.go#L471 -[12]: https://github.com/heptio/velero/blob/master/pkg/cmd/util/output/backup_describer.go -[13]: https://github.com/heptio/velero/blob/master/pkg/cmd/util/output/backup_describer.go#L214 +[7]: https://github.com/heptio/velero/blob/main/pkg/plugin/velero/volume_snapshotter.go#L26 +[8]: https://github.com/heptio/velero/blob/main/pkg/controller/backup_controller.go#L560 +[9]: https://github.com/heptio/velero/blob/main/pkg/persistence/object_store.go#L46 +[10]: https://github.com/heptio/velero/blob/main/pkg/apis/velero/v1/labels_annotations.go#L21 +[11]: https://github.com/heptio/velero/blob/main/pkg/cmd/server/server.go#L471 +[12]: https://github.com/heptio/velero/blob/main/pkg/cmd/util/output/backup_describer.go +[13]: https://github.com/heptio/velero/blob/main/pkg/cmd/util/output/backup_describer.go#L214 [14]: https://github.com/kubernetes/kubernetes/blob/8ea9edbb0290e9de1e6d274e816a4002892cca6f/pkg/controller/volume/persistentvolume/util/util.go#L69 [15]: https://github.com/kubernetes/kubernetes/pull/30285 [16]: https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/core/types.go#L237 diff --git a/design/custom-ca-support.md b/design/custom-ca-support.md index 60f80157d..05bf9e769 100644 --- a/design/custom-ca-support.md +++ b/design/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/vmware-tanzu/velero/blob/master/pkg/restic/repository_manager.go#L238-L245) -[2](https://github.com/vmware-tanzu/velero/blob/master/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/vmware-tanzu/velero-plugin-for-aws/blob/master/velero-plugin-for-aws/object_store.go#L135 -[2]: https://github.com/vmware-tanzu/velero/blob/master/pkg/restic/command.go#L47 -[3]: https://github.com/restic/restic/blob/master/internal/backend/http_transport.go#L81 -[4]: https://github.com/vmware-tanzu/velero-plugin-for-aws/blob/master/velero-plugin-for-aws/object_store.go#L154 +[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/vmware-tanzu/velero-plugin-for-aws/blob/main/velero-plugin-for-aws/object_store.go#L154 diff --git a/design/feature-flags.md b/design/feature-flags.md index b6382c64f..836a01b79 100644 --- a/design/feature-flags.md +++ b/design/feature-flags.md @@ -3,7 +3,7 @@ Status: Accepted Some features may take a while to get fully implemented, and we don't necessarily want to have long-lived feature branches -A simple feature flag implementation allows code to be merged into master, but not used unless a flag is set. +A simple feature flag implementation allows code to be merged into main, but not used unless a flag is set. ## Goals diff --git a/design/plugin-backup-and-restore-progress-design.md b/design/plugin-backup-and-restore-progress-design.md index 4e2cbc52e..549023cf6 100644 --- a/design/plugin-backup-and-restore-progress-design.md +++ b/design/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/vmware-tanzu/velero/blob/master/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/vmware-tanzu/velero/blob/master/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/vmware-tanzu/velero/blob/master/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/pv-cloning.md b/design/pv-cloning.md index 9d4828ee5..f840bda84 100644 --- a/design/pv-cloning.md +++ b/design/pv-cloning.md @@ -32,14 +32,14 @@ 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/heptio/velero/blob/master/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/heptio/velero/blob/master/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/master/pkg/restore/restore.go#L987), Velero will check to see if the claimed persistent volume has been renamed by looking in `ctx.renamedPVs`. +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`. If so, Velero will update the persistent volume claim's `spec.volumeName` to the new name. ## Alternatives Considered diff --git a/hack/changelog-check.sh b/hack/changelog-check.sh index bbb0260c4..f2e2fb0f9 100755 --- a/hack/changelog-check.sh +++ b/hack/changelog-check.sh @@ -14,9 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# docker-push is invoked by the CI/CD system to deploy docker images to Docker Hub. -# It will build images for all commits to master and all git tags. -# The highest, non-prerelease semantic version will also be given the `latest` tag. set +x @@ -37,7 +34,7 @@ if ls ${change_log_file} 1> /dev/null 2>&1; then echo "changelog for PR ${pr_number} exists" exit 0 else - echo "PR ${pr_number} is missing a changelog. Please refer https://velero.io/docs/master/code-standards/#adding-a-changelog and add a changelog." + echo "PR ${pr_number} is missing a changelog. Please refer https://velero.io/docs/main/code-standards/#adding-a-changelog and add a changelog." exit 1 fi diff --git a/hack/docker-push.sh b/hack/docker-push.sh index 4001bc369..52da7cb66 100755 --- a/hack/docker-push.sh +++ b/hack/docker-push.sh @@ -15,7 +15,7 @@ # limitations under the License. # docker-push is invoked by the CI/CD system to deploy docker images to Docker Hub. -# It will build images for all commits to master and all git tags. +# It will build images for all commits to main and all git tags. # The highest, non-prerelease semantic version will also be given the `latest` tag. set +x @@ -56,24 +56,24 @@ elif [[ "$triggeredBy" == "tags" ]]; then TAG=$(echo $GITHUB_REF | cut -d / -f 3) fi -if [[ "$BRANCH" == "master" ]]; then +if [[ "$BRANCH" == "main" ]]; then VERSION="$BRANCH" elif [[ ! -z "$TAG" ]]; then # Explicitly checkout tags when building from a git tag. - # This is not needed when building from master + # This is not needed when building from main git fetch --tags # Calculate the latest release if there's a tag. highest_release VERSION="$TAG" else - echo "We're not on master and we're not building a tag, exit early." + echo "We're not on main and we're not building a tag, exit early." exit 0 fi -# Assume we're not tagging `latest` by default, and never on master. +# Assume we're not tagging `latest` by default, and never on main. TAG_LATEST=false -if [[ "$BRANCH" == "master" ]]; then - echo "Building master, not tagging latest." +if [[ "$BRANCH" == "main" ]]; then + echo "Building main, not tagging latest." elif [[ "$TAG" == "$HIGHEST" ]]; then TAG_LATEST=true fi diff --git a/hack/gen-docs.sh b/hack/gen-docs.sh index dccb13725..1a508aefd 100755 --- a/hack/gen-docs.sh +++ b/hack/gen-docs.sh @@ -38,14 +38,14 @@ fi echo "Creating copy of docs directory site/docs/$PREVIOUS_DOCS_VERSION in site/docs/$NEW_DOCS_VERSION" cp -r site/docs/${PREVIOUS_DOCS_VERSION}/ site/docs/${NEW_DOCS_VERSION}/ -# 'git add' the previous version's docs as-is so we get a useful diff when we copy the master docs in +# 'git add' the previous version's docs as-is so we get a useful diff when we copy the main docs in echo "Running 'git add' for previous version's doc contents to use as a base for diff" git add site/docs/${NEW_DOCS_VERSION} -# now copy the contents of site/docs/master into the same directory so we can get a nice +# now copy the contents of site/docs/main into the same directory so we can get a nice # git diff of what changed since previous version -echo "Copying site/docs/master/ to site/docs/${NEW_DOCS_VERSION}/" -rm -rf site/docs/${NEW_DOCS_VERSION}/ && cp -r site/docs/master/ site/docs/${NEW_DOCS_VERSION}/ +echo "Copying site/docs/main/ to site/docs/${NEW_DOCS_VERSION}/" +rm -rf site/docs/${NEW_DOCS_VERSION}/ && cp -r site/docs/main/ site/docs/${NEW_DOCS_VERSION}/ # make a copy of the previous versioned ToC NEW_DOCS_TOC="$(echo ${NEW_DOCS_VERSION} | tr . -)-toc" @@ -54,20 +54,20 @@ PREVIOUS_DOCS_TOC="$(echo ${PREVIOUS_DOCS_VERSION} | tr . -)-toc" echo "Creating copy of site/_data/$PREVIOUS_DOCS_TOC.yml at site/_data/$NEW_DOCS_TOC.yml" cp site/_data/$PREVIOUS_DOCS_TOC.yml site/_data/$NEW_DOCS_TOC.yml -# 'git add' the previous version's ToC content as-is so we get a useful diff when we copy the master ToC in +# 'git add' the previous version's ToC content as-is so we get a useful diff when we copy the main ToC in echo "Running 'git add' for previous version's ToC to use as a base for diff" git add site/_data/$NEW_DOCS_TOC.yml -# now copy the master ToC so we can get a nice git diff of what changed since previous version -echo "Copying site/_data/master-toc.yml to site/_data/$NEW_DOCS_TOC.yml" -rm site/_data/$NEW_DOCS_TOC.yml && cp site/_data/master-toc.yml site/_data/$NEW_DOCS_TOC.yml +# now copy the main ToC so we can get a nice git diff of what changed since previous version +echo "Copying site/_data/main-toc.yml to site/_data/$NEW_DOCS_TOC.yml" +rm site/_data/$NEW_DOCS_TOC.yml && cp site/_data/main-toc.yml site/_data/$NEW_DOCS_TOC.yml # replace known version-specific links -- the sed syntax is slightly different in OS X and Linux, # so check which OS we're running on. if [[ $(uname) == "Darwin" ]]; then echo "[OS X] updating version-specific links" - find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i '' "s|https://velero.io/docs/master|https://velero.io/docs/$VELERO_VERSION|g" - find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i '' "s|https://github.com/vmware-tanzu/velero/blob/master|https://github.com/vmware-tanzu/velero/blob/$VELERO_VERSION|g" + find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i '' "s|https://velero.io/docs/main|https://velero.io/docs/$VELERO_VERSION|g" + find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i '' "s|https://github.com/vmware-tanzu/velero/blob/main|https://github.com/vmware-tanzu/velero/blob/$VELERO_VERSION|g" echo "[OS X] Updating latest version in _config.yml" sed -i '' "s/latest: ${PREVIOUS_DOCS_VERSION}/latest: ${NEW_DOCS_VERSION}/" site/_config.yml @@ -75,28 +75,28 @@ if [[ $(uname) == "Darwin" ]]; then # newlines and lack of indentation are requirements for this sed syntax # which is doing an append echo "[OS X] Adding latest version to versions list in _config.yml" - sed -i '' "/- master/a\\ + sed -i '' "/- main/a\\ - ${NEW_DOCS_VERSION} " site/_config.yml echo "[OS X] Adding ToC mapping entry" - sed -i '' "/master: master-toc/a\\ + sed -i '' "/main: main-toc/a\\ ${NEW_DOCS_VERSION}: ${NEW_DOCS_TOC} " site/_data/toc-mapping.yml else echo "[Linux] updating version-specific links" - find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i'' "s|https://velero.io/docs/master|https://velero.io/docs/$VELERO_VERSION|g" - find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i'' "s|https://github.com/vmware-tanzu/velero/blob/master|https://github.com/vmware-tanzu/velero/blob/$VELERO_VERSION|g" + find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i'' "s|https://velero.io/docs/main|https://velero.io/docs/$VELERO_VERSION|g" + find site/docs/${NEW_DOCS_VERSION} -type f -name "*.md" | xargs sed -i'' "s|https://github.com/vmware-tanzu/velero/blob/main|https://github.com/vmware-tanzu/velero/blob/$VELERO_VERSION|g" echo "[Linux] Updating latest version in _config.yml" sed -i'' "s/latest: ${PREVIOUS_DOCS_VERSION}/latest: ${NEW_DOCS_VERSION}/" site/_config.yml echo "[Linux] Adding latest version to versions list in _config.yml" - sed -i'' "/- master/a - ${NEW_DOCS_VERSION}" site/_config.yml + sed -i'' "/- main/a - ${NEW_DOCS_VERSION}" site/_config.yml echo "[Linux] Adding ToC mapping entry" - sed -i'' "/master: master-toc/a ${NEW_DOCS_VERSION}: ${NEW_DOCS_TOC}" site/_data/toc-mapping.yml + sed -i'' "/main: main-toc/a ${NEW_DOCS_VERSION}: ${NEW_DOCS_TOC}" site/_data/toc-mapping.yml fi echo "Success! site/docs/$NEW_DOCS_VERSION has been created." diff --git a/hack/release-tools/tag-release.sh b/hack/release-tools/tag-release.sh index f81a0b982..b73f827f4 100755 --- a/hack/release-tools/tag-release.sh +++ b/hack/release-tools/tag-release.sh @@ -104,8 +104,8 @@ if [[ "$VELERO_PATCH" > 0 ]]; then tag_and_push else - echo "Checking out upstream/master." - git checkout upstream/master + echo "Checking out upstream/main." + git checkout upstream/main tag_and_push fi diff --git a/netlify.toml b/netlify.toml index 056f4a49b..759cf11f7 100644 --- a/netlify.toml +++ b/netlify.toml @@ -2,3 +2,9 @@ base = "site/" command = "jekyll build" publish = "site/_site" + +# Using the * -> :splat rule should redirect anything under master to the matching file under main +[[redirects]] + from = "/docs/master/*" + to = "/docs/main/:splat" + diff --git a/pkg/controller/restore_controller.go b/pkg/controller/restore_controller.go index ef2f15dfa..a0c7383b8 100644 --- a/pkg/controller/restore_controller.go +++ b/pkg/controller/restore_controller.go @@ -54,7 +54,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" ) -// nonRestorableResources is a blacklist for the restoration process. Any resources +// nonRestorableResources is an exclusion list for the restoration process. Any resources // included here are explicitly excluded from the restoration process. var nonRestorableResources = []string{ "nodes", diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go index 94eba2b3a..172314884 100644 --- a/pkg/restore/restore.go +++ b/pkg/restore/restore.go @@ -335,7 +335,7 @@ func getOrderedResources(resourcePriorities []string, backupResources map[string } sort.Strings(orderedBackupResources) - // master list: everything in resource priorities, followed by what's in the backup (alphabetized) + // main list: everything in resource priorities, followed by what's in the backup (alphabetized) return append(resourcePriorities, orderedBackupResources...) } diff --git a/site/README-JEKYLL.md b/site/README-JEKYLL.md index c86827f5c..413ccdf62 100644 --- a/site/README-JEKYLL.md +++ b/site/README-JEKYLL.md @@ -44,6 +44,6 @@ To add a new set of versioned docs to go with a new Velero release: NEW_DOCS_VERSION=vX.Y VELERO_VERSION=vX.Y.Z make gen-docs ``` -1. In `site/_config.yml`, under the `defaults` field, add an entry for the new version just under `master` by copying the most recent version's entry and updating the version numbers. +1. In `site/_config.yml`, under the `defaults` field, add an entry for the new version just under `main` by copying the most recent version's entry and updating the version numbers. 1. [Pre-release only] In `site/_config.yml`, revert the change to the `latest` field, so the pre-release docs do not become the default. diff --git a/site/_config.yml b/site/_config.yml index d90a45007..1752e0b94 100644 --- a/site/_config.yml +++ b/site/_config.yml @@ -50,10 +50,10 @@ defaults: values: layout: "default" - scope: - path: docs/master + path: docs/main values: - version: master - gh: https://github.com/vmware-tanzu/velero/tree/master + version: main + gh: https://github.com/vmware-tanzu/velero/tree/main layout: "docs" - scope: path: docs/v1.4 @@ -178,7 +178,7 @@ collections: versioning: true latest: v1.4 versions: -- master +- main - v1.4 - v1.3.2 - v1.3.1 @@ -230,4 +230,4 @@ exclude: - LICENSE - CNAME - Runbook.docx - - '*.sh' \ No newline at end of file + - '*.sh' diff --git a/site/_data/master-toc.yml b/site/_data/main-toc.yml similarity index 100% rename from site/_data/master-toc.yml rename to site/_data/main-toc.yml diff --git a/site/_data/toc-mapping.yml b/site/_data/toc-mapping.yml index a43876b7a..53e7a3d1f 100644 --- a/site/_data/toc-mapping.yml +++ b/site/_data/toc-mapping.yml @@ -2,7 +2,7 @@ # (TOC). You'll want to use this after any revamps to information architecture, to ensure # that the navigation for older versions still work. -master: master-toc +main: main-toc v1.4: v1-4-toc v1.3.2: v1-3-2-toc v1.3.1: v1-3-1-toc diff --git a/site/_includes/blog-post-card.html b/site/_includes/blog-post-card.html index 96b3e0d6e..8a4bab5f5 100644 --- a/site/_includes/blog-post-card.html +++ b/site/_includes/blog-post-card.html @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/site/_includes/blog-posts-tag.html b/site/_includes/blog-posts-tag.html index 51a523400..6b444bf79 100644 --- a/site/_includes/blog-posts-tag.html +++ b/site/_includes/blog-posts-tag.html @@ -10,4 +10,4 @@
{% endif %} {% endfor %} -
\ No newline at end of file + diff --git a/site/_includes/blog-posts.html b/site/_includes/blog-posts.html index 17c230bdb..a088202a6 100644 --- a/site/_includes/blog-posts.html +++ b/site/_includes/blog-posts.html @@ -10,4 +10,4 @@
{% endif %} {% endfor %} -
\ No newline at end of file + diff --git a/site/_includes/case-studies.html b/site/_includes/case-studies.html index dacffdaf8..f2c18d99d 100644 --- a/site/_includes/case-studies.html +++ b/site/_includes/case-studies.html @@ -18,4 +18,4 @@ {% break %} {% endif %} {% endfor %} - \ No newline at end of file + diff --git a/site/_includes/contributors.html b/site/_includes/contributors.html index ebe82473a..3fa7c3ce6 100644 --- a/site/_includes/contributors.html +++ b/site/_includes/contributors.html @@ -7,7 +7,7 @@

{{ site.title }} is released as open source software and provides community support through our GitHub project page. If you encounter an issue or have a question, feel free to reach out on the GitHub issues page for {{ site.title }}.

-

The Velero project team welcomes contributions from the community, please see our contributing documentation. +

The Velero project team welcomes contributions from the community, please see our contributing documentation.

@@ -23,4 +23,4 @@ {% endfor %} - \ No newline at end of file + diff --git a/site/_includes/head.html b/site/_includes/head.html index 0f091faf2..a085e3f8e 100644 --- a/site/_includes/head.html +++ b/site/_includes/head.html @@ -7,4 +7,4 @@ {{ site.title }} {{page.title}} {% seo %} - \ No newline at end of file + diff --git a/site/_includes/related-posts.html b/site/_includes/related-posts.html index 7f31680c4..418b12048 100644 --- a/site/_includes/related-posts.html +++ b/site/_includes/related-posts.html @@ -7,4 +7,4 @@ {% endfor %} {% endfor %} - \ No newline at end of file + diff --git a/site/_includes/version-warning.html b/site/_includes/version-warning.html index 5a94a4f32..d7c16ad66 100644 --- a/site/_includes/version-warning.html +++ b/site/_includes/version-warning.html @@ -1,6 +1,6 @@ {% if page.version != site.latest %} - \ No newline at end of file + diff --git a/site/_layouts/default.html b/site/_layouts/default.html index b8143da3a..3c78e95cd 100644 --- a/site/_layouts/default.html +++ b/site/_layouts/default.html @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/site/_layouts/docs.html b/site/_layouts/docs.html index 85aa21431..0848ee49b 100644 --- a/site/_layouts/docs.html +++ b/site/_layouts/docs.html @@ -1,7 +1,7 @@ {% include head-docs.html %} -{% if page.version != "master" %} +{% if page.version != "main" %} {% endif %} diff --git a/site/_layouts/page.html b/site/_layouts/page.html index 62b5c4826..c48723eb1 100644 --- a/site/_layouts/page.html +++ b/site/_layouts/page.html @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/site/_layouts/posts.html b/site/_layouts/posts.html index 50b2ae879..a9a86d810 100644 --- a/site/_layouts/posts.html +++ b/site/_layouts/posts.html @@ -52,4 +52,4 @@ - \ No newline at end of file + diff --git a/site/_posts/2019-10-01-announcing-gh-move.md b/site/_posts/2019-10-01-announcing-gh-move.md index 5916235da..d95c84a1b 100644 --- a/site/_posts/2019-10-01-announcing-gh-move.md +++ b/site/_posts/2019-10-01-announcing-gh-move.md @@ -41,6 +41,6 @@ As always, we welcome feedback and participation in the development of Velero. A [1]: https://github.com/vmware-tanzu [2]: https://blogs.vmware.com/cloudnative/2019/10/01/open-source-in-vmware-tanzu/ -[3]: ../docs/master/supported-providers -[4]: https://velero.io/docs/master/ +[3]: ../docs/main/supported-providers +[4]: https://velero.io/docs/main/ [5]: https://github.com/vmware-tanzu/velero/issues#workspaces/velero-5c59c15e39d47b774b5864e3/board?milestones=v1.2%232019-10-31&filterLogic=any&repos=99143276&showPipelineDescriptions=false diff --git a/site/_posts/2019-11-07-Velero-1.2-Sets-Sail.md b/site/_posts/2019-11-07-Velero-1.2-Sets-Sail.md index de2722fa1..633db3c4c 100644 --- a/site/_posts/2019-11-07-Velero-1.2-Sets-Sail.md +++ b/site/_posts/2019-11-07-Velero-1.2-Sets-Sail.md @@ -45,7 +45,7 @@ In Kubernetes 1.16, custom resource definitions (CRDs) reached general availabil ## And More -There are too many new features and improvements to cover in this short blog post. For full details on all of the changes, see the [full changelog](https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-1.2.md). +There are too many new features and improvements to cover in this short blog post. For full details on all of the changes, see the [full changelog](https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.2.md). ## Community Contributors diff --git a/site/_posts/2020-03-02-Velero-1.3-Voyage-Continues.md b/site/_posts/2020-03-02-Velero-1.3-Voyage-Continues.md index 1e2fa149a..2ae94be8f 100644 --- a/site/_posts/2020-03-02-Velero-1.3-Voyage-Continues.md +++ b/site/_posts/2020-03-02-Velero-1.3-Voyage-Continues.md @@ -42,7 +42,7 @@ We fixed a large number of bugs and made some smaller usability improvements in - 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)) -For a full list of all changes in this release, see [the changelog](https://github.com/vmware-tanzu/velero/blob/master/changelogs/CHANGELOG-1.3.md). +For a full list of all changes in this release, see [the changelog](https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.3.md). ## An Update on CSI Snapshot Support diff --git a/site/community.md b/site/community.md index 1d6d5ee21..3af776b42 100644 --- a/site/community.md +++ b/site/community.md @@ -8,9 +8,9 @@ id: community If you’re a newcomer, check out the “[Good first issue](https://github.com/vmware-tanzu/velero/issues?q=is%3Aopen+is%3Aissue+label%3A%22Good+first+issue%22)” and “[Help wanted](https://github.com/vmware-tanzu/velero/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3A%22Help+wanted%22+)” labels in the Velero repository. -Read how [we're using ZenHub](https://velero.io/docs/master/zenhub) for project and roadmap planning. +Read how [we're using ZenHub](https://velero.io/docs/main/zenhub) for project and roadmap planning. -If you are ready to jump in and test, add code, or help with documentation, follow the instructions on our [Start contributing](https://velero.io/docs/master/start-contributing/) documentation for guidance on how to setup Velero for development. +If you are ready to jump in and test, add code, or help with documentation, follow the instructions on our [Start contributing](https://velero.io/docs/main/start-contributing/) documentation for guidance on how to setup Velero for development. You can follow the work we do, see our milestones, and our backlog on our [ZenHub board](https://app.zenhub.com/workspace/o/vmware-tanzu/velero/boards?filterLogic=all&repos=99143276). diff --git a/site/docs/master/README.md b/site/docs/main/README.md similarity index 86% rename from site/docs/master/README.md rename to site/docs/main/README.md index 747cc079e..49e9bdf23 100644 --- a/site/docs/master/README.md +++ b/site/docs/main/README.md @@ -27,14 +27,14 @@ If you encounter issues, review the [troubleshooting docs][30], [file an issue][ ## Contributing -If you are ready to jump in and test, add code, or help with documentation, follow the instructions on our [Start contributing](https://velero.io/docs/master/start-contributing/) documentation for guidance on how to setup Velero for development. +If you are ready to jump in and test, add code, or help with documentation, follow the instructions on our [Start contributing](https://velero.io/docs/main/start-contributing/) documentation for guidance on how to setup Velero for development. ## Changelog See [the list of releases][6] to find out about feature changes. -[1]: https://github.com/vmware-tanzu/velero/workflows/Master%20CI/badge.svg -[2]: https://github.com/vmware-tanzu/velero/actions?query=workflow%3A"Master+CI" +[1]: https://github.com/vmware-tanzu/velero/workflows/Main%20CI/badge.svg +[2]: https://github.com/vmware-tanzu/velero/actions?query=workflow%3A"Main+CI" [4]: https://github.com/vmware-tanzu/velero/issues [6]: https://github.com/vmware-tanzu/velero/releases @@ -42,7 +42,7 @@ See [the list of releases][6] to find out about feature changes. [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [14]: https://github.com/kubernetes/kubernetes [24]: https://groups.google.com/forum/#!forum/projectvelero [25]: https://kubernetes.slack.com/messages/velero diff --git a/site/docs/master/api-types/README.md b/site/docs/main/api-types/README.md similarity index 100% rename from site/docs/master/api-types/README.md rename to site/docs/main/api-types/README.md diff --git a/site/docs/master/api-types/backup.md b/site/docs/main/api-types/backup.md similarity index 100% rename from site/docs/master/api-types/backup.md rename to site/docs/main/api-types/backup.md diff --git a/site/docs/master/api-types/backupstoragelocation.md b/site/docs/main/api-types/backupstoragelocation.md similarity index 100% rename from site/docs/master/api-types/backupstoragelocation.md rename to site/docs/main/api-types/backupstoragelocation.md diff --git a/site/docs/master/api-types/restore.md b/site/docs/main/api-types/restore.md similarity index 100% rename from site/docs/master/api-types/restore.md rename to site/docs/main/api-types/restore.md diff --git a/site/docs/master/api-types/schedule.md b/site/docs/main/api-types/schedule.md similarity index 100% rename from site/docs/master/api-types/schedule.md rename to site/docs/main/api-types/schedule.md diff --git a/site/docs/master/api-types/volumesnapshotlocation.md b/site/docs/main/api-types/volumesnapshotlocation.md similarity index 100% rename from site/docs/master/api-types/volumesnapshotlocation.md rename to site/docs/main/api-types/volumesnapshotlocation.md diff --git a/site/docs/master/backup-reference.md b/site/docs/main/backup-reference.md similarity index 100% rename from site/docs/master/backup-reference.md rename to site/docs/main/backup-reference.md diff --git a/site/docs/master/basic-install.md b/site/docs/main/basic-install.md similarity index 100% rename from site/docs/master/basic-install.md rename to site/docs/main/basic-install.md diff --git a/site/docs/master/build-from-source.md b/site/docs/main/build-from-source.md similarity index 94% rename from site/docs/master/build-from-source.md rename to site/docs/main/build-from-source.md index 57918632d..0536d8efd 100644 --- a/site/docs/master/build-from-source.md +++ b/site/docs/main/build-from-source.md @@ -76,7 +76,7 @@ If after installing Velero you would like to change the image used by its deploy kubectl -n velero set image deploy/velero velero=myimagerepo/velero:$VERSION ``` -To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero-amd64:master` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `velero`. +To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero-amd64:main` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `velero`. Optionally, set the `$VERSION` environment variable to change the image tag. Then, run: @@ -93,7 +93,7 @@ ARCH=linux-ppc64le make container ``` _Note: By default, ARCH is set to linux-amd64_ -To push your image to the registry. For example, if you want to push the `gcr.io/my-registry/velero-amd64:master` image, run: +To push your image to the registry. For example, if you want to push the `gcr.io/my-registry/velero-amd64:main` image, run: ```bash make push @@ -108,7 +108,7 @@ ARCH=linux-ppc64le make push ``` _Note: By default, ARCH is set to linux-amd64_ -To create and push your manifest to the registry. For example, if you want to create and push the `gcr.io/my-registry/velero:master` manifest, run: +To create and push your manifest to the registry. For example, if you want to create and push the `gcr.io/my-registry/velero:main` manifest, run: ```bash make manifest diff --git a/site/docs/master/code-standards.md b/site/docs/main/code-standards.md similarity index 98% rename from site/docs/master/code-standards.md rename to site/docs/main/code-standards.md index 49abc2941..7c5081dca 100644 --- a/site/docs/master/code-standards.md +++ b/site/docs/main/code-standards.md @@ -62,7 +62,7 @@ Example: We use a package to generate mocks for our interfaces. -Example: if you want to change this mock: https://github.com/vmware-tanzu/velero/blob/master/pkg/restic/mocks/restorer.go +Example: if you want to change this mock: https://github.com/vmware-tanzu/velero/blob/main/pkg/restic/mocks/restorer.go Run: diff --git a/site/docs/master/contributions/ibm-config.md b/site/docs/main/contributions/ibm-config.md similarity index 99% rename from site/docs/master/contributions/ibm-config.md rename to site/docs/main/contributions/ibm-config.md index 140face6d..700b3a760 100644 --- a/site/docs/master/contributions/ibm-config.md +++ b/site/docs/main/contributions/ibm-config.md @@ -14,7 +14,7 @@ To set up IBM Cloud Object Storage (COS) as Velero's destination, you: 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/master/contributions/minio.md b/site/docs/main/contributions/minio.md similarity index 99% rename from site/docs/master/contributions/minio.md rename to site/docs/main/contributions/minio.md index 86012b0b9..c0b27538b 100644 --- a/site/docs/master/contributions/minio.md +++ b/site/docs/main/contributions/minio.md @@ -22,7 +22,7 @@ If you encounter issues with installing or configuring, see [Debugging Installat 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/master/contributions/oracle-config.md b/site/docs/main/contributions/oracle-config.md similarity index 98% rename from site/docs/master/contributions/oracle-config.md rename to site/docs/main/contributions/oracle-config.md index 182ad64aa..1f2c1dc5b 100644 --- a/site/docs/master/contributions/oracle-config.md +++ b/site/docs/main/contributions/oracle-config.md @@ -20,7 +20,7 @@ wget https://github.com/vmware-tanzu/velero/releases/download/v1.0.0/velero-v1.0.0-linux-amd64.tar.gz ``` - *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the master branch of the Velero repository is under active development and is not guaranteed to be stable!* + *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!* 2. Untar the release in your `/usr/bin` directory: `tar -xzvf .tar.gz` @@ -241,5 +241,5 @@ After creating the Velero server in your cluster, try this example: ## Additional Reading -* [Official Velero Documentation](https://velero.io/docs/master/) +* [Official Velero Documentation](https://velero.io/docs/main/) * [Oracle Cloud Infrastructure Documentation](https://docs.cloud.oracle.com/) diff --git a/site/docs/master/csi.md b/site/docs/main/csi.md similarity index 100% rename from site/docs/master/csi.md rename to site/docs/main/csi.md diff --git a/site/docs/master/custom-plugins.md b/site/docs/main/custom-plugins.md similarity index 96% rename from site/docs/master/custom-plugins.md rename to site/docs/main/custom-plugins.md index bf5dd05f3..4c562e385 100644 --- a/site/docs/master/custom-plugins.md +++ b/site/docs/main/custom-plugins.md @@ -87,5 +87,5 @@ Once parsed into a `[]string`, the features can then be registered using the `Ne Velero adds the `LD_LIBRARY_PATH` into the list of environment variables to provide the convenience for plugins that requires C libraries/extensions in the runtime. [1]: https://github.com/vmware-tanzu/velero-plugin-example -[2]: https://github.com/vmware-tanzu/velero/blob/master/pkg/plugin/logger.go -[3]: https://github.com/vmware-tanzu/velero/blob/master/pkg/restore/restic_restore_action.go +[2]: https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/logger.go +[3]: https://github.com/vmware-tanzu/velero/blob/main/pkg/restore/restic_restore_action.go diff --git a/site/docs/master/customize-installation.md b/site/docs/main/customize-installation.md similarity index 99% rename from site/docs/master/customize-installation.md rename to site/docs/main/customize-installation.md index 59fca8cbc..1ad31b841 100644 --- a/site/docs/master/customize-installation.md +++ b/site/docs/main/customize-installation.md @@ -304,4 +304,4 @@ If you get an error like `complete:13: command not found: compdef`, then add the [8]: https://github.com/vmware-tanzu/velero/issues/2311 [9]: self-signed-certificates.md [10]: csi.md -[11]: https://github.com/vmware-tanzu/velero/blob/master/pkg/apis/velero/v1/constants.go +[11]: https://github.com/vmware-tanzu/velero/blob/main/pkg/apis/velero/v1/constants.go diff --git a/site/docs/master/debugging-install.md b/site/docs/main/debugging-install.md similarity index 100% rename from site/docs/master/debugging-install.md rename to site/docs/main/debugging-install.md diff --git a/site/docs/master/debugging-restores.md b/site/docs/main/debugging-restores.md similarity index 100% rename from site/docs/master/debugging-restores.md rename to site/docs/main/debugging-restores.md diff --git a/site/docs/master/development.md b/site/docs/main/development.md similarity index 100% rename from site/docs/master/development.md rename to site/docs/main/development.md diff --git a/site/docs/master/disaster-case.md b/site/docs/main/disaster-case.md similarity index 97% rename from site/docs/master/disaster-case.md rename to site/docs/main/disaster-case.md index 3934fd4ce..c9f126a8b 100644 --- a/site/docs/master/disaster-case.md +++ b/site/docs/main/disaster-case.md @@ -38,4 +38,4 @@ If you periodically back up your cluster's resources, you are able to return to --patch '{"spec":{"accessMode":"ReadWrite"}}' ``` -[1]: how-velero-works.md#set-a-backup-to-expire \ No newline at end of file +[1]: how-velero-works.md#set-a-backup-to-expire diff --git a/site/docs/master/examples.md b/site/docs/main/examples.md similarity index 98% rename from site/docs/master/examples.md rename to site/docs/main/examples.md index fd36e34c6..40b284ec3 100644 --- a/site/docs/master/examples.md +++ b/site/docs/main/examples.md @@ -60,4 +60,4 @@ After you set up the Velero server, try these examples: velero restore create --from-backup nginx-backup ``` -[1]: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#reclaiming \ No newline at end of file +[1]: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#reclaiming diff --git a/site/docs/master/faq.md b/site/docs/main/faq.md similarity index 98% rename from site/docs/master/faq.md rename to site/docs/main/faq.md index 00fe43e7c..076877bf3 100644 --- a/site/docs/master/faq.md +++ b/site/docs/main/faq.md @@ -22,7 +22,7 @@ Examples of cases where Velero is useful: Yes, with some exceptions. For example, when Velero restores pods it deletes the `nodeName` from the pod so that it can be scheduled onto a new node. You can see some more examples of the differences -in [pod_action.go](https://github.com/vmware-tanzu/velero/blob/master/pkg/restore/pod_action.go) +in [pod_action.go](https://github.com/vmware-tanzu/velero/blob/main/pkg/restore/pod_action.go) ## I'm using Velero in multiple clusters. Should I use the same bucket to store all of my backups? diff --git a/site/docs/master/hooks.md b/site/docs/main/hooks.md similarity index 97% rename from site/docs/master/hooks.md rename to site/docs/main/hooks.md index 81c14c967..a18766027 100644 --- a/site/docs/master/hooks.md +++ b/site/docs/main/hooks.md @@ -85,5 +85,5 @@ To use multiple commands, wrap your target command in a shell and separate them [1]: api-types/backup.md -[2]: https://github.com/vmware-tanzu/velero/blob/master/examples/nginx-app/with-pv.yaml +[2]: https://github.com/vmware-tanzu/velero/blob/main/examples/nginx-app/with-pv.yaml [3]: cloud-common.md diff --git a/site/docs/master/how-velero-works.md b/site/docs/main/how-velero-works.md similarity index 100% rename from site/docs/master/how-velero-works.md rename to site/docs/main/how-velero-works.md diff --git a/site/docs/master/image-tagging.md b/site/docs/main/image-tagging.md similarity index 82% rename from site/docs/master/image-tagging.md rename to site/docs/main/image-tagging.md index d86e49456..b0080ef1c 100644 --- a/site/docs/master/image-tagging.md +++ b/site/docs/main/image-tagging.md @@ -16,6 +16,6 @@ The `latest` tag follows the most recently released version of Velero. ## Development -`velero/velero:master` +`velero/velero:main` -The `master` tag follows the latest commit to land on the `master` branch. +The `main` tag follows the latest commit to land on the `main` branch. diff --git a/site/docs/master/img/README.md b/site/docs/main/img/README.md similarity index 100% rename from site/docs/master/img/README.md rename to site/docs/main/img/README.md diff --git a/site/docs/master/img/backup-process.png b/site/docs/main/img/backup-process.png similarity index 100% rename from site/docs/master/img/backup-process.png rename to site/docs/main/img/backup-process.png diff --git a/site/docs/master/img/velero.png b/site/docs/main/img/velero.png similarity index 100% rename from site/docs/master/img/velero.png rename to site/docs/main/img/velero.png diff --git a/site/docs/master/locations.md b/site/docs/main/locations.md similarity index 98% rename from site/docs/master/locations.md rename to site/docs/main/locations.md index d0dc636e7..ca28239a7 100644 --- a/site/docs/master/locations.md +++ b/site/docs/main/locations.md @@ -160,5 +160,5 @@ velero backup create full-cluster-backup [1]: api-types/backupstoragelocation.md [2]: api-types/volumesnapshotlocation.md -[3]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/master/volumesnapshotlocation.md -[4]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/master/backupstoragelocation.md +[3]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/main/volumesnapshotlocation.md +[4]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/main/backupstoragelocation.md diff --git a/site/docs/master/migration-case.md b/site/docs/main/migration-case.md similarity index 100% rename from site/docs/master/migration-case.md rename to site/docs/main/migration-case.md diff --git a/site/docs/master/namespace.md b/site/docs/main/namespace.md similarity index 100% rename from site/docs/master/namespace.md rename to site/docs/main/namespace.md diff --git a/site/docs/master/on-premises.md b/site/docs/main/on-premises.md similarity index 100% rename from site/docs/master/on-premises.md rename to site/docs/main/on-premises.md diff --git a/site/docs/master/output-file-format.md b/site/docs/main/output-file-format.md similarity index 100% rename from site/docs/master/output-file-format.md rename to site/docs/main/output-file-format.md diff --git a/site/docs/master/overview-plugins.md b/site/docs/main/overview-plugins.md similarity index 100% rename from site/docs/master/overview-plugins.md rename to site/docs/main/overview-plugins.md diff --git a/site/docs/master/rbac.md b/site/docs/main/rbac.md similarity index 100% rename from site/docs/master/rbac.md rename to site/docs/main/rbac.md diff --git a/site/docs/master/release-instructions.md b/site/docs/main/release-instructions.md similarity index 99% rename from site/docs/master/release-instructions.md rename to site/docs/main/release-instructions.md index df8600676..63bce5be5 100644 --- a/site/docs/master/release-instructions.md +++ b/site/docs/main/release-instructions.md @@ -84,4 +84,4 @@ To make sure it's the most up-to-date: ### Post-release - Windows Chocolatey version update -From a Windows computer, follow the step-by-step instructions to [create the Windows Chocolatey package for Velero CLI](https://github.com/adamrushuk/velero-choco/blob/master/README.md) +From a Windows computer, follow the step-by-step instructions to [create the Windows Chocolatey package for Velero CLI](https://github.com/adamrushuk/velero-choco/blob/main/README.md) diff --git a/site/docs/master/restic.md b/site/docs/main/restic.md similarity index 100% rename from site/docs/master/restic.md rename to site/docs/main/restic.md diff --git a/site/docs/master/restore-reference.md b/site/docs/main/restore-reference.md similarity index 100% rename from site/docs/master/restore-reference.md rename to site/docs/main/restore-reference.md diff --git a/site/docs/master/run-locally.md b/site/docs/main/run-locally.md similarity index 100% rename from site/docs/master/run-locally.md rename to site/docs/main/run-locally.md diff --git a/site/docs/master/self-signed-certificates.md b/site/docs/main/self-signed-certificates.md similarity index 100% rename from site/docs/master/self-signed-certificates.md rename to site/docs/main/self-signed-certificates.md diff --git a/site/docs/master/start-contributing.md b/site/docs/main/start-contributing.md similarity index 80% rename from site/docs/master/start-contributing.md rename to site/docs/main/start-contributing.md index f230a1bdc..a4cb59d07 100644 --- a/site/docs/master/start-contributing.md +++ b/site/docs/main/start-contributing.md @@ -19,7 +19,7 @@ Please browse our list of resources, including a playlist of past online communi If you are ready to jump in and test, add code, or help with documentation, please use the navigation on the left under `Contribute`. -[1]: https://github.com/vmware-tanzu/velero/blob/master/CODE_OF_CONDUCT.md -[2]: https://github.com/vmware-tanzu/velero/blob/master/CONTRIBUTING.md -[3]: https://github.com/vmware-tanzu/velero/blob/master/.github/ISSUE_TEMPLATE/feature-enhancement-request.md -[4]: https://github.com/vmware-tanzu/velero/blob/master/.github/ISSUE_TEMPLATE/bug_report.md +[1]: https://github.com/vmware-tanzu/velero/blob/main/CODE_OF_CONDUCT.md +[2]: https://github.com/vmware-tanzu/velero/blob/main/CONTRIBUTING.md +[3]: https://github.com/vmware-tanzu/velero/blob/main/.github/ISSUE_TEMPLATE/feature-enhancement-request.md +[4]: https://github.com/vmware-tanzu/velero/blob/main/.github/ISSUE_TEMPLATE/bug_report.md diff --git a/site/docs/master/support-process.md b/site/docs/main/support-process.md similarity index 100% rename from site/docs/master/support-process.md rename to site/docs/main/support-process.md diff --git a/site/docs/master/supported-providers.md b/site/docs/main/supported-providers.md similarity index 99% rename from site/docs/master/supported-providers.md rename to site/docs/main/supported-providers.md index ed9c931dc..07e304ddc 100644 --- a/site/docs/master/supported-providers.md +++ b/site/docs/main/supported-providers.md @@ -52,7 +52,7 @@ In the case you want to take volume snapshots but didn't find a plugin for your [3]: contributions/minio.md [4]: https://github.com/StackPointCloud/ark-plugin-digitalocean [5]: http://www.noobaa.com/ -[6]: https://github.com/vmware-tanzu/velero-plugin-for-aws/blob/master/backupstoragelocation.md +[6]: https://github.com/vmware-tanzu/velero-plugin-for-aws/blob/main/backupstoragelocation.md [7]: https://aws.amazon.com [8]: https://github.com/vmware-tanzu/velero-plugin-for-aws [9]: https://azure.com diff --git a/site/docs/master/troubleshooting.md b/site/docs/main/troubleshooting.md similarity index 96% rename from site/docs/master/troubleshooting.md rename to site/docs/main/troubleshooting.md index c2ded30d2..984d8f714 100644 --- a/site/docs/master/troubleshooting.md +++ b/site/docs/main/troubleshooting.md @@ -116,8 +116,8 @@ Now, visiting http://localhost:8085/metrics on a browser should show the metrics [2]: debugging-install.md [4]: https://github.com/vmware-tanzu/velero/issues [5]: https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html -[6]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero -[7]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero/values.yaml#L44 -[8]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero/values.yaml#L49-L52 +[6]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero +[7]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero/values.yaml#L44 +[8]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero/values.yaml#L49-L52 [9]: https://kubectl.docs.kubernetes.io/pages/container_debugging/port_forward_to_pods.html [25]: https://kubernetes.slack.com/messages/velero diff --git a/site/docs/master/uninstalling.md b/site/docs/main/uninstalling.md similarity index 98% rename from site/docs/master/uninstalling.md rename to site/docs/main/uninstalling.md index f83996edb..727bc1aa0 100644 --- a/site/docs/master/uninstalling.md +++ b/site/docs/main/uninstalling.md @@ -5,4 +5,4 @@ If you would like to completely uninstall Velero from your cluster, the followin ```bash kubectl delete namespace/velero clusterrolebinding/velero kubectl delete crds -l component=velero -``` \ No newline at end of file +``` diff --git a/site/docs/master/upgrade-to-1.4.md b/site/docs/main/upgrade-to-1.4.md similarity index 100% rename from site/docs/master/upgrade-to-1.4.md rename to site/docs/main/upgrade-to-1.4.md diff --git a/site/docs/master/velero-install.md b/site/docs/main/velero-install.md similarity index 100% rename from site/docs/master/velero-install.md rename to site/docs/main/velero-install.md diff --git a/site/docs/master/vendoring-dependencies.md b/site/docs/main/vendoring-dependencies.md similarity index 100% rename from site/docs/master/vendoring-dependencies.md rename to site/docs/main/vendoring-dependencies.md diff --git a/site/docs/master/website-guidelines.md b/site/docs/main/website-guidelines.md similarity index 96% rename from site/docs/master/website-guidelines.md rename to site/docs/main/website-guidelines.md index 49cfa703a..91bae775e 100644 --- a/site/docs/master/website-guidelines.md +++ b/site/docs/main/website-guidelines.md @@ -18,7 +18,7 @@ Alternatively, for quickly loading the website, under the `velero/site/` directo bundle exec jekyll serve --livereload --future ``` -For more information on how to run the website locally, please see our [jekyll documentation](https://github.com/vmware-tanzu/velero/blob/master/site/README-JEKYLL.md). +For more information on how to run the website locally, please see our [jekyll documentation](https://github.com/vmware-tanzu/velero/blob/main/site/README-JEKYLL.md). ## Adding a blog post diff --git a/site/docs/master/zenhub.md b/site/docs/main/zenhub.md similarity index 100% rename from site/docs/master/zenhub.md rename to site/docs/main/zenhub.md diff --git a/site/docs/v0.10.0/README.md b/site/docs/v0.10.0/README.md index f864d0c49..dcb67f08d 100644 --- a/site/docs/v0.10.0/README.md +++ b/site/docs/v0.10.0/README.md @@ -52,24 +52,24 @@ Feedback and discussion are available on [the mailing list][24]. See [the list of releases][6] to find out about feature changes. [0]: https://github.com/heptio -[1]: https://travis-ci.org/heptio/ark.svg?branch=master +[1]: https://travis-ci.org/heptio/ark.svg?branch=main [2]: https://travis-ci.org/heptio/ark [4]: https://github.com/heptio/ark/issues -[5]: https://github.com/heptio/ark/blob/master/CONTRIBUTING.md +[5]: https://github.com/heptio/ark/blob/main/CONTRIBUTING.md [6]: https://github.com/heptio/ark/releases -[8]: https://github.com/heptio/ark/blob/master/CODE_OF_CONDUCT.md +[8]: https://github.com/heptio/ark/blob/main/CODE_OF_CONDUCT.md [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [14]: https://github.com/kubernetes/kubernetes [24]: http://j.hept.io/ark-list [25]: https://kubernetes.slack.com/messages/ark-dr -[26]: https://github.com/heptio/ark/blob/master/docs/zenhub.md +[26]: https://github.com/heptio/ark/blob/main/docs/zenhub.md [29]: https://velero.io/docs/v0.10.0/ diff --git a/site/docs/v0.10.0/build-from-scratch.md b/site/docs/v0.10.0/build-from-scratch.md index b6fcab650..89021cc34 100644 --- a/site/docs/v0.10.0/build-from-scratch.md +++ b/site/docs/v0.10.0/build-from-scratch.md @@ -208,13 +208,13 @@ If you need to add or update the vendored dependencies, see [Vendoring dependenc [3]: #build [4]: https://blog.golang.org/organizing-go-code [5]: https://golang.org/doc/install -[6]: https://github.com/heptio/ark/tree/master/examples +[6]: https://github.com/heptio/ark/tree/main/examples [7]: #run [8]: config-definition.md [10]: #vendoring-dependencies [11]: vendoring-dependencies.md [12]: #test -[13]: https://github.com/heptio/ark/blob/master/hack/generate-proto.sh +[13]: https://github.com/heptio/ark/blob/main/hack/generate-proto.sh [14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 [15]: https://docs.aws.amazon.com/cli/latest/topic/config-vars.html#the-shared-credentials-file [16]: https://cloud.google.com/docs/authentication/getting-started#setting_the_environment_variable diff --git a/site/docs/v0.10.0/debugging-install.md b/site/docs/v0.10.0/debugging-install.md index ac31e6d69..89cad18e1 100644 --- a/site/docs/v0.10.0/debugging-install.md +++ b/site/docs/v0.10.0/debugging-install.md @@ -56,4 +56,4 @@ into the Ark server pod. Ensure the following: * The `cloud-credentials` secret is defined as a volume for the Ark deployment * The `cloud-credentials` secret is being mounted into the Ark server pod at `/credentials` -[0]: azure-config#credentials-and-configuration \ No newline at end of file +[0]: azure-config#credentials-and-configuration diff --git a/site/docs/v0.10.0/faq.md b/site/docs/v0.10.0/faq.md index b25b4f439..c8cc029a2 100644 --- a/site/docs/v0.10.0/faq.md +++ b/site/docs/v0.10.0/faq.md @@ -22,7 +22,7 @@ Examples of cases where Ark is useful: Yes, with some exceptions. For example, when Ark restores pods it deletes the `nodeName` from the pod so that it can be scheduled onto a new node. You can see some more examples of the differences -in [pod_action.go](https://github.com/heptio/ark/blob/master/pkg/restore/pod_action.go) +in [pod_action.go](https://github.com/heptio/ark/blob/main/pkg/restore/pod_action.go) ## I'm using Ark in multiple clusters. Should I use the same bucket to store all of my backups? diff --git a/site/docs/v0.10.0/image-tagging.md b/site/docs/v0.10.0/image-tagging.md index 33460d8c3..2fd12e3cc 100644 --- a/site/docs/v0.10.0/image-tagging.md +++ b/site/docs/v0.10.0/image-tagging.md @@ -16,6 +16,6 @@ The `latest` tag follows the most recently released version of Ark. ## Development -`gcr.io/heptio-images/ark:master` +`gcr.io/heptio-images/ark:main` -The `master` tag follows the latest commit to land on the `master` branch. \ No newline at end of file +The `main` tag follows the latest commit to land on the `main` branch. diff --git a/site/docs/v0.10.0/migration-case.md b/site/docs/v0.10.0/migration-case.md index f3c6a4f07..41f28b889 100644 --- a/site/docs/v0.10.0/migration-case.md +++ b/site/docs/v0.10.0/migration-case.md @@ -45,4 +45,4 @@ Check that the second cluster is behaving as expected: ark restore describe ``` -If you encounter issues, make sure that Ark is running in the same namespace in both clusters. \ No newline at end of file +If you encounter issues, make sure that Ark is running in the same namespace in both clusters. diff --git a/site/docs/v0.10.0/plugins.md b/site/docs/v0.10.0/plugins.md index 4f3bc04fd..d49da0a74 100644 --- a/site/docs/v0.10.0/plugins.md +++ b/site/docs/v0.10.0/plugins.md @@ -28,4 +28,4 @@ within your plugin. [1]: https://github.com/heptio/ark-plugin-example -[2]: https://github.com/heptio/ark/blob/master/pkg/plugin/logger.go +[2]: https://github.com/heptio/ark/blob/main/pkg/plugin/logger.go diff --git a/site/docs/v0.10.0/rbac.md b/site/docs/v0.10.0/rbac.md index ebc031671..a7dea51d4 100644 --- a/site/docs/v0.10.0/rbac.md +++ b/site/docs/v0.10.0/rbac.md @@ -44,4 +44,4 @@ roleRef: [1]: https://kubernetes.io/docs/reference/access-authn-authz/controlling-access/ [2]: https://kubernetes.io/docs/reference/access-authn-authz/service-accounts-admin/ [3]: https://kubernetes.io/docs/reference/access-authn-authz/rbac/ -[4]: namespace.md \ No newline at end of file +[4]: namespace.md diff --git a/site/docs/v0.11.0/README.md b/site/docs/v0.11.0/README.md index f5427ff03..6ecea1c9c 100644 --- a/site/docs/v0.11.0/README.md +++ b/site/docs/v0.11.0/README.md @@ -23,7 +23,7 @@ We strongly recommend that you use an [official release][6] of Velero. The tarba command-line client **and** version-specific sample YAML files for deploying Velero to your cluster. Follow the instructions under the **Install** section of [our documentation][29] to get started. -_The code and sample YAML files in the master branch of the Velero repository are under active development and are not guaranteed to be stable. Use them at your own risk!_ +_The code and sample YAML files in the main branch of the Velero repository are under active development and are not guaranteed to be stable. Use them at your own risk!_ ## More information @@ -55,23 +55,23 @@ Feedback and discussion are available on [the mailing list][24]. See [the list of releases][6] to find out about feature changes. -[1]: https://travis-ci.org/heptio/velero.svg?branch=master +[1]: https://travis-ci.org/heptio/velero.svg?branch=main [2]: https://travis-ci.org/heptio/velero [4]: https://github.com/heptio/velero/issues -[5]: https://github.com/heptio/velero/blob/master/CONTRIBUTING.md +[5]: https://github.com/heptio/velero/blob/main/CONTRIBUTING.md [6]: https://github.com/heptio/velero/releases -[8]: https://github.com/heptio/velero/blob/master/CODE_OF_CONDUCT.md +[8]: https://github.com/heptio/velero/blob/main/CODE_OF_CONDUCT.md [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [14]: https://github.com/kubernetes/kubernetes [24]: https://groups.google.com/forum/#!forum/projectvelero [25]: https://kubernetes.slack.com/messages/velero -[26]: https://github.com/heptio/velero/blob/master/docs/zenhub.md +[26]: https://github.com/heptio/velero/blob/main/docs/zenhub.md [29]: https://velero.io/docs/v0.11.0/install-overview diff --git a/site/docs/v0.11.0/aws-config.md b/site/docs/v0.11.0/aws-config.md index bcb74a64a..07514037f 100644 --- a/site/docs/v0.11.0/aws-config.md +++ b/site/docs/v0.11.0/aws-config.md @@ -23,7 +23,7 @@ If you do not have the `aws` CLI locally installed, follow the [user guide][5] t 1. Move the `velero` binary from the Velero directory to somewhere in your PATH. _We strongly recommend that you use an [official release](https://github.com/heptio/velero/releases) of Velero. The tarballs for each release contain the -`velero` command-line client **and** version-specific sample YAML files for deploying Velero to your cluster. The code and sample YAML files in the master +`velero` command-line client **and** version-specific sample YAML files for deploying Velero to your cluster. The code and sample YAML files in the main branch of the Velero repository are under active development and are not guaranteed to be stable. Use them at your own risk!_ ## Create S3 bucket diff --git a/site/docs/v0.11.0/azure-config.md b/site/docs/v0.11.0/azure-config.md index 38c2edbf6..4032926ab 100644 --- a/site/docs/v0.11.0/azure-config.md +++ b/site/docs/v0.11.0/azure-config.md @@ -34,7 +34,7 @@ consider using Premium Managed Disks, which are SSD backed. 1. Move the `velero` binary from the Velero directory to somewhere in your PATH. _We strongly recommend that you use an [official release](https://github.com/heptio/velero/releases) of Velero. The tarballs for each release contain the -`velero` command-line client **and** version-specific sample YAML files for deploying Velero to your cluster. The code and sample YAML files in the master +`velero` command-line client **and** version-specific sample YAML files for deploying Velero to your cluster. The code and sample YAML files in the main branch of the Velero repository are under active development and are not guaranteed to be stable. Use them at your own risk!_ ## Create Azure storage account and blob container diff --git a/site/docs/v0.11.0/build-from-scratch.md b/site/docs/v0.11.0/build-from-scratch.md index ce89992b1..debf1ea8b 100644 --- a/site/docs/v0.11.0/build-from-scratch.md +++ b/site/docs/v0.11.0/build-from-scratch.md @@ -219,13 +219,13 @@ If you need to add or update the vendored dependencies, see [Vendoring dependenc [3]: #build [4]: https://blog.golang.org/organizing-go-code [5]: https://golang.org/doc/install -[6]: https://github.com/heptio/velero/tree/master/examples +[6]: https://github.com/heptio/velero/tree/main/examples [7]: #run [8]: config-definition.md [10]: #vendoring-dependencies [11]: vendoring-dependencies.md [12]: #test -[13]: https://github.com/heptio/velero/blob/master/hack/generate-proto.sh +[13]: https://github.com/heptio/velero/blob/main/hack/generate-proto.sh [14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 [15]: https://docs.aws.amazon.com/cli/latest/topic/config-vars.html#the-shared-credentials-file [16]: https://cloud.google.com/docs/authentication/getting-started#setting_the_environment_variable diff --git a/site/docs/v0.11.0/faq.md b/site/docs/v0.11.0/faq.md index 2cd9025c7..202d844e7 100644 --- a/site/docs/v0.11.0/faq.md +++ b/site/docs/v0.11.0/faq.md @@ -22,7 +22,7 @@ Examples of cases where Velero is useful: Yes, with some exceptions. For example, when Velero restores pods it deletes the `nodeName` from the pod so that it can be scheduled onto a new node. You can see some more examples of the differences -in [pod_action.go](https://github.com/heptio/velero/blob/master/pkg/restore/pod_action.go) +in [pod_action.go](https://github.com/heptio/velero/blob/main/pkg/restore/pod_action.go) ## I'm using Velero in multiple clusters. Should I use the same bucket to store all of my backups? diff --git a/site/docs/v0.11.0/gcp-config.md b/site/docs/v0.11.0/gcp-config.md index 79b6220a5..107cb03ad 100644 --- a/site/docs/v0.11.0/gcp-config.md +++ b/site/docs/v0.11.0/gcp-config.md @@ -20,7 +20,7 @@ If you do not have the `gcloud` and `gsutil` CLIs locally installed, follow the 1. Move the `velero` binary from the Velero directory to somewhere in your PATH. _We strongly recommend that you use an [official release](https://github.com/heptio/velero/releases) of Velero. The tarballs for each release contain the -`velero` command-line client **and** version-specific sample YAML files for deploying Velero to your cluster. The code and sample YAML files in the master +`velero` command-line client **and** version-specific sample YAML files for deploying Velero to your cluster. The code and sample YAML files in the main branch of the Velero repository are under active development and are not guaranteed to be stable. Use them at your own risk!_ ## Create GCS bucket diff --git a/site/docs/v0.11.0/get-started.md b/site/docs/v0.11.0/get-started.md index e43d1eb10..151695e1c 100644 --- a/site/docs/v0.11.0/get-started.md +++ b/site/docs/v0.11.0/get-started.md @@ -30,7 +30,7 @@ If you encounter issues with installing or configuring, see [Debugging Installat 1. Move the `velero` binary from the Velero directory to somewhere in your PATH. _We strongly recommend that you use an [official release](https://github.com/heptio/velero/releases) of Velero. The tarballs for each release contain the -`velero` command-line client **and** version-specific sample YAML files for deploying Velero to your cluster. The code and sample YAML files in the master +`velero` command-line client **and** version-specific sample YAML files for deploying Velero to your cluster. The code and sample YAML files in the main branch of the Velero repository are under active development and are not guaranteed to be stable. Use them at your own risk!_ #### MacOS Installation diff --git a/site/docs/v0.11.0/ibm-config.md b/site/docs/v0.11.0/ibm-config.md index 4c8709e86..41e04bf1f 100644 --- a/site/docs/v0.11.0/ibm-config.md +++ b/site/docs/v0.11.0/ibm-config.md @@ -22,7 +22,7 @@ To set up IBM Cloud Object Storage (COS) as Velero's destination, you: 1. Move the `velero` binary from the Velero directory to somewhere in your PATH. _We strongly recommend that you use an [official release](https://github.com/heptio/velero/releases) of Velero. The tarballs for each release contain the -`velero` command-line client **and** version-specific sample YAML files for deploying Velero to your cluster. The code and sample YAML files in the master +`velero` command-line client **and** version-specific sample YAML files for deploying Velero to your cluster. The code and sample YAML files in the main branch of the Velero repository are under active development and are not guaranteed to be stable. Use them at your own risk!_ ## Create COS instance diff --git a/site/docs/v0.11.0/image-tagging.md b/site/docs/v0.11.0/image-tagging.md index 43e61834a..afb37e971 100644 --- a/site/docs/v0.11.0/image-tagging.md +++ b/site/docs/v0.11.0/image-tagging.md @@ -16,6 +16,6 @@ The `latest` tag follows the most recently released version of Velero. ## Development -`gcr.io/heptio-images/velero:master` +`gcr.io/heptio-images/velero:main` -The `master` tag follows the latest commit to land on the `master` branch. +The `main` tag follows the latest commit to land on the `main` branch. diff --git a/site/docs/v0.11.0/migration-case.md b/site/docs/v0.11.0/migration-case.md index 9d3a659ac..a4917fb99 100644 --- a/site/docs/v0.11.0/migration-case.md +++ b/site/docs/v0.11.0/migration-case.md @@ -45,4 +45,4 @@ Check that the second cluster is behaving as expected: velero restore describe ``` -If you encounter issues, make sure that Velero is running in the same namespace in both clusters. \ No newline at end of file +If you encounter issues, make sure that Velero is running in the same namespace in both clusters. diff --git a/site/docs/v0.11.0/plugins.md b/site/docs/v0.11.0/plugins.md index dceb2f2be..12a6c876e 100644 --- a/site/docs/v0.11.0/plugins.md +++ b/site/docs/v0.11.0/plugins.md @@ -28,4 +28,4 @@ within your plugin. [1]: https://github.com/heptio/velero-plugin-example -[2]: https://github.com/heptio/velero/blob/master/pkg/plugin/logger.go +[2]: https://github.com/heptio/velero/blob/main/pkg/plugin/logger.go diff --git a/site/docs/v0.3.0/README.md b/site/docs/v0.3.0/README.md index 45161366b..c1f105424 100644 --- a/site/docs/v0.3.0/README.md +++ b/site/docs/v0.3.0/README.md @@ -192,7 +192,7 @@ See [the list of releases][6] to find out about feature changes. [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [13]: /output-file-format.md [14]: https://github.com/kubernetes/kubernetes [15]: https://aws.amazon.com/ diff --git a/site/docs/v0.4.0/README.md b/site/docs/v0.4.0/README.md index a231d505c..77793f086 100644 --- a/site/docs/v0.4.0/README.md +++ b/site/docs/v0.4.0/README.md @@ -47,7 +47,7 @@ git clone git@github.com:heptio/ark.git > NOTE: Documentation may change between releases. See the [Changelog][20] for links to previous versions of this repository and its docs. > -> To ensure that you are working off a specific release, `git checkout ` where `` is the appropriate tag for the Ark version you wish to use (e.g. "v0.3.3"). You should `git checkout master` only if you're planning on [building the Ark image from scratch][7]. +> To ensure that you are working off a specific release, `git checkout ` where `` is the appropriate tag for the Ark version you wish to use (e.g. "v0.3.3"). You should `git checkout main` only if you're planning on [building the Ark image from scratch][7]. ### 2. Setup @@ -187,8 +187,8 @@ Feedback and discussion is available on [the mailing list][24]. See [the list of releases][6] to find out about feature changes. [0]: https://github.com/heptio -[1]: https://jenkins.i.heptio.com/buildStatus/icon?job=ark-master -[2]: https://jenkins.i.heptio.com/job/ark-master/ +[1]: https://jenkins.i.heptio.com/buildStatus/icon?job=ark-main +[2]: https://jenkins.i.heptio.com/job/ark-main/ [3]: / [4]: https://github.com/heptio/ark/issues [5]: https://github.com/heptio/ark/tree/v0.4.0/CONTRIBUTING.md @@ -198,7 +198,7 @@ See [the list of releases][6] to find out about feature changes. [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [13]: /output-file-format.md [14]: https://github.com/kubernetes/kubernetes [15]: https://aws.amazon.com/ diff --git a/site/docs/v0.4.0/cloud-provider-specifics.md b/site/docs/v0.4.0/cloud-provider-specifics.md index 105f0e271..4b1954f0b 100644 --- a/site/docs/v0.4.0/cloud-provider-specifics.md +++ b/site/docs/v0.4.0/cloud-provider-specifics.md @@ -2,7 +2,7 @@ > NOTE: Documentation may change between releases. See the [Changelog][20] for links to previous versions of this repository and its docs. > -> To ensure that you are working off a specific release, `git checkout ` where `` is the appropriate tag for the Ark version you wish to use (e.g. "v0.3.3"). You should `git checkout master` only if you're planning on [building the Ark image from scratch][21]. +> To ensure that you are working off a specific release, `git checkout ` where `` is the appropriate tag for the Ark version you wish to use (e.g. "v0.3.3"). You should `git checkout main` only if you're planning on [building the Ark image from scratch][21]. While the [Quickstart][0] uses a local storage service to quickly set up Heptio Ark as a demonstration, this document details additional configurations that are required when integrating with the cloud providers below: diff --git a/site/docs/v0.5.0/README.md b/site/docs/v0.5.0/README.md index 981bfc3e3..1aaa0f605 100644 --- a/site/docs/v0.5.0/README.md +++ b/site/docs/v0.5.0/README.md @@ -47,7 +47,7 @@ git clone git@github.com:heptio/ark.git > NOTE: Documentation may change between releases. See the [Changelog][20] for links to previous versions of this repository and its docs. > -> To ensure that you are working off a specific release, `git checkout ` where `` is the appropriate tag for the Ark version you wish to use (e.g. "v0.3.3"). You should `git checkout master` only if you're planning on [building the Ark image from scratch][7]. +> To ensure that you are working off a specific release, `git checkout ` where `` is the appropriate tag for the Ark version you wish to use (e.g. "v0.3.3"). You should `git checkout main` only if you're planning on [building the Ark image from scratch][7]. ### 2. Setup @@ -184,8 +184,8 @@ Feedback and discussion is available on [the mailing list][24]. See [the list of releases][6] to find out about feature changes. [0]: https://github.com/heptio -[1]: https://jenkins.i.heptio.com/buildStatus/icon?job=ark-master -[2]: https://jenkins.i.heptio.com/job/ark-master/ +[1]: https://jenkins.i.heptio.com/buildStatus/icon?job=ark-main +[2]: https://jenkins.i.heptio.com/job/ark-main/ [3]: / [4]: https://github.com/heptio/ark/issues [5]: https://github.com/heptio/ark/tree/v0.5.0/CONTRIBUTING.md @@ -195,7 +195,7 @@ See [the list of releases][6] to find out about feature changes. [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [13]: /output-file-format.md [14]: https://github.com/kubernetes/kubernetes [15]: https://aws.amazon.com/ diff --git a/site/docs/v0.5.0/cloud-provider-specifics.md b/site/docs/v0.5.0/cloud-provider-specifics.md index 889d448d5..d30a2867d 100644 --- a/site/docs/v0.5.0/cloud-provider-specifics.md +++ b/site/docs/v0.5.0/cloud-provider-specifics.md @@ -2,7 +2,7 @@ > NOTE: Documentation may change between releases. See the [Changelog][20] for links to previous versions of this repository and its docs. > -> To ensure that you are working off a specific release, `git checkout ` where `` is the appropriate tag for the Ark version you wish to use (e.g. "v0.3.3"). You should `git checkout master` only if you're planning on [building the Ark image from scratch][21]. +> To ensure that you are working off a specific release, `git checkout ` where `` is the appropriate tag for the Ark version you wish to use (e.g. "v0.3.3"). You should `git checkout main` only if you're planning on [building the Ark image from scratch][21]. While the [Quickstart][0] uses a local storage service to quickly set up Heptio Ark as a demonstration, this document details additional configurations that are required when integrating with the cloud providers below: diff --git a/site/docs/v0.5.0/faq.md b/site/docs/v0.5.0/faq.md index bc6ec9399..d51011f69 100644 --- a/site/docs/v0.5.0/faq.md +++ b/site/docs/v0.5.0/faq.md @@ -22,4 +22,4 @@ Examples of cases where Ark is useful: Yes, with some exceptions. For example, when Ark restores pods it deletes the `nodeName` from the pod so that it can be scheduled onto a new node. You can see some more examples of the differences -in [pod_restorer.go](https://github.com/heptio/ark/blob/master/pkg/restore/restorers/pod_restorer.go) +in [pod_restorer.go](https://github.com/heptio/ark/blob/main/pkg/restore/restorers/pod_restorer.go) diff --git a/site/docs/v0.6.0/README.md b/site/docs/v0.6.0/README.md index e48c529fb..599e953f8 100644 --- a/site/docs/v0.6.0/README.md +++ b/site/docs/v0.6.0/README.md @@ -47,7 +47,7 @@ git clone git@github.com:heptio/ark.git > NOTE: Documentation may change between releases. See the [Changelog][20] for links to previous versions of this repository and its docs. > -> To ensure that you are working off a specific release, `git checkout ` where `` is the appropriate tag for the Ark version you wish to use (e.g. "v0.3.3"). You should `git checkout master` only if you're planning on [building the Ark image from scratch][7]. +> To ensure that you are working off a specific release, `git checkout ` where `` is the appropriate tag for the Ark version you wish to use (e.g. "v0.3.3"). You should `git checkout main` only if you're planning on [building the Ark image from scratch][7]. ### 2. Setup @@ -192,7 +192,7 @@ Feedback and discussion is available on [the mailing list][24]. See [the list of releases][6] to find out about feature changes. [0]: https://github.com/heptio -[1]: https://travis-ci.org/heptio/ark.svg?branch=master +[1]: https://travis-ci.org/heptio/ark.svg?branch=main [2]: https://travis-ci.org/heptio/ark [3]: / [4]: https://github.com/heptio/ark/issues @@ -203,7 +203,7 @@ See [the list of releases][6] to find out about feature changes. [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [13]: /output-file-format.md [14]: https://github.com/kubernetes/kubernetes [15]: https://aws.amazon.com/ @@ -219,4 +219,4 @@ See [the list of releases][6] to find out about feature changes. [25]: http://slack.kubernetes.io/ [26]: https://github.com/heptio/ark/releases [27]: /hooks.md -[28]: /plugins.md \ No newline at end of file +[28]: /plugins.md diff --git a/site/docs/v0.6.0/build-from-scratch.md b/site/docs/v0.6.0/build-from-scratch.md index 7e81697ed..feae2e62d 100644 --- a/site/docs/v0.6.0/build-from-scratch.md +++ b/site/docs/v0.6.0/build-from-scratch.md @@ -115,4 +115,4 @@ If you need to add or update the vendored dependencies, please see [Vendoring de [11]: vendoring-dependencies.md [12]: #3-test [13]: ../hack/generate-proto.sh -[14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 \ No newline at end of file +[14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 diff --git a/site/docs/v0.6.0/cloud-provider-specifics.md b/site/docs/v0.6.0/cloud-provider-specifics.md index 9ebaadb57..7f5c66383 100644 --- a/site/docs/v0.6.0/cloud-provider-specifics.md +++ b/site/docs/v0.6.0/cloud-provider-specifics.md @@ -2,7 +2,7 @@ > NOTE: Documentation may change between releases. See the [Changelog][20] for links to previous versions of this repository and its docs. > -> To ensure that you are working off a specific release, `git checkout ` where `` is the appropriate tag for the Ark version you wish to use (e.g. "v0.3.3"). You should `git checkout master` only if you're planning on [building the Ark image from scratch][21]. +> To ensure that you are working off a specific release, `git checkout ` where `` is the appropriate tag for the Ark version you wish to use (e.g. "v0.3.3"). You should `git checkout main` only if you're planning on [building the Ark image from scratch][21]. While the [Quickstart][0] uses a local storage service to quickly set up Heptio Ark as a demonstration, this document details additional configurations that are required when integrating with the cloud providers below: diff --git a/site/docs/v0.6.0/faq.md b/site/docs/v0.6.0/faq.md index b946652f8..f83829ec9 100644 --- a/site/docs/v0.6.0/faq.md +++ b/site/docs/v0.6.0/faq.md @@ -22,4 +22,4 @@ Examples of cases where Ark is useful: Yes, with some exceptions. For example, when Ark restores pods it deletes the `nodeName` from the pod so that it can be scheduled onto a new node. You can see some more examples of the differences -in [pod_action.go](https://github.com/heptio/ark/blob/master/pkg/restore/pod_action.go) +in [pod_action.go](https://github.com/heptio/ark/blob/main/pkg/restore/pod_action.go) diff --git a/site/docs/v0.6.0/plugins.md b/site/docs/v0.6.0/plugins.md index df4f4496b..1cb2ae391 100644 --- a/site/docs/v0.6.0/plugins.md +++ b/site/docs/v0.6.0/plugins.md @@ -32,4 +32,4 @@ within your plugin. [1]: https://github.com/heptio/ark-plugin-example -[2]: https://github.com/heptio/ark/blob/master/pkg/plugin/logger.go \ No newline at end of file +[2]: https://github.com/heptio/ark/blob/main/pkg/plugin/logger.go diff --git a/site/docs/v0.7.0/README.md b/site/docs/v0.7.0/README.md index 93b6d6c45..cdcca123b 100644 --- a/site/docs/v0.7.0/README.md +++ b/site/docs/v0.7.0/README.md @@ -37,7 +37,7 @@ Clone or fork the Ark repository: git clone git@github.com:heptio/ark.git ``` -NOTE: Make sure to check out the appropriate version. We recommend that you check out the latest tagged version. The master branch is under active development and might not be stable. +NOTE: Make sure to check out the appropriate version. We recommend that you check out the latest tagged version. The main branch is under active development and might not be stable. ### Set up server @@ -169,18 +169,18 @@ Feedback and discussion is available on [the mailing list][24]. See [the list of releases][6] to find out about feature changes. [0]: https://github.com/heptio -[1]: https://travis-ci.org/heptio/ark.svg?branch=master +[1]: https://travis-ci.org/heptio/ark.svg?branch=main [2]: https://travis-ci.org/heptio/ark [3]: /cloud-common.md [4]: https://github.com/heptio/ark/issues -[5]: https://github.com/heptio/ark/blob/master/CONTRIBUTING.md +[5]: https://github.com/heptio/ark/blob/main/CONTRIBUTING.md [6]: https://github.com/heptio/ark/releases [7]: /build-from-scratch.md -[8]: https://github.com/heptio/ark/blob/master/CODE_OF_CONDUCT.md +[8]: https://github.com/heptio/ark/blob/main/CODE_OF_CONDUCT.md [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [13]: /output-file-format.md [14]: https://github.com/kubernetes/kubernetes [15]: https://aws.amazon.com/ diff --git a/site/docs/v0.7.0/about.md b/site/docs/v0.7.0/about.md index 969e49594..2cb82db26 100644 --- a/site/docs/v0.7.0/about.md +++ b/site/docs/v0.7.0/about.md @@ -77,4 +77,4 @@ Heptio Ark treats object storage as the source of truth. It continuously checks This allows restore functionality to work in a cluster migration scenario, where the original Backup objects do not exist in the new cluster. See the tutorials for details. [19]: /img/backup-process.png -[30]: https://github.com/heptio/ark/blob/master/docs/cli-reference/ark_create_backup.md \ No newline at end of file +[30]: https://github.com/heptio/ark/blob/main/docs/cli-reference/ark_create_backup.md diff --git a/site/docs/v0.7.0/build-from-scratch.md b/site/docs/v0.7.0/build-from-scratch.md index 95f306c05..6552682e3 100644 --- a/site/docs/v0.7.0/build-from-scratch.md +++ b/site/docs/v0.7.0/build-from-scratch.md @@ -109,12 +109,12 @@ If you need to add or update the vendored dependencies, see [Vendoring dependenc [3]: #build [4]: ../README.md#quickstart [5]: https://golang.org/doc/install -[6]: https://github.com/heptio/ark/tree/master/examples +[6]: https://github.com/heptio/ark/tree/main/examples [7]: #run [8]: /config-definition.md [9]: /cloud-common.md [10]: #vendoring-dependencies [11]: /vendoring-dependencies.md [12]: #test -[13]: https://github.com/heptio/ark/blob/master/hack/generate-proto.sh -[14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 \ No newline at end of file +[13]: https://github.com/heptio/ark/blob/main/hack/generate-proto.sh +[14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 diff --git a/site/docs/v0.7.0/cli-reference/README.md b/site/docs/v0.7.0/cli-reference/README.md index 00cca3a2f..29bebb516 100644 --- a/site/docs/v0.7.0/cli-reference/README.md +++ b/site/docs/v0.7.0/cli-reference/README.md @@ -16,5 +16,5 @@ In general, Ark will search for your cluster credentials in the following order: * `$KUBECONFIG` environment variable * In-cluster credentials--this only works when you are running Ark in a pod -[1]: https://github.com/heptio/ark/tree/master/docs/cli-reference +[1]: https://github.com/heptio/ark/tree/main/docs/cli-reference [26]: https://github.com/heptio/ark/releases diff --git a/site/docs/v0.7.0/cloud-common.md b/site/docs/v0.7.0/cloud-common.md index 515bd31bc..0adf4cb10 100644 --- a/site/docs/v0.7.0/cloud-common.md +++ b/site/docs/v0.7.0/cloud-common.md @@ -74,4 +74,4 @@ After you set up the Ark server, try these examples: [1]: /gcp-config.md [2]: /azure-config.md [3]: /namespace.md -[19]: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#reclaiming \ No newline at end of file +[19]: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#reclaiming diff --git a/site/docs/v0.7.0/faq.md b/site/docs/v0.7.0/faq.md index b946652f8..f83829ec9 100644 --- a/site/docs/v0.7.0/faq.md +++ b/site/docs/v0.7.0/faq.md @@ -22,4 +22,4 @@ Examples of cases where Ark is useful: Yes, with some exceptions. For example, when Ark restores pods it deletes the `nodeName` from the pod so that it can be scheduled onto a new node. You can see some more examples of the differences -in [pod_action.go](https://github.com/heptio/ark/blob/master/pkg/restore/pod_action.go) +in [pod_action.go](https://github.com/heptio/ark/blob/main/pkg/restore/pod_action.go) diff --git a/site/docs/v0.7.0/namespace.md b/site/docs/v0.7.0/namespace.md index d4ed2dfe4..1a82a5c38 100644 --- a/site/docs/v0.7.0/namespace.md +++ b/site/docs/v0.7.0/namespace.md @@ -6,7 +6,7 @@ In Ark version 0.7.0 and later, you can run Ark in any namespace. To do so, you The Ark repository includes [a set of examples][0] that you can use to set up your Ark server. The examples specify only the default `heptio-ark` namespace. To run in another namespace, you edit the relevant files to specify your custom namespace. -For all cloud providers, edit `https://github.com/heptio/ark/blob/master/examples/common/00-prereqs.yaml`. This file defines: +For all cloud providers, edit `https://github.com/heptio/ark/blob/main/examples/common/00-prereqs.yaml`. This file defines: * CustomResourceDefinitions for the Ark objects (backups, schedules, restores, configs, downloadrequests) * The Ark namespace @@ -18,24 +18,24 @@ For all cloud providers, edit `https://github.com/heptio/ark/blob/master/example For AWS, edit: -* `https://github.com/heptio/ark/blob/master/examples/common/10-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/aws/00-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/common/10-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/aws/00-ark-config.yaml` ### GCP For GCP, edit: -* `https://github.com/heptio/ark/blob/master/examples/common/10-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/gcp/00-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/common/10-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/gcp/00-ark-config.yaml` ### Azure For Azure, edit: -* `https://github.com/heptio/ark/blob/master/examples/azure/00-ark-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/azure/10-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/azure/00-ark-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/azure/10-ark-config.yaml` ## Specify the namespace in client commands @@ -48,4 +48,4 @@ ark client config set namespace= -[0]: https://github.com/heptio/ark/tree/master/examples \ No newline at end of file +[0]: https://github.com/heptio/ark/tree/main/examples diff --git a/site/docs/v0.7.0/plugins.md b/site/docs/v0.7.0/plugins.md index df4f4496b..1cb2ae391 100644 --- a/site/docs/v0.7.0/plugins.md +++ b/site/docs/v0.7.0/plugins.md @@ -32,4 +32,4 @@ within your plugin. [1]: https://github.com/heptio/ark-plugin-example -[2]: https://github.com/heptio/ark/blob/master/pkg/plugin/logger.go \ No newline at end of file +[2]: https://github.com/heptio/ark/blob/main/pkg/plugin/logger.go diff --git a/site/docs/v0.7.1/README.md b/site/docs/v0.7.1/README.md index 08a8ef75b..883611498 100644 --- a/site/docs/v0.7.1/README.md +++ b/site/docs/v0.7.1/README.md @@ -41,7 +41,7 @@ Clone or fork the Ark repository: git clone git@github.com:heptio/ark.git ``` -NOTE: Make sure to check out the appropriate version. We recommend that you check out the latest tagged version. The master branch is under active development and might not be stable. +NOTE: Make sure to check out the appropriate version. We recommend that you check out the latest tagged version. The main branch is under active development and might not be stable. ### Set up server @@ -181,18 +181,18 @@ Feedback and discussion is available on [the mailing list][24]. See [the list of releases][6] to find out about feature changes. [0]: https://github.com/heptio -[1]: https://travis-ci.org/heptio/ark.svg?branch=master +[1]: https://travis-ci.org/heptio/ark.svg?branch=main [2]: https://travis-ci.org/heptio/ark [3]: /cloud-common.md [4]: https://github.com/heptio/ark/issues -[5]: https://github.com/heptio/ark/blob/master/CONTRIBUTING.md +[5]: https://github.com/heptio/ark/blob/main/CONTRIBUTING.md [6]: https://github.com/heptio/ark/releases [7]: /build-from-scratch.md -[8]: https://github.com/heptio/ark/blob/master/CODE_OF_CONDUCT.md +[8]: https://github.com/heptio/ark/blob/main/CODE_OF_CONDUCT.md [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [13]: /output-file-format.md [14]: https://github.com/kubernetes/kubernetes [15]: https://aws.amazon.com/ diff --git a/site/docs/v0.7.1/about.md b/site/docs/v0.7.1/about.md index 969e49594..2cb82db26 100644 --- a/site/docs/v0.7.1/about.md +++ b/site/docs/v0.7.1/about.md @@ -77,4 +77,4 @@ Heptio Ark treats object storage as the source of truth. It continuously checks This allows restore functionality to work in a cluster migration scenario, where the original Backup objects do not exist in the new cluster. See the tutorials for details. [19]: /img/backup-process.png -[30]: https://github.com/heptio/ark/blob/master/docs/cli-reference/ark_create_backup.md \ No newline at end of file +[30]: https://github.com/heptio/ark/blob/main/docs/cli-reference/ark_create_backup.md diff --git a/site/docs/v0.7.1/build-from-scratch.md b/site/docs/v0.7.1/build-from-scratch.md index 8673ddca0..9ef0bc5ed 100644 --- a/site/docs/v0.7.1/build-from-scratch.md +++ b/site/docs/v0.7.1/build-from-scratch.md @@ -109,12 +109,12 @@ If you need to add or update the vendored dependencies, see [Vendoring dependenc [3]: #build [4]: ../README.md#quickstart [5]: https://golang.org/doc/install -[6]: https://github.com/heptio/ark/tree/master/examples +[6]: https://github.com/heptio/ark/tree/main/examples [7]: #run [8]: config-definition.md [9]: cloud-common.md [10]: #vendoring-dependencies [11]: vendoring-dependencies.md [12]: #test -[13]: https://github.com/heptio/ark/blob/master/hack/generate-proto.sh -[14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 \ No newline at end of file +[13]: https://github.com/heptio/ark/blob/main/hack/generate-proto.sh +[14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 diff --git a/site/docs/v0.7.1/cli-reference/README.md b/site/docs/v0.7.1/cli-reference/README.md index 00cca3a2f..29bebb516 100644 --- a/site/docs/v0.7.1/cli-reference/README.md +++ b/site/docs/v0.7.1/cli-reference/README.md @@ -16,5 +16,5 @@ In general, Ark will search for your cluster credentials in the following order: * `$KUBECONFIG` environment variable * In-cluster credentials--this only works when you are running Ark in a pod -[1]: https://github.com/heptio/ark/tree/master/docs/cli-reference +[1]: https://github.com/heptio/ark/tree/main/docs/cli-reference [26]: https://github.com/heptio/ark/releases diff --git a/site/docs/v0.7.1/debugging-deletes.md b/site/docs/v0.7.1/debugging-deletes.md index f101c099c..b16693c22 100644 --- a/site/docs/v0.7.1/debugging-deletes.md +++ b/site/docs/v0.7.1/debugging-deletes.md @@ -44,4 +44,4 @@ namespace/heptio-ark`, the Ark server pod might be deleted before the backups, b the order of deletions is arbitrary. If this happens, the remaining bacukps are stuck in a deleting state, because the Ark server pod no longer exists to remove their finalizers. -[0]: https://stedolan.github.io/jq/ \ No newline at end of file +[0]: https://stedolan.github.io/jq/ diff --git a/site/docs/v0.7.1/faq.md b/site/docs/v0.7.1/faq.md index b946652f8..f83829ec9 100644 --- a/site/docs/v0.7.1/faq.md +++ b/site/docs/v0.7.1/faq.md @@ -22,4 +22,4 @@ Examples of cases where Ark is useful: Yes, with some exceptions. For example, when Ark restores pods it deletes the `nodeName` from the pod so that it can be scheduled onto a new node. You can see some more examples of the differences -in [pod_action.go](https://github.com/heptio/ark/blob/master/pkg/restore/pod_action.go) +in [pod_action.go](https://github.com/heptio/ark/blob/main/pkg/restore/pod_action.go) diff --git a/site/docs/v0.7.1/namespace.md b/site/docs/v0.7.1/namespace.md index e3f48e371..6f8e38d97 100644 --- a/site/docs/v0.7.1/namespace.md +++ b/site/docs/v0.7.1/namespace.md @@ -20,7 +20,7 @@ WARNING: It is recommended to run the Ark server in one namespace, and place you restores, and config in a different namespace. You might encounter issues with deleting a single Ark namespace that contains everything. -For all cloud providers, edit `https://github.com/heptio/ark/blob/master/examples/common/00-prereqs.yaml`. This file defines: +For all cloud providers, edit `https://github.com/heptio/ark/blob/main/examples/common/00-prereqs.yaml`. This file defines: * CustomResourceDefinitions for the Ark objects (backups, schedules, restores, configs, downloadrequests) * The namespace where the Ark server runs @@ -33,24 +33,24 @@ For all cloud providers, edit `https://github.com/heptio/ark/blob/master/example For AWS, edit: -* `https://github.com/heptio/ark/blob/master/examples/common/10-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/aws/00-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/common/10-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/aws/00-ark-config.yaml` ### GCP For GCP, edit: -* `https://github.com/heptio/ark/blob/master/examples/common/10-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/gcp/00-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/common/10-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/gcp/00-ark-config.yaml` ### Azure For Azure, edit: -* `https://github.com/heptio/ark/blob/master/examples/azure/00-ark-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/azure/10-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/azure/00-ark-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/azure/10-ark-config.yaml` ## Specify the namespace in client commands @@ -63,4 +63,4 @@ ark client config set namespace= -[0]: https://github.com/heptio/ark/tree/master/examples +[0]: https://github.com/heptio/ark/tree/main/examples diff --git a/site/docs/v0.7.1/plugins.md b/site/docs/v0.7.1/plugins.md index df4f4496b..1cb2ae391 100644 --- a/site/docs/v0.7.1/plugins.md +++ b/site/docs/v0.7.1/plugins.md @@ -32,4 +32,4 @@ within your plugin. [1]: https://github.com/heptio/ark-plugin-example -[2]: https://github.com/heptio/ark/blob/master/pkg/plugin/logger.go \ No newline at end of file +[2]: https://github.com/heptio/ark/blob/main/pkg/plugin/logger.go diff --git a/site/docs/v0.7.1/troubleshooting.md b/site/docs/v0.7.1/troubleshooting.md index 45e2eba56..39ea7c7cb 100644 --- a/site/docs/v0.7.1/troubleshooting.md +++ b/site/docs/v0.7.1/troubleshooting.md @@ -9,4 +9,4 @@ These tips can help you troubleshoot known issues. If they don't help, you can [ [0]: debugging-deletes.md [1]: debugging-restores.md [4]: https://github.com/heptio/ark/issues -[25]: http://slack.kubernetes.io/ \ No newline at end of file +[25]: http://slack.kubernetes.io/ diff --git a/site/docs/v0.8.0/README.md b/site/docs/v0.8.0/README.md index 9b64d6073..0ce358e1d 100644 --- a/site/docs/v0.8.0/README.md +++ b/site/docs/v0.8.0/README.md @@ -41,7 +41,7 @@ Clone or fork the Ark repository: git clone git@github.com:heptio/ark.git ``` -NOTE: Make sure to check out the appropriate version. We recommend that you check out the latest tagged version. The master branch is under active development and might not be stable. +NOTE: Make sure to check out the appropriate version. We recommend that you check out the latest tagged version. The main branch is under active development and might not be stable. ### Set up server @@ -187,18 +187,18 @@ Feedback and discussion is available on [the mailing list][24]. See [the list of releases][6] to find out about feature changes. [0]: https://github.com/heptio -[1]: https://travis-ci.org/heptio/ark.svg?branch=master +[1]: https://travis-ci.org/heptio/ark.svg?branch=main [2]: https://travis-ci.org/heptio/ark [3]: /cloud-common.md [4]: https://github.com/heptio/ark/issues -[5]: https://github.com/heptio/ark/blob/master/CONTRIBUTING.md +[5]: https://github.com/heptio/ark/blob/main/CONTRIBUTING.md [6]: https://github.com/heptio/ark/releases [7]: /build-from-scratch.md -[8]: https://github.com/heptio/ark/blob/master/CODE_OF_CONDUCT.md +[8]: https://github.com/heptio/ark/blob/main/CODE_OF_CONDUCT.md [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [13]: /output-file-format.md [14]: https://github.com/kubernetes/kubernetes [15]: https://aws.amazon.com/ diff --git a/site/docs/v0.8.0/about.md b/site/docs/v0.8.0/about.md index 969e49594..2cb82db26 100644 --- a/site/docs/v0.8.0/about.md +++ b/site/docs/v0.8.0/about.md @@ -77,4 +77,4 @@ Heptio Ark treats object storage as the source of truth. It continuously checks This allows restore functionality to work in a cluster migration scenario, where the original Backup objects do not exist in the new cluster. See the tutorials for details. [19]: /img/backup-process.png -[30]: https://github.com/heptio/ark/blob/master/docs/cli-reference/ark_create_backup.md \ No newline at end of file +[30]: https://github.com/heptio/ark/blob/main/docs/cli-reference/ark_create_backup.md diff --git a/site/docs/v0.8.0/build-from-scratch.md b/site/docs/v0.8.0/build-from-scratch.md index 8673ddca0..9ef0bc5ed 100644 --- a/site/docs/v0.8.0/build-from-scratch.md +++ b/site/docs/v0.8.0/build-from-scratch.md @@ -109,12 +109,12 @@ If you need to add or update the vendored dependencies, see [Vendoring dependenc [3]: #build [4]: ../README.md#quickstart [5]: https://golang.org/doc/install -[6]: https://github.com/heptio/ark/tree/master/examples +[6]: https://github.com/heptio/ark/tree/main/examples [7]: #run [8]: config-definition.md [9]: cloud-common.md [10]: #vendoring-dependencies [11]: vendoring-dependencies.md [12]: #test -[13]: https://github.com/heptio/ark/blob/master/hack/generate-proto.sh -[14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 \ No newline at end of file +[13]: https://github.com/heptio/ark/blob/main/hack/generate-proto.sh +[14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 diff --git a/site/docs/v0.8.0/cli-reference/README.md b/site/docs/v0.8.0/cli-reference/README.md index 00cca3a2f..29bebb516 100644 --- a/site/docs/v0.8.0/cli-reference/README.md +++ b/site/docs/v0.8.0/cli-reference/README.md @@ -16,5 +16,5 @@ In general, Ark will search for your cluster credentials in the following order: * `$KUBECONFIG` environment variable * In-cluster credentials--this only works when you are running Ark in a pod -[1]: https://github.com/heptio/ark/tree/master/docs/cli-reference +[1]: https://github.com/heptio/ark/tree/main/docs/cli-reference [26]: https://github.com/heptio/ark/releases diff --git a/site/docs/v0.8.0/debugging-deletes.md b/site/docs/v0.8.0/debugging-deletes.md index f101c099c..b16693c22 100644 --- a/site/docs/v0.8.0/debugging-deletes.md +++ b/site/docs/v0.8.0/debugging-deletes.md @@ -44,4 +44,4 @@ namespace/heptio-ark`, the Ark server pod might be deleted before the backups, b the order of deletions is arbitrary. If this happens, the remaining bacukps are stuck in a deleting state, because the Ark server pod no longer exists to remove their finalizers. -[0]: https://stedolan.github.io/jq/ \ No newline at end of file +[0]: https://stedolan.github.io/jq/ diff --git a/site/docs/v0.8.0/faq.md b/site/docs/v0.8.0/faq.md index b946652f8..f83829ec9 100644 --- a/site/docs/v0.8.0/faq.md +++ b/site/docs/v0.8.0/faq.md @@ -22,4 +22,4 @@ Examples of cases where Ark is useful: Yes, with some exceptions. For example, when Ark restores pods it deletes the `nodeName` from the pod so that it can be scheduled onto a new node. You can see some more examples of the differences -in [pod_action.go](https://github.com/heptio/ark/blob/master/pkg/restore/pod_action.go) +in [pod_action.go](https://github.com/heptio/ark/blob/main/pkg/restore/pod_action.go) diff --git a/site/docs/v0.8.0/namespace.md b/site/docs/v0.8.0/namespace.md index 004771634..c15ee41b4 100644 --- a/site/docs/v0.8.0/namespace.md +++ b/site/docs/v0.8.0/namespace.md @@ -16,7 +16,7 @@ To store your backups, schedules, restores, and config in another namespace, you files, changing `heptio-ark` to your desired namespace. You also need to create the `cloud-credentials` secret in your desired namespace. -For all cloud providers, edit `https://github.com/heptio/ark/blob/master/examples/common/00-prereqs.yaml`. This file defines: +For all cloud providers, edit `https://github.com/heptio/ark/blob/main/examples/common/00-prereqs.yaml`. This file defines: * CustomResourceDefinitions for the Ark objects (backups, schedules, restores, configs, downloadrequests) * The namespace where the Ark server runs @@ -29,31 +29,31 @@ For all cloud providers, edit `https://github.com/heptio/ark/blob/master/example For AWS, edit: -* `https://github.com/heptio/ark/blob/master/examples/aws/10-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/aws/00-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/aws/10-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/aws/00-ark-config.yaml` ### GCP For GCP, edit: -* `https://github.com/heptio/ark/blob/master/examples/gcp/10-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/gcp/00-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/gcp/10-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/gcp/00-ark-config.yaml` ### Azure For Azure, edit: -* `https://github.com/heptio/ark/blob/master/examples/azure/00-ark-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/azure/10-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/azure/00-ark-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/azure/10-ark-config.yaml` ### IBM For IBM, edit: -* `https://github.com/heptio/ark/blob/master/examples/ibm/10-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/ibm/00-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/ibm/10-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/ibm/00-ark-config.yaml` ## Specify the namespace in client commands @@ -65,4 +65,4 @@ ark client config set namespace= -[0]: https://github.com/heptio/ark/tree/master/examples +[0]: https://github.com/heptio/ark/tree/main/examples diff --git a/site/docs/v0.8.0/plugins.md b/site/docs/v0.8.0/plugins.md index df4f4496b..1cb2ae391 100644 --- a/site/docs/v0.8.0/plugins.md +++ b/site/docs/v0.8.0/plugins.md @@ -32,4 +32,4 @@ within your plugin. [1]: https://github.com/heptio/ark-plugin-example -[2]: https://github.com/heptio/ark/blob/master/pkg/plugin/logger.go \ No newline at end of file +[2]: https://github.com/heptio/ark/blob/main/pkg/plugin/logger.go diff --git a/site/docs/v0.8.0/troubleshooting.md b/site/docs/v0.8.0/troubleshooting.md index 45e2eba56..39ea7c7cb 100644 --- a/site/docs/v0.8.0/troubleshooting.md +++ b/site/docs/v0.8.0/troubleshooting.md @@ -9,4 +9,4 @@ These tips can help you troubleshoot known issues. If they don't help, you can [ [0]: debugging-deletes.md [1]: debugging-restores.md [4]: https://github.com/heptio/ark/issues -[25]: http://slack.kubernetes.io/ \ No newline at end of file +[25]: http://slack.kubernetes.io/ diff --git a/site/docs/v0.8.1/README.md b/site/docs/v0.8.1/README.md index da4ab6e08..ff10c1bb4 100644 --- a/site/docs/v0.8.1/README.md +++ b/site/docs/v0.8.1/README.md @@ -41,7 +41,7 @@ Clone or fork the Ark repository: git clone git@github.com:heptio/ark.git ``` -NOTE: Make sure to check out the appropriate version. We recommend that you check out the latest tagged version. The master branch is under active development and might not be stable. +NOTE: Make sure to check out the appropriate version. We recommend that you check out the latest tagged version. The main branch is under active development and might not be stable. ### Set up server @@ -187,18 +187,18 @@ Feedback and discussion is available on [the mailing list][24]. See [the list of releases][6] to find out about feature changes. [0]: https://github.com/heptio -[1]: https://travis-ci.org/heptio/ark.svg?branch=master +[1]: https://travis-ci.org/heptio/ark.svg?branch=main [2]: https://travis-ci.org/heptio/ark [3]: /cloud-common.md [4]: https://github.com/heptio/ark/issues -[5]: https://github.com/heptio/ark/blob/master/CONTRIBUTING.md +[5]: https://github.com/heptio/ark/blob/main/CONTRIBUTING.md [6]: https://github.com/heptio/ark/releases [7]: /build-from-scratch.md -[8]: https://github.com/heptio/ark/blob/master/CODE_OF_CONDUCT.md +[8]: https://github.com/heptio/ark/blob/main/CODE_OF_CONDUCT.md [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [13]: /output-file-format.md [14]: https://github.com/kubernetes/kubernetes [15]: https://aws.amazon.com/ diff --git a/site/docs/v0.8.1/about.md b/site/docs/v0.8.1/about.md index 969e49594..2cb82db26 100644 --- a/site/docs/v0.8.1/about.md +++ b/site/docs/v0.8.1/about.md @@ -77,4 +77,4 @@ Heptio Ark treats object storage as the source of truth. It continuously checks This allows restore functionality to work in a cluster migration scenario, where the original Backup objects do not exist in the new cluster. See the tutorials for details. [19]: /img/backup-process.png -[30]: https://github.com/heptio/ark/blob/master/docs/cli-reference/ark_create_backup.md \ No newline at end of file +[30]: https://github.com/heptio/ark/blob/main/docs/cli-reference/ark_create_backup.md diff --git a/site/docs/v0.8.1/build-from-scratch.md b/site/docs/v0.8.1/build-from-scratch.md index 8673ddca0..9ef0bc5ed 100644 --- a/site/docs/v0.8.1/build-from-scratch.md +++ b/site/docs/v0.8.1/build-from-scratch.md @@ -109,12 +109,12 @@ If you need to add or update the vendored dependencies, see [Vendoring dependenc [3]: #build [4]: ../README.md#quickstart [5]: https://golang.org/doc/install -[6]: https://github.com/heptio/ark/tree/master/examples +[6]: https://github.com/heptio/ark/tree/main/examples [7]: #run [8]: config-definition.md [9]: cloud-common.md [10]: #vendoring-dependencies [11]: vendoring-dependencies.md [12]: #test -[13]: https://github.com/heptio/ark/blob/master/hack/generate-proto.sh -[14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 \ No newline at end of file +[13]: https://github.com/heptio/ark/blob/main/hack/generate-proto.sh +[14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 diff --git a/site/docs/v0.8.1/cli-reference/README.md b/site/docs/v0.8.1/cli-reference/README.md index 00cca3a2f..29bebb516 100644 --- a/site/docs/v0.8.1/cli-reference/README.md +++ b/site/docs/v0.8.1/cli-reference/README.md @@ -16,5 +16,5 @@ In general, Ark will search for your cluster credentials in the following order: * `$KUBECONFIG` environment variable * In-cluster credentials--this only works when you are running Ark in a pod -[1]: https://github.com/heptio/ark/tree/master/docs/cli-reference +[1]: https://github.com/heptio/ark/tree/main/docs/cli-reference [26]: https://github.com/heptio/ark/releases diff --git a/site/docs/v0.8.1/debugging-deletes.md b/site/docs/v0.8.1/debugging-deletes.md index f101c099c..b16693c22 100644 --- a/site/docs/v0.8.1/debugging-deletes.md +++ b/site/docs/v0.8.1/debugging-deletes.md @@ -44,4 +44,4 @@ namespace/heptio-ark`, the Ark server pod might be deleted before the backups, b the order of deletions is arbitrary. If this happens, the remaining bacukps are stuck in a deleting state, because the Ark server pod no longer exists to remove their finalizers. -[0]: https://stedolan.github.io/jq/ \ No newline at end of file +[0]: https://stedolan.github.io/jq/ diff --git a/site/docs/v0.8.1/debugging-install.md b/site/docs/v0.8.1/debugging-install.md index abf2d9ea7..2b0c72bc2 100644 --- a/site/docs/v0.8.1/debugging-install.md +++ b/site/docs/v0.8.1/debugging-install.md @@ -56,4 +56,4 @@ into the Ark server pod. Ensure the following: * The `cloud-credentials` secret is defined as a volume for the Ark deployment * The `cloud-credentials` secret is being mounted into the Ark server pod at `/credentials` -[0]: azure-config#credentials-and-configuration \ No newline at end of file +[0]: azure-config#credentials-and-configuration diff --git a/site/docs/v0.8.1/faq.md b/site/docs/v0.8.1/faq.md index b946652f8..f83829ec9 100644 --- a/site/docs/v0.8.1/faq.md +++ b/site/docs/v0.8.1/faq.md @@ -22,4 +22,4 @@ Examples of cases where Ark is useful: Yes, with some exceptions. For example, when Ark restores pods it deletes the `nodeName` from the pod so that it can be scheduled onto a new node. You can see some more examples of the differences -in [pod_action.go](https://github.com/heptio/ark/blob/master/pkg/restore/pod_action.go) +in [pod_action.go](https://github.com/heptio/ark/blob/main/pkg/restore/pod_action.go) diff --git a/site/docs/v0.8.1/namespace.md b/site/docs/v0.8.1/namespace.md index 004771634..c15ee41b4 100644 --- a/site/docs/v0.8.1/namespace.md +++ b/site/docs/v0.8.1/namespace.md @@ -16,7 +16,7 @@ To store your backups, schedules, restores, and config in another namespace, you files, changing `heptio-ark` to your desired namespace. You also need to create the `cloud-credentials` secret in your desired namespace. -For all cloud providers, edit `https://github.com/heptio/ark/blob/master/examples/common/00-prereqs.yaml`. This file defines: +For all cloud providers, edit `https://github.com/heptio/ark/blob/main/examples/common/00-prereqs.yaml`. This file defines: * CustomResourceDefinitions for the Ark objects (backups, schedules, restores, configs, downloadrequests) * The namespace where the Ark server runs @@ -29,31 +29,31 @@ For all cloud providers, edit `https://github.com/heptio/ark/blob/master/example For AWS, edit: -* `https://github.com/heptio/ark/blob/master/examples/aws/10-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/aws/00-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/aws/10-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/aws/00-ark-config.yaml` ### GCP For GCP, edit: -* `https://github.com/heptio/ark/blob/master/examples/gcp/10-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/gcp/00-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/gcp/10-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/gcp/00-ark-config.yaml` ### Azure For Azure, edit: -* `https://github.com/heptio/ark/blob/master/examples/azure/00-ark-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/azure/10-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/azure/00-ark-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/azure/10-ark-config.yaml` ### IBM For IBM, edit: -* `https://github.com/heptio/ark/blob/master/examples/ibm/10-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/ibm/00-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/ibm/10-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/ibm/00-ark-config.yaml` ## Specify the namespace in client commands @@ -65,4 +65,4 @@ ark client config set namespace= -[0]: https://github.com/heptio/ark/tree/master/examples +[0]: https://github.com/heptio/ark/tree/main/examples diff --git a/site/docs/v0.8.1/plugins.md b/site/docs/v0.8.1/plugins.md index df4f4496b..1cb2ae391 100644 --- a/site/docs/v0.8.1/plugins.md +++ b/site/docs/v0.8.1/plugins.md @@ -32,4 +32,4 @@ within your plugin. [1]: https://github.com/heptio/ark-plugin-example -[2]: https://github.com/heptio/ark/blob/master/pkg/plugin/logger.go \ No newline at end of file +[2]: https://github.com/heptio/ark/blob/main/pkg/plugin/logger.go diff --git a/site/docs/v0.8.1/troubleshooting.md b/site/docs/v0.8.1/troubleshooting.md index 8f5291a32..b96d96f4d 100644 --- a/site/docs/v0.8.1/troubleshooting.md +++ b/site/docs/v0.8.1/troubleshooting.md @@ -12,4 +12,4 @@ These tips can help you troubleshoot known issues. If they don't help, you can [ [1]: debugging-restores.md [2]: debugging-install.md [4]: https://github.com/heptio/ark/issues -[25]: https://kubernetes.slack.com/messages/ark-dr \ No newline at end of file +[25]: https://kubernetes.slack.com/messages/ark-dr diff --git a/site/docs/v0.9.0/README.md b/site/docs/v0.9.0/README.md index 4f06ffb0d..8f417b716 100644 --- a/site/docs/v0.9.0/README.md +++ b/site/docs/v0.9.0/README.md @@ -45,18 +45,18 @@ Feedback and discussion is available on [the mailing list][24]. See [the list of releases][6] to find out about feature changes. [0]: https://github.com/heptio -[1]: https://travis-ci.org/heptio/ark.svg?branch=master +[1]: https://travis-ci.org/heptio/ark.svg?branch=main [2]: https://travis-ci.org/heptio/ark [4]: https://github.com/heptio/ark/issues -[5]: https://github.com/heptio/ark/blob/master/CONTRIBUTING.md +[5]: https://github.com/heptio/ark/blob/main/CONTRIBUTING.md [6]: https://github.com/heptio/ark/releases -[8]: https://github.com/heptio/ark/blob/master/CODE_OF_CONDUCT.md +[8]: https://github.com/heptio/ark/blob/main/CODE_OF_CONDUCT.md [9]: https://kubernetes.io/docs/setup/ [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [14]: https://github.com/kubernetes/kubernetes diff --git a/site/docs/v0.9.0/about.md b/site/docs/v0.9.0/about.md index 291a2fd68..bea4177a6 100644 --- a/site/docs/v0.9.0/about.md +++ b/site/docs/v0.9.0/about.md @@ -69,4 +69,4 @@ This allows restore functionality to work in a cluster migration scenario, where [20]: https://kubernetes.io/docs/concepts/api-extension/custom-resources/#customresourcedefinitions [21]: https://kubernetes.io/docs/concepts/api-extension/custom-resources/#custom-controllers [22]: https://github.com/coreos/etcd -[30]: https://github.com/heptio/ark/blob/master/docs/cli-reference/ark_create_backup.md \ No newline at end of file +[30]: https://github.com/heptio/ark/blob/main/docs/cli-reference/ark_create_backup.md diff --git a/site/docs/v0.9.0/azure-config.md b/site/docs/v0.9.0/azure-config.md index 1de182450..e7302f638 100644 --- a/site/docs/v0.9.0/azure-config.md +++ b/site/docs/v0.9.0/azure-config.md @@ -165,4 +165,4 @@ In the root of your Ark directory, run: [8]: config-definition.md#azure [17]: https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects [18]: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli - [19]: https://docs.microsoft.com/en-us/azure/architecture/best-practices/naming-conventions#storage \ No newline at end of file + [19]: https://docs.microsoft.com/en-us/azure/architecture/best-practices/naming-conventions#storage diff --git a/site/docs/v0.9.0/build-from-scratch.md b/site/docs/v0.9.0/build-from-scratch.md index 8673ddca0..9ef0bc5ed 100644 --- a/site/docs/v0.9.0/build-from-scratch.md +++ b/site/docs/v0.9.0/build-from-scratch.md @@ -109,12 +109,12 @@ If you need to add or update the vendored dependencies, see [Vendoring dependenc [3]: #build [4]: ../README.md#quickstart [5]: https://golang.org/doc/install -[6]: https://github.com/heptio/ark/tree/master/examples +[6]: https://github.com/heptio/ark/tree/main/examples [7]: #run [8]: config-definition.md [9]: cloud-common.md [10]: #vendoring-dependencies [11]: vendoring-dependencies.md [12]: #test -[13]: https://github.com/heptio/ark/blob/master/hack/generate-proto.sh -[14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 \ No newline at end of file +[13]: https://github.com/heptio/ark/blob/main/hack/generate-proto.sh +[14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 diff --git a/site/docs/v0.9.0/cli-reference/README.md b/site/docs/v0.9.0/cli-reference/README.md index 00cca3a2f..29bebb516 100644 --- a/site/docs/v0.9.0/cli-reference/README.md +++ b/site/docs/v0.9.0/cli-reference/README.md @@ -16,5 +16,5 @@ In general, Ark will search for your cluster credentials in the following order: * `$KUBECONFIG` environment variable * In-cluster credentials--this only works when you are running Ark in a pod -[1]: https://github.com/heptio/ark/tree/master/docs/cli-reference +[1]: https://github.com/heptio/ark/tree/main/docs/cli-reference [26]: https://github.com/heptio/ark/releases diff --git a/site/docs/v0.9.0/debugging-install.md b/site/docs/v0.9.0/debugging-install.md index 7969f1bcd..e4796ca04 100644 --- a/site/docs/v0.9.0/debugging-install.md +++ b/site/docs/v0.9.0/debugging-install.md @@ -56,4 +56,4 @@ into the Ark server pod. Ensure the following: * The `cloud-credentials` secret is defined as a volume for the Ark deployment * The `cloud-credentials` secret is being mounted into the Ark server pod at `/credentials` -[0]: azure-config#credentials-and-configuration \ No newline at end of file +[0]: azure-config#credentials-and-configuration diff --git a/site/docs/v0.9.0/faq.md b/site/docs/v0.9.0/faq.md index 3d1988c9a..912bd68a0 100644 --- a/site/docs/v0.9.0/faq.md +++ b/site/docs/v0.9.0/faq.md @@ -22,7 +22,7 @@ Examples of cases where Ark is useful: Yes, with some exceptions. For example, when Ark restores pods it deletes the `nodeName` from the pod so that it can be scheduled onto a new node. You can see some more examples of the differences -in [pod_action.go](https://github.com/heptio/ark/blob/master/pkg/restore/pod_action.go) +in [pod_action.go](https://github.com/heptio/ark/blob/main/pkg/restore/pod_action.go) ## I'm using Ark in multiple clusters. Should I use the same bucket to store all of my backups? diff --git a/site/docs/v0.9.0/image-tagging.md b/site/docs/v0.9.0/image-tagging.md index 33460d8c3..2fd12e3cc 100644 --- a/site/docs/v0.9.0/image-tagging.md +++ b/site/docs/v0.9.0/image-tagging.md @@ -16,6 +16,6 @@ The `latest` tag follows the most recently released version of Ark. ## Development -`gcr.io/heptio-images/ark:master` +`gcr.io/heptio-images/ark:main` -The `master` tag follows the latest commit to land on the `master` branch. \ No newline at end of file +The `main` tag follows the latest commit to land on the `main` branch. diff --git a/site/docs/v0.9.0/namespace.md b/site/docs/v0.9.0/namespace.md index 004771634..c15ee41b4 100644 --- a/site/docs/v0.9.0/namespace.md +++ b/site/docs/v0.9.0/namespace.md @@ -16,7 +16,7 @@ To store your backups, schedules, restores, and config in another namespace, you files, changing `heptio-ark` to your desired namespace. You also need to create the `cloud-credentials` secret in your desired namespace. -For all cloud providers, edit `https://github.com/heptio/ark/blob/master/examples/common/00-prereqs.yaml`. This file defines: +For all cloud providers, edit `https://github.com/heptio/ark/blob/main/examples/common/00-prereqs.yaml`. This file defines: * CustomResourceDefinitions for the Ark objects (backups, schedules, restores, configs, downloadrequests) * The namespace where the Ark server runs @@ -29,31 +29,31 @@ For all cloud providers, edit `https://github.com/heptio/ark/blob/master/example For AWS, edit: -* `https://github.com/heptio/ark/blob/master/examples/aws/10-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/aws/00-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/aws/10-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/aws/00-ark-config.yaml` ### GCP For GCP, edit: -* `https://github.com/heptio/ark/blob/master/examples/gcp/10-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/gcp/00-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/gcp/10-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/gcp/00-ark-config.yaml` ### Azure For Azure, edit: -* `https://github.com/heptio/ark/blob/master/examples/azure/00-ark-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/azure/10-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/azure/00-ark-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/azure/10-ark-config.yaml` ### IBM For IBM, edit: -* `https://github.com/heptio/ark/blob/master/examples/ibm/10-deployment.yaml` -* `https://github.com/heptio/ark/blob/master/examples/ibm/00-ark-config.yaml` +* `https://github.com/heptio/ark/blob/main/examples/ibm/10-deployment.yaml` +* `https://github.com/heptio/ark/blob/main/examples/ibm/00-ark-config.yaml` ## Specify the namespace in client commands @@ -65,4 +65,4 @@ ark client config set namespace= -[0]: https://github.com/heptio/ark/tree/master/examples +[0]: https://github.com/heptio/ark/tree/main/examples diff --git a/site/docs/v0.9.0/plugins.md b/site/docs/v0.9.0/plugins.md index df4f4496b..1cb2ae391 100644 --- a/site/docs/v0.9.0/plugins.md +++ b/site/docs/v0.9.0/plugins.md @@ -32,4 +32,4 @@ within your plugin. [1]: https://github.com/heptio/ark-plugin-example -[2]: https://github.com/heptio/ark/blob/master/pkg/plugin/logger.go \ No newline at end of file +[2]: https://github.com/heptio/ark/blob/main/pkg/plugin/logger.go diff --git a/site/docs/v0.9.0/quickstart.md b/site/docs/v0.9.0/quickstart.md index 89c6318ce..78c8b42dd 100644 --- a/site/docs/v0.9.0/quickstart.md +++ b/site/docs/v0.9.0/quickstart.md @@ -23,7 +23,7 @@ Clone or fork the Ark repository: git clone git@github.com:heptio/ark.git ``` -NOTE: Make sure to check out the appropriate version. We recommend that you check out the latest tagged version. The master branch is under active development and might not be stable. +NOTE: Make sure to check out the appropriate version. We recommend that you check out the latest tagged version. The main branch is under active development and might not be stable. ### Set up server diff --git a/site/docs/v0.9.0/troubleshooting.md b/site/docs/v0.9.0/troubleshooting.md index 8a1508966..55f26a7fd 100644 --- a/site/docs/v0.9.0/troubleshooting.md +++ b/site/docs/v0.9.0/troubleshooting.md @@ -60,4 +60,4 @@ Here are some things to verify if you receive `SignatureDoesNotMatch` errors: [2]: debugging-install.md [4]: https://github.com/heptio/ark/issues [5]: https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html -[25]: https://kubernetes.slack.com/messages/ark-dr \ No newline at end of file +[25]: https://kubernetes.slack.com/messages/ark-dr diff --git a/site/docs/v1.0.0/README.md b/site/docs/v1.0.0/README.md index 352f1611b..f2532abd9 100644 --- a/site/docs/v1.0.0/README.md +++ b/site/docs/v1.0.0/README.md @@ -22,7 +22,7 @@ You can run Velero in clusters on a cloud provider or on-premises. For detailed We strongly recommend that you use an [official release][6] of Velero. The tarballs for each release contain the `velero` command-line client. Follow the [installation instructions][28] to get started. -_The code and sample YAML files in the master branch of the Velero repository are under active development and are not guaranteed to be stable. Use them at your own risk!_ +_The code and sample YAML files in the main branch of the Velero repository are under active development and are not guaranteed to be stable. Use them at your own risk!_ ## More information @@ -54,18 +54,18 @@ Feedback and discussion are available on [the mailing list][24]. See [the list of releases][6] to find out about feature changes. -[1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=master +[1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=main [2]: https://travis-ci.org/vmware-tanzu/velero [4]: https://github.com/vmware-tanzu/velero/issues -[5]: https://github.com/vmware-tanzu/velero/blob/master/CONTRIBUTING.md +[5]: https://github.com/vmware-tanzu/velero/blob/main/CONTRIBUTING.md [6]: https://github.com/vmware-tanzu/velero/releases -[8]: https://github.com/vmware-tanzu/velero/blob/master/CODE_OF_CONDUCT.md +[8]: https://github.com/vmware-tanzu/velero/blob/main/CODE_OF_CONDUCT.md [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [14]: https://github.com/kubernetes/kubernetes [24]: https://groups.google.com/forum/#!forum/projectvelero diff --git a/site/docs/v1.0.0/aws-config.md b/site/docs/v1.0.0/aws-config.md index 941a70169..9592b53e9 100644 --- a/site/docs/v1.0.0/aws-config.md +++ b/site/docs/v1.0.0/aws-config.md @@ -14,7 +14,7 @@ If you do not have the `aws` CLI locally installed, follow the [user guide][5] t 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 2. Extract the tarball: diff --git a/site/docs/v1.0.0/azure-config.md b/site/docs/v1.0.0/azure-config.md index 13bdee41d..313973187 100644 --- a/site/docs/v1.0.0/azure-config.md +++ b/site/docs/v1.0.0/azure-config.md @@ -25,7 +25,7 @@ consider using Premium Managed Disks, which are SSD backed. 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.0.0/build-from-source.md b/site/docs/v1.0.0/build-from-source.md index 376d92574..1d67c31e7 100644 --- a/site/docs/v1.0.0/build-from-source.md +++ b/site/docs/v1.0.0/build-from-source.md @@ -58,7 +58,7 @@ make build See the **Cross compiling** section below for details on building for alternate OS/architecture combinations. -To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero:master` image, set `$REGISTRY` to `gcr.io/my-registry`. Optionally, set the `$VERSION` environment variable to change the image tag. Then, run: +To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero:main` image, set `$REGISTRY` to `gcr.io/my-registry`. Optionally, set the `$VERSION` environment variable to change the image tag. Then, run: ```bash make container @@ -232,13 +232,13 @@ If you need to add or update the vendored dependencies, see [Vendoring dependenc [3]: #build [4]: https://blog.golang.org/organizing-go-code [5]: https://golang.org/doc/install -[6]: https://github.com/vmware-tanzu/velero/tree/master/examples +[6]: https://github.com/vmware-tanzu/velero/tree/main/examples [7]: #run [8]: config-definition.md [10]: #vendoring-dependencies [11]: vendoring-dependencies.md [12]: #test -[13]: https://github.com/vmware-tanzu/velero/blob/master/hack/generate-proto.sh +[13]: https://github.com/vmware-tanzu/velero/blob/main/hack/generate-proto.sh [14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 [15]: https://docs.aws.amazon.com/cli/latest/topic/config-vars.html#the-shared-credentials-file [16]: https://cloud.google.com/docs/authentication/getting-started#setting_the_environment_variable diff --git a/site/docs/v1.0.0/faq.md b/site/docs/v1.0.0/faq.md index e68be9070..607e4ea25 100644 --- a/site/docs/v1.0.0/faq.md +++ b/site/docs/v1.0.0/faq.md @@ -22,7 +22,7 @@ Examples of cases where Velero is useful: Yes, with some exceptions. For example, when Velero restores pods it deletes the `nodeName` from the pod so that it can be scheduled onto a new node. You can see some more examples of the differences -in [pod_action.go](https://github.com/vmware-tanzu/velero/blob/master/pkg/restore/pod_action.go) +in [pod_action.go](https://github.com/vmware-tanzu/velero/blob/main/pkg/restore/pod_action.go) ## I'm using Velero in multiple clusters. Should I use the same bucket to store all of my backups? diff --git a/site/docs/v1.0.0/gcp-config.md b/site/docs/v1.0.0/gcp-config.md index 4ebc34c99..a5658c627 100644 --- a/site/docs/v1.0.0/gcp-config.md +++ b/site/docs/v1.0.0/gcp-config.md @@ -12,7 +12,7 @@ If you do not have the `gcloud` and `gsutil` CLIs locally installed, follow the 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.0.0/get-started.md b/site/docs/v1.0.0/get-started.md index 5cae09020..7ed8ee9fc 100644 --- a/site/docs/v1.0.0/get-started.md +++ b/site/docs/v1.0.0/get-started.md @@ -22,7 +22,7 @@ If you encounter issues with installing or configuring, see [Debugging Installat 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.0.0/ibm-config.md b/site/docs/v1.0.0/ibm-config.md index 7d2d1ab33..8e5024843 100644 --- a/site/docs/v1.0.0/ibm-config.md +++ b/site/docs/v1.0.0/ibm-config.md @@ -14,7 +14,7 @@ To set up IBM Cloud Object Storage (COS) as Velero's destination, you: 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.0.0/image-tagging.md b/site/docs/v1.0.0/image-tagging.md index 8bad081f2..921e49f0c 100644 --- a/site/docs/v1.0.0/image-tagging.md +++ b/site/docs/v1.0.0/image-tagging.md @@ -16,6 +16,6 @@ The `latest` tag follows the most recently released version of Velero. ## Development -`gcr.io/heptio-images/velero:master` +`gcr.io/heptio-images/velero:main` -The `master` tag follows the latest commit to land on the `master` branch. +The `main` tag follows the latest commit to land on the `main` branch. diff --git a/site/docs/v1.0.0/oracle-config.md b/site/docs/v1.0.0/oracle-config.md index 182ad64aa..1f2c1dc5b 100644 --- a/site/docs/v1.0.0/oracle-config.md +++ b/site/docs/v1.0.0/oracle-config.md @@ -20,7 +20,7 @@ wget https://github.com/vmware-tanzu/velero/releases/download/v1.0.0/velero-v1.0.0-linux-amd64.tar.gz ``` - *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the master branch of the Velero repository is under active development and is not guaranteed to be stable!* + *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!* 2. Untar the release in your `/usr/bin` directory: `tar -xzvf .tar.gz` @@ -241,5 +241,5 @@ After creating the Velero server in your cluster, try this example: ## Additional Reading -* [Official Velero Documentation](https://velero.io/docs/master/) +* [Official Velero Documentation](https://velero.io/docs/main/) * [Oracle Cloud Infrastructure Documentation](https://docs.cloud.oracle.com/) diff --git a/site/docs/v1.0.0/plugins.md b/site/docs/v1.0.0/plugins.md index 960364c0f..99f595f9c 100644 --- a/site/docs/v1.0.0/plugins.md +++ b/site/docs/v1.0.0/plugins.md @@ -78,5 +78,5 @@ for an example of this -- in particular, the `getPluginConfig(...)` function. [1]: https://github.com/vmware-tanzu/velero-plugin-example -[2]: https://github.com/vmware-tanzu/velero/blob/master/pkg/plugin/logger.go -[3]: https://github.com/vmware-tanzu/velero/blob/master/pkg/restore/restic_restore_action.go +[2]: https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/logger.go +[3]: https://github.com/vmware-tanzu/velero/blob/main/pkg/restore/restic_restore_action.go diff --git a/site/docs/v1.1.0/README.md b/site/docs/v1.1.0/README.md index 8ea46b915..ab96bcf23 100644 --- a/site/docs/v1.1.0/README.md +++ b/site/docs/v1.1.0/README.md @@ -22,7 +22,7 @@ You can run Velero in clusters on a cloud provider or on-premises. For detailed We strongly recommend that you use an [official release][6] of Velero. The tarballs for each release contain the `velero` command-line client. Follow the [installation instructions][28] to get started. -_The code and sample YAML files in the master branch of the Velero repository are under active development and are not guaranteed to be stable. Use them at your own risk!_ +_The code and sample YAML files in the main branch of the Velero repository are under active development and are not guaranteed to be stable. Use them at your own risk!_ ## More information @@ -36,13 +36,13 @@ If you encounter issues, review the [troubleshooting docs][30], [file an issue][ ## Contributing -If you are ready to jump in and test, add code, or help with documentation, follow the instructions on our [Start contributing](https://velero.io/docs/master/start-contributing/) documentation for guidance on how to setup Velero for development. +If you are ready to jump in and test, add code, or help with documentation, follow the instructions on our [Start contributing](https://velero.io/docs/main/start-contributing/) documentation for guidance on how to setup Velero for development. ## Changelog See [the list of releases][6] to find out about feature changes. -[1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=master +[1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=main [2]: https://travis-ci.org/vmware-tanzu/velero [4]: https://github.com/vmware-tanzu/velero/issues @@ -51,14 +51,14 @@ See [the list of releases][6] to find out about feature changes. [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [14]: https://github.com/kubernetes/kubernetes [24]: https://groups.google.com/forum/#!forum/projectvelero [25]: https://kubernetes.slack.com/messages/velero [28]: install-overview.md -[29]: https://velero.io/docs/master/ +[29]: https://velero.io/docs/main/ [30]: troubleshooting.md [99]: support-matrix.md diff --git a/site/docs/v1.1.0/aws-config.md b/site/docs/v1.1.0/aws-config.md index 45a35e287..349930cb0 100644 --- a/site/docs/v1.1.0/aws-config.md +++ b/site/docs/v1.1.0/aws-config.md @@ -14,7 +14,7 @@ If you do not have the `aws` CLI locally installed, follow the [user guide][5] t 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 2. Extract the tarball: diff --git a/site/docs/v1.1.0/azure-config.md b/site/docs/v1.1.0/azure-config.md index 02f56381c..42645bf14 100644 --- a/site/docs/v1.1.0/azure-config.md +++ b/site/docs/v1.1.0/azure-config.md @@ -25,7 +25,7 @@ consider using Premium Managed Disks, which are SSD backed. 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.1.0/build-from-source.md b/site/docs/v1.1.0/build-from-source.md index 28b9ca4c1..6a61562e1 100644 --- a/site/docs/v1.1.0/build-from-source.md +++ b/site/docs/v1.1.0/build-from-source.md @@ -75,7 +75,7 @@ If after installing Velero you would like to change the image used by its deploy kubectl -n velero set image deploy/velero velero=myimagerepo/velero:$VERSION ``` -To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero:master` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `gcr.io/heptio-images`. +To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero:main` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `gcr.io/heptio-images`. Optionally, set the `$VERSION` environment variable to change the image tag. Then, run: diff --git a/site/docs/v1.1.0/development.md b/site/docs/v1.1.0/development.md index 27b2f29bf..1e3f97bcc 100644 --- a/site/docs/v1.1.0/development.md +++ b/site/docs/v1.1.0/development.md @@ -31,5 +31,5 @@ To run unit tests, use `make test`. If you need to add or update the vendored dependencies, see [Vendoring dependencies][11]. [11]: vendoring-dependencies.md -[13]: https://github.com/vmware-tanzu/velero/blob/master/hack/generate-proto.sh +[13]: https://github.com/vmware-tanzu/velero/blob/main/hack/generate-proto.sh [14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3 diff --git a/site/docs/v1.1.0/gcp-config.md b/site/docs/v1.1.0/gcp-config.md index b578f7323..bd068b0a6 100644 --- a/site/docs/v1.1.0/gcp-config.md +++ b/site/docs/v1.1.0/gcp-config.md @@ -12,7 +12,7 @@ If you do not have the `gcloud` and `gsutil` CLIs locally installed, follow the 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.1.0/get-started.md b/site/docs/v1.1.0/get-started.md index 5cae09020..7ed8ee9fc 100644 --- a/site/docs/v1.1.0/get-started.md +++ b/site/docs/v1.1.0/get-started.md @@ -22,7 +22,7 @@ If you encounter issues with installing or configuring, see [Debugging Installat 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.1.0/ibm-config.md b/site/docs/v1.1.0/ibm-config.md index 0fa14f5bd..11da3e31c 100644 --- a/site/docs/v1.1.0/ibm-config.md +++ b/site/docs/v1.1.0/ibm-config.md @@ -14,7 +14,7 @@ To set up IBM Cloud Object Storage (COS) as Velero's destination, you: 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.1.0/image-tagging.md b/site/docs/v1.1.0/image-tagging.md index 8bad081f2..921e49f0c 100644 --- a/site/docs/v1.1.0/image-tagging.md +++ b/site/docs/v1.1.0/image-tagging.md @@ -16,6 +16,6 @@ The `latest` tag follows the most recently released version of Velero. ## Development -`gcr.io/heptio-images/velero:master` +`gcr.io/heptio-images/velero:main` -The `master` tag follows the latest commit to land on the `master` branch. +The `main` tag follows the latest commit to land on the `main` branch. diff --git a/site/docs/v1.1.0/oracle-config.md b/site/docs/v1.1.0/oracle-config.md index e4b399a3c..6cdcac92c 100644 --- a/site/docs/v1.1.0/oracle-config.md +++ b/site/docs/v1.1.0/oracle-config.md @@ -20,7 +20,7 @@ wget https://github.com/vmware-tanzu/velero/releases/download/v1.0.0/velero-v1.0.0-linux-amd64.tar.gz ``` - *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the master branch of the Velero repository is under active development and is not guaranteed to be stable!* + *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!* 2. Untar the release in your `/usr/bin` directory: `tar -xzvf .tar.gz` diff --git a/site/docs/v1.1.0/run-locally.md b/site/docs/v1.1.0/run-locally.md index e6ad657c6..bba98d85c 100644 --- a/site/docs/v1.1.0/run-locally.md +++ b/site/docs/v1.1.0/run-locally.md @@ -47,4 +47,4 @@ After you use the `velero install` command to install Velero into your cluster, [18]: https://eksctl.io/ [20]: api-types/backupstoragelocation.md [21]: api-types/volumesnapshotlocation.md -[22]: install-overview/ \ No newline at end of file +[22]: install-overview/ diff --git a/site/docs/v1.1.0/start-contributing.md b/site/docs/v1.1.0/start-contributing.md index fc2dec285..e5932fb3b 100644 --- a/site/docs/v1.1.0/start-contributing.md +++ b/site/docs/v1.1.0/start-contributing.md @@ -17,5 +17,5 @@ Please browse our list of resources, including a playlist of past online communi If you are ready to jump in and test, add code, or help with documentation, please use the navigation on the left under `Contribute`. -[1]: https://github.com/vmware-tanzu/velero/blob/master/CODE_OF_CONDUCT.md -[2]: https://github.com/vmware-tanzu/velero/blob/master/CONTRIBUTING.md +[1]: https://github.com/vmware-tanzu/velero/blob/main/CODE_OF_CONDUCT.md +[2]: https://github.com/vmware-tanzu/velero/blob/main/CONTRIBUTING.md diff --git a/site/docs/v1.2.0/README.md b/site/docs/v1.2.0/README.md index 3ae9cab86..94dd37fff 100644 --- a/site/docs/v1.2.0/README.md +++ b/site/docs/v1.2.0/README.md @@ -33,7 +33,7 @@ If you are ready to jump in and test, add code, or help with documentation, foll See [the list of releases][6] to find out about feature changes. -[1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=master +[1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=main [2]: https://travis-ci.org/vmware-tanzu/velero [4]: https://github.com/vmware-tanzu/velero/issues @@ -42,7 +42,7 @@ See [the list of releases][6] to find out about feature changes. [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [14]: https://github.com/kubernetes/kubernetes [24]: https://groups.google.com/forum/#!forum/projectvelero [25]: https://kubernetes.slack.com/messages/velero diff --git a/site/docs/v1.2.0/build-from-source.md b/site/docs/v1.2.0/build-from-source.md index 57918632d..0536d8efd 100644 --- a/site/docs/v1.2.0/build-from-source.md +++ b/site/docs/v1.2.0/build-from-source.md @@ -76,7 +76,7 @@ If after installing Velero you would like to change the image used by its deploy kubectl -n velero set image deploy/velero velero=myimagerepo/velero:$VERSION ``` -To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero-amd64:master` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `velero`. +To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero-amd64:main` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `velero`. Optionally, set the `$VERSION` environment variable to change the image tag. Then, run: @@ -93,7 +93,7 @@ ARCH=linux-ppc64le make container ``` _Note: By default, ARCH is set to linux-amd64_ -To push your image to the registry. For example, if you want to push the `gcr.io/my-registry/velero-amd64:master` image, run: +To push your image to the registry. For example, if you want to push the `gcr.io/my-registry/velero-amd64:main` image, run: ```bash make push @@ -108,7 +108,7 @@ ARCH=linux-ppc64le make push ``` _Note: By default, ARCH is set to linux-amd64_ -To create and push your manifest to the registry. For example, if you want to create and push the `gcr.io/my-registry/velero:master` manifest, run: +To create and push your manifest to the registry. For example, if you want to create and push the `gcr.io/my-registry/velero:main` manifest, run: ```bash make manifest diff --git a/site/docs/v1.2.0/contributions/ibm-config.md b/site/docs/v1.2.0/contributions/ibm-config.md index 69d34420c..ea90167a3 100644 --- a/site/docs/v1.2.0/contributions/ibm-config.md +++ b/site/docs/v1.2.0/contributions/ibm-config.md @@ -14,7 +14,7 @@ To set up IBM Cloud Object Storage (COS) as Velero's destination, you: 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.2.0/contributions/minio.md b/site/docs/v1.2.0/contributions/minio.md index 12daff4a1..2f4507633 100644 --- a/site/docs/v1.2.0/contributions/minio.md +++ b/site/docs/v1.2.0/contributions/minio.md @@ -22,7 +22,7 @@ If you encounter issues with installing or configuring, see [Debugging Installat 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.2.0/contributions/oracle-config.md b/site/docs/v1.2.0/contributions/oracle-config.md index d984dad64..7be2796e1 100644 --- a/site/docs/v1.2.0/contributions/oracle-config.md +++ b/site/docs/v1.2.0/contributions/oracle-config.md @@ -20,7 +20,7 @@ wget https://github.com/vmware-tanzu/velero/releases/download/v1.0.0/velero-v1.0.0-linux-amd64.tar.gz ``` - *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the master branch of the Velero repository is under active development and is not guaranteed to be stable!* + *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!* 2. Untar the release in your `/usr/bin` directory: `tar -xzvf .tar.gz` diff --git a/site/docs/v1.2.0/image-tagging.md b/site/docs/v1.2.0/image-tagging.md index d86e49456..b0080ef1c 100644 --- a/site/docs/v1.2.0/image-tagging.md +++ b/site/docs/v1.2.0/image-tagging.md @@ -16,6 +16,6 @@ The `latest` tag follows the most recently released version of Velero. ## Development -`velero/velero:master` +`velero/velero:main` -The `master` tag follows the latest commit to land on the `master` branch. +The `main` tag follows the latest commit to land on the `main` branch. diff --git a/site/docs/v1.2.0/locations.md b/site/docs/v1.2.0/locations.md index d0dc636e7..ca28239a7 100644 --- a/site/docs/v1.2.0/locations.md +++ b/site/docs/v1.2.0/locations.md @@ -160,5 +160,5 @@ velero backup create full-cluster-backup [1]: api-types/backupstoragelocation.md [2]: api-types/volumesnapshotlocation.md -[3]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/master/volumesnapshotlocation.md -[4]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/master/backupstoragelocation.md +[3]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/main/volumesnapshotlocation.md +[4]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/main/backupstoragelocation.md diff --git a/site/docs/v1.2.0/supported-providers.md b/site/docs/v1.2.0/supported-providers.md index dca47ef37..bcc0306aa 100644 --- a/site/docs/v1.2.0/supported-providers.md +++ b/site/docs/v1.2.0/supported-providers.md @@ -49,7 +49,7 @@ In the case you want to take volume snapshots but didn't find a plugin for your [3]: contributions/minio.md [4]: https://github.com/StackPointCloud/ark-plugin-digitalocean [5]: http://www.noobaa.com/ -[6]: https://github.com/vmware-tanzu/velero-plugin-for-aws/blob/master/backupstoragelocation.md +[6]: https://github.com/vmware-tanzu/velero-plugin-for-aws/blob/main/backupstoragelocation.md [7]: https://aws.amazon.com [8]: https://github.com/vmware-tanzu/velero-plugin-for-aws [9]: https://azure.com diff --git a/site/docs/v1.2.0/troubleshooting.md b/site/docs/v1.2.0/troubleshooting.md index c2ded30d2..984d8f714 100644 --- a/site/docs/v1.2.0/troubleshooting.md +++ b/site/docs/v1.2.0/troubleshooting.md @@ -116,8 +116,8 @@ Now, visiting http://localhost:8085/metrics on a browser should show the metrics [2]: debugging-install.md [4]: https://github.com/vmware-tanzu/velero/issues [5]: https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html -[6]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero -[7]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero/values.yaml#L44 -[8]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero/values.yaml#L49-L52 +[6]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero +[7]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero/values.yaml#L44 +[8]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero/values.yaml#L49-L52 [9]: https://kubectl.docs.kubernetes.io/pages/container_debugging/port_forward_to_pods.html [25]: https://kubernetes.slack.com/messages/velero diff --git a/site/docs/v1.3.0/README.md b/site/docs/v1.3.0/README.md index 7983df722..46faaf2bc 100644 --- a/site/docs/v1.3.0/README.md +++ b/site/docs/v1.3.0/README.md @@ -33,7 +33,7 @@ If you are ready to jump in and test, add code, or help with documentation, foll See [the list of releases][6] to find out about feature changes. -[1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=master +[1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=main [2]: https://travis-ci.org/vmware-tanzu/velero [4]: https://github.com/vmware-tanzu/velero/issues @@ -42,7 +42,7 @@ See [the list of releases][6] to find out about feature changes. [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [14]: https://github.com/kubernetes/kubernetes [24]: https://groups.google.com/forum/#!forum/projectvelero [25]: https://kubernetes.slack.com/messages/velero diff --git a/site/docs/v1.3.0/build-from-source.md b/site/docs/v1.3.0/build-from-source.md index 57918632d..0536d8efd 100644 --- a/site/docs/v1.3.0/build-from-source.md +++ b/site/docs/v1.3.0/build-from-source.md @@ -76,7 +76,7 @@ If after installing Velero you would like to change the image used by its deploy kubectl -n velero set image deploy/velero velero=myimagerepo/velero:$VERSION ``` -To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero-amd64:master` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `velero`. +To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero-amd64:main` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `velero`. Optionally, set the `$VERSION` environment variable to change the image tag. Then, run: @@ -93,7 +93,7 @@ ARCH=linux-ppc64le make container ``` _Note: By default, ARCH is set to linux-amd64_ -To push your image to the registry. For example, if you want to push the `gcr.io/my-registry/velero-amd64:master` image, run: +To push your image to the registry. For example, if you want to push the `gcr.io/my-registry/velero-amd64:main` image, run: ```bash make push @@ -108,7 +108,7 @@ ARCH=linux-ppc64le make push ``` _Note: By default, ARCH is set to linux-amd64_ -To create and push your manifest to the registry. For example, if you want to create and push the `gcr.io/my-registry/velero:master` manifest, run: +To create and push your manifest to the registry. For example, if you want to create and push the `gcr.io/my-registry/velero:main` manifest, run: ```bash make manifest diff --git a/site/docs/v1.3.0/contributions/ibm-config.md b/site/docs/v1.3.0/contributions/ibm-config.md index 69d34420c..ea90167a3 100644 --- a/site/docs/v1.3.0/contributions/ibm-config.md +++ b/site/docs/v1.3.0/contributions/ibm-config.md @@ -14,7 +14,7 @@ To set up IBM Cloud Object Storage (COS) as Velero's destination, you: 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.3.0/contributions/minio.md b/site/docs/v1.3.0/contributions/minio.md index 12daff4a1..2f4507633 100644 --- a/site/docs/v1.3.0/contributions/minio.md +++ b/site/docs/v1.3.0/contributions/minio.md @@ -22,7 +22,7 @@ If you encounter issues with installing or configuring, see [Debugging Installat 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.3.0/contributions/oracle-config.md b/site/docs/v1.3.0/contributions/oracle-config.md index ca12e8b93..694d1869b 100644 --- a/site/docs/v1.3.0/contributions/oracle-config.md +++ b/site/docs/v1.3.0/contributions/oracle-config.md @@ -20,7 +20,7 @@ wget https://github.com/vmware-tanzu/velero/releases/download/v1.0.0/velero-v1.0.0-linux-amd64.tar.gz ``` - *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the master branch of the Velero repository is under active development and is not guaranteed to be stable!* + *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!* 2. Untar the release in your `/usr/bin` directory: `tar -xzvf .tar.gz` diff --git a/site/docs/v1.3.0/image-tagging.md b/site/docs/v1.3.0/image-tagging.md index d86e49456..b0080ef1c 100644 --- a/site/docs/v1.3.0/image-tagging.md +++ b/site/docs/v1.3.0/image-tagging.md @@ -16,6 +16,6 @@ The `latest` tag follows the most recently released version of Velero. ## Development -`velero/velero:master` +`velero/velero:main` -The `master` tag follows the latest commit to land on the `master` branch. +The `main` tag follows the latest commit to land on the `main` branch. diff --git a/site/docs/v1.3.0/locations.md b/site/docs/v1.3.0/locations.md index d0dc636e7..ca28239a7 100644 --- a/site/docs/v1.3.0/locations.md +++ b/site/docs/v1.3.0/locations.md @@ -160,5 +160,5 @@ velero backup create full-cluster-backup [1]: api-types/backupstoragelocation.md [2]: api-types/volumesnapshotlocation.md -[3]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/master/volumesnapshotlocation.md -[4]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/master/backupstoragelocation.md +[3]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/main/volumesnapshotlocation.md +[4]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/main/backupstoragelocation.md diff --git a/site/docs/v1.3.0/release-instructions.md b/site/docs/v1.3.0/release-instructions.md index c249a62ee..73481bb82 100644 --- a/site/docs/v1.3.0/release-instructions.md +++ b/site/docs/v1.3.0/release-instructions.md @@ -52,7 +52,7 @@ This process is the same for both pre-release and GA, except for the fact that t 1. Merge the changelog + docs PR, so that it's included in the release tag. 1. Make sure your working directory is clean: `git status` should show `nothing to commit, working tree clean`. -1. Run `git fetch upstream master && git checkout upstream/master`. +1. Run `git fetch upstream main && git checkout upstream/main`. 1. Run `git tag ` (e.g. `git tag v1.2.0` or `git tag v1.2.0-beta.1`). 1. Run `git push upstream ` (e.g. `git push upstream v1.2.0` or `git push upstream v1.2.0-beta.1`). This will trigger the Travis CI job that builds/publishes the Docker images. 1. Generate the GitHub release (it will be created in "Draft" status, which means it's not visible to the outside world until you click "Publish"): diff --git a/site/docs/v1.3.0/supported-providers.md b/site/docs/v1.3.0/supported-providers.md index dca47ef37..bcc0306aa 100644 --- a/site/docs/v1.3.0/supported-providers.md +++ b/site/docs/v1.3.0/supported-providers.md @@ -49,7 +49,7 @@ In the case you want to take volume snapshots but didn't find a plugin for your [3]: contributions/minio.md [4]: https://github.com/StackPointCloud/ark-plugin-digitalocean [5]: http://www.noobaa.com/ -[6]: https://github.com/vmware-tanzu/velero-plugin-for-aws/blob/master/backupstoragelocation.md +[6]: https://github.com/vmware-tanzu/velero-plugin-for-aws/blob/main/backupstoragelocation.md [7]: https://aws.amazon.com [8]: https://github.com/vmware-tanzu/velero-plugin-for-aws [9]: https://azure.com diff --git a/site/docs/v1.3.0/troubleshooting.md b/site/docs/v1.3.0/troubleshooting.md index c2ded30d2..984d8f714 100644 --- a/site/docs/v1.3.0/troubleshooting.md +++ b/site/docs/v1.3.0/troubleshooting.md @@ -116,8 +116,8 @@ Now, visiting http://localhost:8085/metrics on a browser should show the metrics [2]: debugging-install.md [4]: https://github.com/vmware-tanzu/velero/issues [5]: https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html -[6]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero -[7]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero/values.yaml#L44 -[8]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero/values.yaml#L49-L52 +[6]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero +[7]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero/values.yaml#L44 +[8]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero/values.yaml#L49-L52 [9]: https://kubectl.docs.kubernetes.io/pages/container_debugging/port_forward_to_pods.html [25]: https://kubernetes.slack.com/messages/velero diff --git a/site/docs/v1.3.1/README.md b/site/docs/v1.3.1/README.md index 546941fcc..33fa84d96 100644 --- a/site/docs/v1.3.1/README.md +++ b/site/docs/v1.3.1/README.md @@ -33,7 +33,7 @@ If you are ready to jump in and test, add code, or help with documentation, foll See [the list of releases][6] to find out about feature changes. -[1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=master +[1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=main [2]: https://travis-ci.org/vmware-tanzu/velero [4]: https://github.com/vmware-tanzu/velero/issues @@ -42,7 +42,7 @@ See [the list of releases][6] to find out about feature changes. [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [14]: https://github.com/kubernetes/kubernetes [24]: https://groups.google.com/forum/#!forum/projectvelero [25]: https://kubernetes.slack.com/messages/velero diff --git a/site/docs/v1.3.1/build-from-source.md b/site/docs/v1.3.1/build-from-source.md index 57918632d..0536d8efd 100644 --- a/site/docs/v1.3.1/build-from-source.md +++ b/site/docs/v1.3.1/build-from-source.md @@ -76,7 +76,7 @@ If after installing Velero you would like to change the image used by its deploy kubectl -n velero set image deploy/velero velero=myimagerepo/velero:$VERSION ``` -To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero-amd64:master` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `velero`. +To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero-amd64:main` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `velero`. Optionally, set the `$VERSION` environment variable to change the image tag. Then, run: @@ -93,7 +93,7 @@ ARCH=linux-ppc64le make container ``` _Note: By default, ARCH is set to linux-amd64_ -To push your image to the registry. For example, if you want to push the `gcr.io/my-registry/velero-amd64:master` image, run: +To push your image to the registry. For example, if you want to push the `gcr.io/my-registry/velero-amd64:main` image, run: ```bash make push @@ -108,7 +108,7 @@ ARCH=linux-ppc64le make push ``` _Note: By default, ARCH is set to linux-amd64_ -To create and push your manifest to the registry. For example, if you want to create and push the `gcr.io/my-registry/velero:master` manifest, run: +To create and push your manifest to the registry. For example, if you want to create and push the `gcr.io/my-registry/velero:main` manifest, run: ```bash make manifest diff --git a/site/docs/v1.3.1/contributions/ibm-config.md b/site/docs/v1.3.1/contributions/ibm-config.md index 69d34420c..ea90167a3 100644 --- a/site/docs/v1.3.1/contributions/ibm-config.md +++ b/site/docs/v1.3.1/contributions/ibm-config.md @@ -14,7 +14,7 @@ To set up IBM Cloud Object Storage (COS) as Velero's destination, you: 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.3.1/contributions/minio.md b/site/docs/v1.3.1/contributions/minio.md index 12daff4a1..2f4507633 100644 --- a/site/docs/v1.3.1/contributions/minio.md +++ b/site/docs/v1.3.1/contributions/minio.md @@ -22,7 +22,7 @@ If you encounter issues with installing or configuring, see [Debugging Installat 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.3.1/contributions/oracle-config.md b/site/docs/v1.3.1/contributions/oracle-config.md index 30dcb37f7..8cb97cd94 100644 --- a/site/docs/v1.3.1/contributions/oracle-config.md +++ b/site/docs/v1.3.1/contributions/oracle-config.md @@ -20,7 +20,7 @@ wget https://github.com/vmware-tanzu/velero/releases/download/v1.0.0/velero-v1.0.0-linux-amd64.tar.gz ``` - *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the master branch of the Velero repository is under active development and is not guaranteed to be stable!* + *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!* 2. Untar the release in your `/usr/bin` directory: `tar -xzvf .tar.gz` diff --git a/site/docs/v1.3.1/image-tagging.md b/site/docs/v1.3.1/image-tagging.md index d86e49456..b0080ef1c 100644 --- a/site/docs/v1.3.1/image-tagging.md +++ b/site/docs/v1.3.1/image-tagging.md @@ -16,6 +16,6 @@ The `latest` tag follows the most recently released version of Velero. ## Development -`velero/velero:master` +`velero/velero:main` -The `master` tag follows the latest commit to land on the `master` branch. +The `main` tag follows the latest commit to land on the `main` branch. diff --git a/site/docs/v1.3.1/locations.md b/site/docs/v1.3.1/locations.md index d0dc636e7..ca28239a7 100644 --- a/site/docs/v1.3.1/locations.md +++ b/site/docs/v1.3.1/locations.md @@ -160,5 +160,5 @@ velero backup create full-cluster-backup [1]: api-types/backupstoragelocation.md [2]: api-types/volumesnapshotlocation.md -[3]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/master/volumesnapshotlocation.md -[4]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/master/backupstoragelocation.md +[3]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/main/volumesnapshotlocation.md +[4]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/main/backupstoragelocation.md diff --git a/site/docs/v1.3.1/release-instructions.md b/site/docs/v1.3.1/release-instructions.md index c249a62ee..73481bb82 100644 --- a/site/docs/v1.3.1/release-instructions.md +++ b/site/docs/v1.3.1/release-instructions.md @@ -52,7 +52,7 @@ This process is the same for both pre-release and GA, except for the fact that t 1. Merge the changelog + docs PR, so that it's included in the release tag. 1. Make sure your working directory is clean: `git status` should show `nothing to commit, working tree clean`. -1. Run `git fetch upstream master && git checkout upstream/master`. +1. Run `git fetch upstream main && git checkout upstream/main`. 1. Run `git tag ` (e.g. `git tag v1.2.0` or `git tag v1.2.0-beta.1`). 1. Run `git push upstream ` (e.g. `git push upstream v1.2.0` or `git push upstream v1.2.0-beta.1`). This will trigger the Travis CI job that builds/publishes the Docker images. 1. Generate the GitHub release (it will be created in "Draft" status, which means it's not visible to the outside world until you click "Publish"): diff --git a/site/docs/v1.3.1/restic.md b/site/docs/v1.3.1/restic.md index 762933f57..03056030a 100644 --- a/site/docs/v1.3.1/restic.md +++ b/site/docs/v1.3.1/restic.md @@ -433,4 +433,4 @@ The [velero-volume-controller][10] written by duyanghao helps to solve this prob [7]: https://github.com/bitsbeats/velero-pvc-watcher [8]: https://docs.microsoft.com/en-us/azure/aks/azure-files-dynamic-pv [9]: https://github.com/restic/restic/issues/1800 -[10]: https://github.com/duyanghao/velero-volume-controller \ No newline at end of file +[10]: https://github.com/duyanghao/velero-volume-controller diff --git a/site/docs/v1.3.1/supported-providers.md b/site/docs/v1.3.1/supported-providers.md index dca47ef37..bcc0306aa 100644 --- a/site/docs/v1.3.1/supported-providers.md +++ b/site/docs/v1.3.1/supported-providers.md @@ -49,7 +49,7 @@ In the case you want to take volume snapshots but didn't find a plugin for your [3]: contributions/minio.md [4]: https://github.com/StackPointCloud/ark-plugin-digitalocean [5]: http://www.noobaa.com/ -[6]: https://github.com/vmware-tanzu/velero-plugin-for-aws/blob/master/backupstoragelocation.md +[6]: https://github.com/vmware-tanzu/velero-plugin-for-aws/blob/main/backupstoragelocation.md [7]: https://aws.amazon.com [8]: https://github.com/vmware-tanzu/velero-plugin-for-aws [9]: https://azure.com diff --git a/site/docs/v1.3.1/troubleshooting.md b/site/docs/v1.3.1/troubleshooting.md index c2ded30d2..984d8f714 100644 --- a/site/docs/v1.3.1/troubleshooting.md +++ b/site/docs/v1.3.1/troubleshooting.md @@ -116,8 +116,8 @@ Now, visiting http://localhost:8085/metrics on a browser should show the metrics [2]: debugging-install.md [4]: https://github.com/vmware-tanzu/velero/issues [5]: https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html -[6]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero -[7]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero/values.yaml#L44 -[8]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero/values.yaml#L49-L52 +[6]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero +[7]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero/values.yaml#L44 +[8]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero/values.yaml#L49-L52 [9]: https://kubectl.docs.kubernetes.io/pages/container_debugging/port_forward_to_pods.html [25]: https://kubernetes.slack.com/messages/velero diff --git a/site/docs/v1.3.2/README.md b/site/docs/v1.3.2/README.md index bdfd6fac4..824fad314 100644 --- a/site/docs/v1.3.2/README.md +++ b/site/docs/v1.3.2/README.md @@ -33,7 +33,7 @@ If you are ready to jump in and test, add code, or help with documentation, foll See [the list of releases][6] to find out about feature changes. -[1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=master +[1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=main [2]: https://travis-ci.org/vmware-tanzu/velero [4]: https://github.com/vmware-tanzu/velero/issues @@ -42,7 +42,7 @@ See [the list of releases][6] to find out about feature changes. [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [14]: https://github.com/kubernetes/kubernetes [24]: https://groups.google.com/forum/#!forum/projectvelero [25]: https://kubernetes.slack.com/messages/velero diff --git a/site/docs/v1.3.2/build-from-source.md b/site/docs/v1.3.2/build-from-source.md index 57918632d..0536d8efd 100644 --- a/site/docs/v1.3.2/build-from-source.md +++ b/site/docs/v1.3.2/build-from-source.md @@ -76,7 +76,7 @@ If after installing Velero you would like to change the image used by its deploy kubectl -n velero set image deploy/velero velero=myimagerepo/velero:$VERSION ``` -To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero-amd64:master` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `velero`. +To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero-amd64:main` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `velero`. Optionally, set the `$VERSION` environment variable to change the image tag. Then, run: @@ -93,7 +93,7 @@ ARCH=linux-ppc64le make container ``` _Note: By default, ARCH is set to linux-amd64_ -To push your image to the registry. For example, if you want to push the `gcr.io/my-registry/velero-amd64:master` image, run: +To push your image to the registry. For example, if you want to push the `gcr.io/my-registry/velero-amd64:main` image, run: ```bash make push @@ -108,7 +108,7 @@ ARCH=linux-ppc64le make push ``` _Note: By default, ARCH is set to linux-amd64_ -To create and push your manifest to the registry. For example, if you want to create and push the `gcr.io/my-registry/velero:master` manifest, run: +To create and push your manifest to the registry. For example, if you want to create and push the `gcr.io/my-registry/velero:main` manifest, run: ```bash make manifest diff --git a/site/docs/v1.3.2/contributions/ibm-config.md b/site/docs/v1.3.2/contributions/ibm-config.md index 69d34420c..ea90167a3 100644 --- a/site/docs/v1.3.2/contributions/ibm-config.md +++ b/site/docs/v1.3.2/contributions/ibm-config.md @@ -14,7 +14,7 @@ To set up IBM Cloud Object Storage (COS) as Velero's destination, you: 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.3.2/contributions/minio.md b/site/docs/v1.3.2/contributions/minio.md index 2a72c9a4a..db550f23e 100644 --- a/site/docs/v1.3.2/contributions/minio.md +++ b/site/docs/v1.3.2/contributions/minio.md @@ -22,7 +22,7 @@ If you encounter issues with installing or configuring, see [Debugging Installat 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.3.2/contributions/oracle-config.md b/site/docs/v1.3.2/contributions/oracle-config.md index 644349a72..8c88c80e8 100644 --- a/site/docs/v1.3.2/contributions/oracle-config.md +++ b/site/docs/v1.3.2/contributions/oracle-config.md @@ -20,7 +20,7 @@ wget https://github.com/vmware-tanzu/velero/releases/download/v1.0.0/velero-v1.0.0-linux-amd64.tar.gz ``` - *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the master branch of the Velero repository is under active development and is not guaranteed to be stable!* + *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!* 2. Untar the release in your `/usr/bin` directory: `tar -xzvf .tar.gz` diff --git a/site/docs/v1.3.2/disaster-case.md b/site/docs/v1.3.2/disaster-case.md index 3934fd4ce..c9f126a8b 100644 --- a/site/docs/v1.3.2/disaster-case.md +++ b/site/docs/v1.3.2/disaster-case.md @@ -38,4 +38,4 @@ If you periodically back up your cluster's resources, you are able to return to --patch '{"spec":{"accessMode":"ReadWrite"}}' ``` -[1]: how-velero-works.md#set-a-backup-to-expire \ No newline at end of file +[1]: how-velero-works.md#set-a-backup-to-expire diff --git a/site/docs/v1.3.2/image-tagging.md b/site/docs/v1.3.2/image-tagging.md index d86e49456..b0080ef1c 100644 --- a/site/docs/v1.3.2/image-tagging.md +++ b/site/docs/v1.3.2/image-tagging.md @@ -16,6 +16,6 @@ The `latest` tag follows the most recently released version of Velero. ## Development -`velero/velero:master` +`velero/velero:main` -The `master` tag follows the latest commit to land on the `master` branch. +The `main` tag follows the latest commit to land on the `main` branch. diff --git a/site/docs/v1.3.2/locations.md b/site/docs/v1.3.2/locations.md index d0dc636e7..ca28239a7 100644 --- a/site/docs/v1.3.2/locations.md +++ b/site/docs/v1.3.2/locations.md @@ -160,5 +160,5 @@ velero backup create full-cluster-backup [1]: api-types/backupstoragelocation.md [2]: api-types/volumesnapshotlocation.md -[3]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/master/volumesnapshotlocation.md -[4]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/master/backupstoragelocation.md +[3]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/main/volumesnapshotlocation.md +[4]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/main/backupstoragelocation.md diff --git a/site/docs/v1.3.2/release-instructions.md b/site/docs/v1.3.2/release-instructions.md index c249a62ee..73481bb82 100644 --- a/site/docs/v1.3.2/release-instructions.md +++ b/site/docs/v1.3.2/release-instructions.md @@ -52,7 +52,7 @@ This process is the same for both pre-release and GA, except for the fact that t 1. Merge the changelog + docs PR, so that it's included in the release tag. 1. Make sure your working directory is clean: `git status` should show `nothing to commit, working tree clean`. -1. Run `git fetch upstream master && git checkout upstream/master`. +1. Run `git fetch upstream main && git checkout upstream/main`. 1. Run `git tag ` (e.g. `git tag v1.2.0` or `git tag v1.2.0-beta.1`). 1. Run `git push upstream ` (e.g. `git push upstream v1.2.0` or `git push upstream v1.2.0-beta.1`). This will trigger the Travis CI job that builds/publishes the Docker images. 1. Generate the GitHub release (it will be created in "Draft" status, which means it's not visible to the outside world until you click "Publish"): diff --git a/site/docs/v1.3.2/restic.md b/site/docs/v1.3.2/restic.md index 762933f57..03056030a 100644 --- a/site/docs/v1.3.2/restic.md +++ b/site/docs/v1.3.2/restic.md @@ -433,4 +433,4 @@ The [velero-volume-controller][10] written by duyanghao helps to solve this prob [7]: https://github.com/bitsbeats/velero-pvc-watcher [8]: https://docs.microsoft.com/en-us/azure/aks/azure-files-dynamic-pv [9]: https://github.com/restic/restic/issues/1800 -[10]: https://github.com/duyanghao/velero-volume-controller \ No newline at end of file +[10]: https://github.com/duyanghao/velero-volume-controller diff --git a/site/docs/v1.3.2/supported-providers.md b/site/docs/v1.3.2/supported-providers.md index ecda49354..8377f9cbe 100644 --- a/site/docs/v1.3.2/supported-providers.md +++ b/site/docs/v1.3.2/supported-providers.md @@ -50,7 +50,7 @@ In the case you want to take volume snapshots but didn't find a plugin for your [3]: contributions/minio.md [4]: https://github.com/StackPointCloud/ark-plugin-digitalocean [5]: http://www.noobaa.com/ -[6]: https://github.com/vmware-tanzu/velero-plugin-for-aws/blob/master/backupstoragelocation.md +[6]: https://github.com/vmware-tanzu/velero-plugin-for-aws/blob/main/backupstoragelocation.md [7]: https://aws.amazon.com [8]: https://github.com/vmware-tanzu/velero-plugin-for-aws [9]: https://azure.com diff --git a/site/docs/v1.3.2/troubleshooting.md b/site/docs/v1.3.2/troubleshooting.md index c2ded30d2..984d8f714 100644 --- a/site/docs/v1.3.2/troubleshooting.md +++ b/site/docs/v1.3.2/troubleshooting.md @@ -116,8 +116,8 @@ Now, visiting http://localhost:8085/metrics on a browser should show the metrics [2]: debugging-install.md [4]: https://github.com/vmware-tanzu/velero/issues [5]: https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html -[6]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero -[7]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero/values.yaml#L44 -[8]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero/values.yaml#L49-L52 +[6]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero +[7]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero/values.yaml#L44 +[8]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero/values.yaml#L49-L52 [9]: https://kubectl.docs.kubernetes.io/pages/container_debugging/port_forward_to_pods.html [25]: https://kubernetes.slack.com/messages/velero diff --git a/site/docs/v1.4/README.md b/site/docs/v1.4/README.md index 74b5aeefa..a3ff7cbd9 100644 --- a/site/docs/v1.4/README.md +++ b/site/docs/v1.4/README.md @@ -33,8 +33,8 @@ If you are ready to jump in and test, add code, or help with documentation, foll See [the list of releases][6] to find out about feature changes. -[1]: https://github.com/vmware-tanzu/velero/workflows/Master%20CI/badge.svg -[2]: https://github.com/vmware-tanzu/velero/actions?query=workflow%3A"Master+CI" +[1]: https://github.com/vmware-tanzu/velero/workflows/Main%20CI/badge.svg +[2]: https://github.com/vmware-tanzu/velero/actions?query=workflow%3A"Main+CI" [4]: https://github.com/vmware-tanzu/velero/issues [6]: https://github.com/vmware-tanzu/velero/releases @@ -42,7 +42,7 @@ See [the list of releases][6] to find out about feature changes. [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 -[12]: https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/dns/README.md +[12]: https://github.com/kubernetes/kubernetes/blob/main/cluster/addons/dns/README.md [14]: https://github.com/kubernetes/kubernetes [24]: https://groups.google.com/forum/#!forum/projectvelero [25]: https://kubernetes.slack.com/messages/velero diff --git a/site/docs/v1.4/build-from-source.md b/site/docs/v1.4/build-from-source.md index 57918632d..0536d8efd 100644 --- a/site/docs/v1.4/build-from-source.md +++ b/site/docs/v1.4/build-from-source.md @@ -76,7 +76,7 @@ If after installing Velero you would like to change the image used by its deploy kubectl -n velero set image deploy/velero velero=myimagerepo/velero:$VERSION ``` -To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero-amd64:master` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `velero`. +To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero-amd64:main` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `velero`. Optionally, set the `$VERSION` environment variable to change the image tag. Then, run: @@ -93,7 +93,7 @@ ARCH=linux-ppc64le make container ``` _Note: By default, ARCH is set to linux-amd64_ -To push your image to the registry. For example, if you want to push the `gcr.io/my-registry/velero-amd64:master` image, run: +To push your image to the registry. For example, if you want to push the `gcr.io/my-registry/velero-amd64:main` image, run: ```bash make push @@ -108,7 +108,7 @@ ARCH=linux-ppc64le make push ``` _Note: By default, ARCH is set to linux-amd64_ -To create and push your manifest to the registry. For example, if you want to create and push the `gcr.io/my-registry/velero:master` manifest, run: +To create and push your manifest to the registry. For example, if you want to create and push the `gcr.io/my-registry/velero:main` manifest, run: ```bash make manifest diff --git a/site/docs/v1.4/contributions/ibm-config.md b/site/docs/v1.4/contributions/ibm-config.md index 69d34420c..ea90167a3 100644 --- a/site/docs/v1.4/contributions/ibm-config.md +++ b/site/docs/v1.4/contributions/ibm-config.md @@ -14,7 +14,7 @@ To set up IBM Cloud Object Storage (COS) as Velero's destination, you: 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.4/contributions/minio.md b/site/docs/v1.4/contributions/minio.md index 86012b0b9..c0b27538b 100644 --- a/site/docs/v1.4/contributions/minio.md +++ b/site/docs/v1.4/contributions/minio.md @@ -22,7 +22,7 @@ If you encounter issues with installing or configuring, see [Debugging Installat 1. Download the [latest official release's](https://github.com/vmware-tanzu/velero/releases) tarball for your client platform. _We strongly recommend that you use an [official release](https://github.com/vmware-tanzu/velero/releases) of -Velero. The tarballs for each release contain the `velero` command-line client. The code in the master branch +Velero. The tarballs for each release contain the `velero` command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!_ 1. Extract the tarball: diff --git a/site/docs/v1.4/contributions/oracle-config.md b/site/docs/v1.4/contributions/oracle-config.md index b555eff69..2cc0671f6 100644 --- a/site/docs/v1.4/contributions/oracle-config.md +++ b/site/docs/v1.4/contributions/oracle-config.md @@ -20,7 +20,7 @@ wget https://github.com/vmware-tanzu/velero/releases/download/v1.0.0/velero-v1.0.0-linux-amd64.tar.gz ``` - *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the master branch of the Velero repository is under active development and is not guaranteed to be stable!* + *We strongly recommend that you use an official release of Velero. The tarballs for each release contain the velero command-line client. The code in the main branch of the Velero repository is under active development and is not guaranteed to be stable!* 2. Untar the release in your `/usr/bin` directory: `tar -xzvf .tar.gz` diff --git a/site/docs/v1.4/image-tagging.md b/site/docs/v1.4/image-tagging.md index d86e49456..b0080ef1c 100644 --- a/site/docs/v1.4/image-tagging.md +++ b/site/docs/v1.4/image-tagging.md @@ -16,6 +16,6 @@ The `latest` tag follows the most recently released version of Velero. ## Development -`velero/velero:master` +`velero/velero:main` -The `master` tag follows the latest commit to land on the `master` branch. +The `main` tag follows the latest commit to land on the `main` branch. diff --git a/site/docs/v1.4/locations.md b/site/docs/v1.4/locations.md index d0dc636e7..ca28239a7 100644 --- a/site/docs/v1.4/locations.md +++ b/site/docs/v1.4/locations.md @@ -160,5 +160,5 @@ velero backup create full-cluster-backup [1]: api-types/backupstoragelocation.md [2]: api-types/volumesnapshotlocation.md -[3]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/master/volumesnapshotlocation.md -[4]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/master/backupstoragelocation.md +[3]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/main/volumesnapshotlocation.md +[4]: https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure/blob/main/backupstoragelocation.md diff --git a/site/docs/v1.4/release-instructions.md b/site/docs/v1.4/release-instructions.md index bf74c3413..39a7ea3e9 100644 --- a/site/docs/v1.4/release-instructions.md +++ b/site/docs/v1.4/release-instructions.md @@ -55,7 +55,7 @@ This process is the same for both pre-release and GA, except for the fact that t 1. Merge the changelog + docs PR, so that it's included in the release tag. 1. Make sure your working directory is clean: `git status` should show `nothing to commit, working tree clean`. -1. Run `git fetch upstream master && git checkout upstream/master`. +1. Run `git fetch upstream main && git checkout upstream/main`. 1. Run `git tag ` (e.g. `git tag v1.2.0` or `git tag v1.2.0-beta.1`). 1. Run `git push upstream ` (e.g. `git push upstream v1.2.0` or `git push upstream v1.2.0-beta.1`). This will trigger the github action that builds/publishes the Docker images. 1. Generate the GitHub release (it will be created in "Draft" status, which means it's not visible to the outside world until you click "Publish"): diff --git a/site/docs/v1.4/start-contributing.md b/site/docs/v1.4/start-contributing.md index e7d8446c9..b0bbca97a 100644 --- a/site/docs/v1.4/start-contributing.md +++ b/site/docs/v1.4/start-contributing.md @@ -21,5 +21,5 @@ If you are ready to jump in and test, add code, or help with documentation, plea [1]: https://github.com/vmware-tanzu/velero/blob/v1.4.0/CODE_OF_CONDUCT.md [2]: https://github.com/vmware-tanzu/velero/blob/v1.4.0/CONTRIBUTING.md -[3]: https://github.com/vmware-tanzu/velero/blob/master/.github/ISSUE_TEMPLATE/feature-enhancement-request.md -[4]: https://github.com/vmware-tanzu/velero/blob/master/.github/ISSUE_TEMPLATE/bug_report.md +[3]: https://github.com/vmware-tanzu/velero/blob/main/.github/ISSUE_TEMPLATE/feature-enhancement-request.md +[4]: https://github.com/vmware-tanzu/velero/blob/main/.github/ISSUE_TEMPLATE/bug_report.md diff --git a/site/docs/v1.4/supported-providers.md b/site/docs/v1.4/supported-providers.md index ed9c931dc..07e304ddc 100644 --- a/site/docs/v1.4/supported-providers.md +++ b/site/docs/v1.4/supported-providers.md @@ -52,7 +52,7 @@ In the case you want to take volume snapshots but didn't find a plugin for your [3]: contributions/minio.md [4]: https://github.com/StackPointCloud/ark-plugin-digitalocean [5]: http://www.noobaa.com/ -[6]: https://github.com/vmware-tanzu/velero-plugin-for-aws/blob/master/backupstoragelocation.md +[6]: https://github.com/vmware-tanzu/velero-plugin-for-aws/blob/main/backupstoragelocation.md [7]: https://aws.amazon.com [8]: https://github.com/vmware-tanzu/velero-plugin-for-aws [9]: https://azure.com diff --git a/site/docs/v1.4/troubleshooting.md b/site/docs/v1.4/troubleshooting.md index c2ded30d2..984d8f714 100644 --- a/site/docs/v1.4/troubleshooting.md +++ b/site/docs/v1.4/troubleshooting.md @@ -116,8 +116,8 @@ Now, visiting http://localhost:8085/metrics on a browser should show the metrics [2]: debugging-install.md [4]: https://github.com/vmware-tanzu/velero/issues [5]: https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html -[6]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero -[7]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero/values.yaml#L44 -[8]: https://github.com/vmware-tanzu/helm-charts/blob/master/charts/velero/values.yaml#L49-L52 +[6]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero +[7]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero/values.yaml#L44 +[8]: https://github.com/vmware-tanzu/helm-charts/blob/main/charts/velero/values.yaml#L49-L52 [9]: https://kubectl.docs.kubernetes.io/pages/container_debugging/port_forward_to_pods.html [25]: https://kubernetes.slack.com/messages/velero