Merge pull request #1400 from skriss/alpha2-changelog

v1.0.0-alpha.2 changelog
2026-03-27 03:55:04 +00:00 · 2019-04-24 20:19:50 -06:00 · 2019-04-24 15:43:32 -06:00 · 2019-04-24 17:31:48 -04:00 · 2019-04-24 14:18:24 -07:00 · 2019-04-24 13:16:03 -07:00
2162 changed files with 312419 additions and 81591 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Tell us about a problem you are experiencing
+
+---
+
+**What steps did you take and what happened:**
+[A clear and concise description of what the bug is, and what commands you ran.)
+
+
+**What did you expect to happen:**
+
+
+**The output of the following commands will help us better understand what's going on**:
+(Pasting long output into a [GitHub gist](https://gist.github.com) or other pastebin is fine.)
+
+* `kubectl logs deployment/velero -n velero`
+* `velero backup describe <backupname>` or `kubectl get backup/<backupname> -n velero -o yaml`
+* `velero backup logs <backupname>`
+* `velero restore describe <restorename>` or `kubectl get restore/<restorename> -n velero -o yaml`
+* `velero restore logs <restorename>`
+
+
+**Anything else you would like to add:**
+[Miscellaneous information that will assist in solving the issue.]
+
+
+**Environment:**
+
+- Velero version (use `velero version`): 
+- Kubernetes version (use `kubectl version`):
+- Kubernetes installer & version:
+- Cloud provider or hardware configuration:
+- OS (e.g. from `/etc/os-release`):
--- a/.github/ISSUE_TEMPLATE/feature-enhancement-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-enhancement-request.md
@@ -0,0 +1,21 @@
+---
+name: Feature enhancement request
+about: Suggest an idea for this project
+
+---
+
+**Describe the solution you'd like**
+[A clear and concise description of what you want to happen.]
+
+
+**Anything else you would like to add:**
+[Miscellaneous information that will assist in solving the issue.]
+
+
+**Environment:**
+
+- Velero version (use `velero version`):
+- Kubernetes version (use `kubectl version`):
+- Kubernetes installer & version:
+- Cloud provider or hardware configuration:
+- OS (e.g. from `/etc/os-release`):
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 _obj
 _test
 _output
+config

 # Architecture specific extensions/prefixes
 *.[568vq]
@@ -26,9 +27,17 @@ _testmain.go

 debug

-/ark
+/velero
 .idea/

 .container-*
 .vimrc
 .go
+.DS_Store
+.push-*
+.vscode
+*.diff
+
+_site/
+
+.vs
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -0,0 +1,55 @@
+# Copyright 2018 the Velero contributors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+dist: _output
+before:
+  hooks:
+    - ./hack/set-example-tags.sh
+builds:
+  - main: ./cmd/velero/main.go
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - darwin
+      - windows
+    goarch:
+      - amd64
+      - arm
+      - arm64
+    ignore:
+      # don't build arm/arm64 for darwin or windows
+      - goos: darwin
+        goarch: arm
+      - goos: darwin
+        goarch: arm64
+      - goos: windows
+        goarch: arm
+      - goos: windows
+        goarch: arm64
+    ldflags:
+      - -X "github.com/heptio/velero/pkg/buildinfo.Version={{ .Tag }}" -X "github.com/heptio/velero/pkg/buildinfo.GitSHA={{ .FullCommit }}" -X "github.com/heptio/velero/pkg/buildinfo.GitTreeState={{ .Env.GIT_TREE_STATE }}"
+archive:
+  name_template: "{{ .ProjectName }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}"
+  wrap_in_directory: true
+  files:
+    - LICENSE
+    - config/**/*
+checksum:
+  name_template: 'CHECKSUM'
+release:
+  github:
+    owner: heptio
+    name: velero
+  draft: true
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: go

 go:
-  - 1.10.x
+  - 1.12.x

 sudo: required

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,187 +1,27 @@
-# Changelog
+## Development release:
+  * [Unreleased Changes][0]

-#### [v0.8.1](https://github.com/heptio/ark/releases/tag/v0.8.1) - 2018-04-23
+## Current release:
+  * [CHANGELOG-0.11.md][9]

-##### Bug Fixes:
-  * Azure: allow pre-v0.8.0 backups with disk snapshots to be restored and deleted (#446 #449, @skriss)
-
-#### [v0.8.0](https://github.com/heptio/ark/releases/tag/v0.8.0) - 2018-04-19
-
-##### Highlights:
-  * Backup deletion has been completely revamped to make it simpler and less error-prone. As a user, you still use the `ark backup delete` command to request deletion of a backup and its associated cloud
-  resources; behind the scenes, we've switched to using a new `DeleteBackupRequest` Custom Resource and associated controller for processing deletion requests.
-  * We've reduced the number of required fields in the Ark config. For Azure, `location` is no longer required, and for GCP, `project` is not needed.
-  * Ark now copies tags from volumes to snapshots during backup, and from snapshots to new volumes during restore. 
-
-##### Breaking Changes:
-  * Ark has moved back to a single namespace (`heptio-ark` by default) as part of #383.
-
-##### All New Features:
-  * Add global `--kubecontext` flag to Ark CLI (#296, @blakebarnett)
-  * Azure: support cross-resource group restores of volumes (#356 #378, @skriss)
-  * AWS/Azure/GCP: copy tags from volumes to snapshots, and from snapshots to volumes (#341, @skriss)
-  * Replace finalizer for backup deletion with `DeleteBackupRequest` custom resource & controller (#383 #431, @ncdc @nrb)
-  * Don't log warnings during restore if an identical object already exists in the cluster (#405, @nrb)
-  * Add bash & zsh completion support (#384, @containscafeine)
-  
-##### Bug Fixes / Other Changes:
-  * Error from the Ark CLI if attempting to restore a non-existent backup (#302, @ncdc)
-  * Enable running the Ark server locally for development purposes (#334, @ncdc)
-  * Add examples to `ark schedule create` documentation (#331, @lypht)
-  * GCP: Remove `project` requirement from Ark config (#345, @skriss)
-  * Add `--from-backup` flag to `ark restore create` and allow custom restore names (#342 #409, @skriss)
-  * Azure: remove `location` requirement from Ark config (#344, @skriss)
-  * Add documentation/examples for storing backups in IBM Cloud Object Storage (#321, @roytman)
-  * Reduce verbosity of hooks logging (#362, @skriss)
-  * AWS: Add minimal IAM policy to documentation (#363 #419, @hopkinsth)
-  * Don't restore events (#374, @sanketjpatel)
-  * Azure: reduce API polling interval from 60s to 5s (#359, @skriss)
-  * Switch from hostPath to emptyDir volume type for minio example (#386, @containscafeine)
-  * Add limit ranges as a prioritized resource for restores (#392, @containscafeine)
-  * AWS: Add documentation on using Ark with kube2iam (#402, @domderen)
-  * Azure: add node selector so Ark pod is scheduled on a linux node (#415, @ffd2subroutine)
-  * Error from the Ark CLI if attempting to get logs for a non-existent restore (#391, @containscafeine)
-  * GCP: Add minimal IAM policy to documentation (#429, @skriss @jody-frankowski)
-
-##### Upgrading from v0.7.1:
-  Ark v0.7.1 moved the Ark server deployment into a separate namespace, `heptio-ark-server`. As of v0.8.0 we've
-  returned to a single namespace, `heptio-ark`, for all Ark-related resources. If you're currently running v0.7.1,
-  here are the steps you can take to upgrade:
-
-1. Execute the steps from the **Credentials and configuration** section for your cloud:
-    * [AWS](https://heptio.github.io/ark/v0.8.0/aws-config#credentials-and-configuration)
-    * [Azure](https://heptio.github.io/ark/v0.8.0/azure-config#credentials-and-configuration)
-    * [GCP](https://heptio.github.io/ark/v0.8.0/gcp-config#credentials-and-configuration)
-
-    When you get to the secret creation step, if you don't have your `credentials-ark` file handy, 
-    you can copy the existing secret from your `heptio-ark-server` namespace into the `heptio-ark` namespace:
-    ```bash
-    kubectl get secret/cloud-credentials -n heptio-ark-server --export -o json | \
-      jq '.metadata.namespace="heptio-ark"' | \
-      kubectl apply -f -
-    ```
-
-2. You can now safely delete the `heptio-ark-server` namespace:
-    ```bash
-    kubectl delete namespace heptio-ark-server
-    ```
-
-3. Execute the commands from the **Start the server** section for your cloud:
-    * [AWS](https://heptio.github.io/ark/v0.8.0/aws-config#start-the-server)
-    * [Azure](https://heptio.github.io/ark/v0.8.0/azure-config#start-the-server)
-    * [GCP](https://heptio.github.io/ark/v0.8.0/gcp-config#start-the-server)
+## Older releases:
+  * [CHANGELOG-0.10.md][8]
+  * [CHANGELOG-0.9.md][7]
+  * [CHANGELOG-0.8.md][6]
+  * [CHANGELOG-0.7.md][5]
+  * [CHANGELOG-0.6.md][4]
+  * [CHANGELOG-0.5.md][3]
+  * [CHANGELOG-0.4.md][2]
+  * [CHANGELOG-0.3.md][1]


-#### [v0.7.1](https://github.com/heptio/ark/releases/tag/v0.7.1) - 2018-02-22
-
-Bug Fixes:
-  * Run the Ark server in its own namespace, separate from backups/schedules/restores/config (#322, @ncdc)
-
-#### [v0.7.0](https://github.com/heptio/ark/releases/tag/v0.7.0) - 2018-02-15
-
-New Features:
-  * Run the Ark server in any namespace (#272, @ncdc)
-  * Add ability to delete backups and their associated data (#252, @skriss)
-  * Support both pre and post backup hooks (#243, @ncdc)
-
-Bug Fixes / Other Changes:
-  * Switch from Update() to Patch() when updating Ark resources (#241, @skriss)
-  * Don't fail the backup if a PVC is not bound to a PV (#256, @skriss)
-  * Restore serviceaccounts prior to workload controllers (#258, @ncdc)
-  * Stop removing annotations from PVs when restoring them (#263, @skriss)
-  * Update GCP client libraries (#249, @skriss)
-  * Clarify backup and restore creation messages (#270, @nrb)
-  * Update S3 bucket creation docs for us-east-1 (#285, @lypht)
-
-#### [v0.6.0](https://github.com/heptio/ark/tree/v0.6.0) - 2017-11-30
-
-Highlights:
-  * **Plugins** - We now support user-defined plugins that can extend Ark functionality to meet your custom backup/restore needs without needing to be compiled into the core binary. We support pluggable block and object stores as well as per-item backup and restore actions that can execute arbitrary logic, including modifying the items being backed up or restored. For more information see the [documentation](docs/plugins.md), which includes a reference to a fully-functional sample plugin repository. (#174 #188 #206 #213 #215 #217 #223 #226)
-  * **Describers** - The Ark CLI now includes `describe` commands for `backups`, `restores`, and `schedules` that provide human-friendly representations of the relevant API objects.
-
-Breaking Changes:
-  * The config object format has changed. In order to upgrade to v0.6.0, the config object will have to be updated to match the new format. See the [examples](examples) and [documentation](docs/config-definition.md) for more information.
-  * The restore object format has changed. The `warnings` and `errors` fields are now ints containing the counts, while full warnings and errors are now stored in the object store instead of etcd. Restore objects created prior to v.0.6.0 should be deleted, or a new bucket used, and the old restore objects deleted from Kubernetes (`kubectl -n heptio-ark delete restore --all`).
-
-All New Features:
-  * Add `ark plugin add` and `ark plugin remove` commands #217, @skriss
-  * Add plugin support for block/object stores, backup/restore item actions #174 #188 #206 #213 #215 #223 #226, @skriss @ncdc
-  * Improve Azure deployment instructions #216, @ncdc
-  * Change default TTL for backups to 30 days #204, @nrb
-  * Improve logging for backups and restores #199, @ncdc
-  * Add `ark backup describe`, `ark schedule describe` #196, @ncdc
-  * Add `ark restore describe` and move restore warnings/errors to object storage #173 #201 #202, @ncdc
-  * Upgrade to client-go v5.0.1, kubernetes v1.8.2 #157, @ncdc
-  * Add Travis CI support #165 #166, @ncdc
-
-Bug Fixes:
-  * Fix log location hook prefix stripping #222, @ncdc
-  * When running `ark backup download`, remove file if there's an error #154, @ncdc
-  * Update documentation for AWS KMS Key alias support #163, @lli-hiya
-  * Remove clock from `volume_snapshot_action` #137, @athampy
-
-#### [v0.5.1](https://github.com/heptio/ark/tree/v0.5.1) - 2017-11-06
-Bug fixes:
-  * If a Service is headless, retain ClusterIP = None when backing up and restoring.
-  * Use the specifed --label-selector when listing backups, schedules, and restores.
-  * Restore namespace mapping functionality that was accidentally broken in 0.5.0.
-  * Always include namespaces in the backup, regardless of the --include-cluster-resources setting.
-
-#### [v0.5.0](https://github.com/heptio/ark/tree/v0.5.0) - 2017-10-26
-Breaking changes:
-  * The backup tar file format has changed. Backups created using previous versions of Ark cannot be restored using v0.5.0.
-  * When backing up one or more specific namespaces, cluster-scoped resources are no longer backed up by default, with the exception of PVs that are used within the target namespace(s). Cluster-scoped resources can still be included by explicitly specifying `--include-cluster-resources`.
-
-New features:
-  * Add customized user-agent string for Ark CLI
-  * Switch from glog to logrus
-  * Exclude nodes from restoration
-  * Add a FAQ
-  * Record PV availability zone and use it when restoring volumes from snapshots
-  * Back up the PV associated with a PVC
-  * Add `--include-cluster-resources` flag to `ark backup create`
-  * Add `--include-cluster-resources` flag to `ark restore create`
-  * Properly support resource restore priorities across cluster-scoped and namespace-scoped resources
-  * Support `ark create ...` and `ark get ...`
-  * Make ark run as cluster-admin
-  * Add pod exec backup hooks
-  * Support cross-compilation & upgrade to go 1.9
-  
-Bug fixes:
-  * Make config change detection more robust
-
-#### [v0.4.0](https://github.com/heptio/ark/tree/v0.4.0) - 2017-09-14
-Breaking changes:
-  * Snapshotting and restoring volumes is now enabled by default
-  * The --namespaces flag for 'ark restore create' has been replaced by --include-namespaces and
-    --exclude-namespaces
-
-New features:
-  * Support for S3 SSE with KMS
-  * Cloud provider configurations are validated at startup
-  * The persistentVolumeProvider is now optional
-  * Restore objects are garbage collected
-  * Each backup now has an associated log file, viewable via 'ark backup logs'
-  * Each restore now has an associated log file, viewable via 'ark restore logs'
-  * Add --include-resources/--exclude-resources for restores
-
-Bug fixes:
-  * Only save/use iops for io1 volumes on AWS
-  * When restoring, try to retrieve the Backup directly from object storage if it's not found
-  * When syncing Backups from object storage to Kubernetes, don't return at the first error
-    encountered
-  * More closely match how kubectl performs kubeconfig resolution
-  * Increase default Azure API request timeout to 2 minutes
-  * Update Azure diskURI to match diskName
-
-#### [v0.3.3](https://github.com/heptio/ark/tree/v0.3.3) - 2017-08-10
-  * Treat the first field in a schedule's cron expression as minutes, not seconds
-
-#### [v0.3.2](https://github.com/heptio/ark/tree/v0.3.2) - 2017-08-07
-  * Add client-go auth provider plugins for Azure, GCP, OIDC
-
-#### [v0.3.1](https://github.com/heptio/ark/tree/v0.3.1) - 2017-08-03
-  * Fix Makefile VERSION
-
-#### [v0.3.0](https://github.com/heptio/ark/tree/v0.3.0) - 2017-08-03
-  * Initial Release
+[9]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.11.md
+[8]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.10.md
+[7]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.9.md
+[6]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.8.md
+[5]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.7.md
+[4]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.6.md
+[3]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.5.md
+[2]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.4.md
+[1]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.3.md
+[0]: https://github.com/heptio/velero/blob/master/changelogs/unreleased
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,4 +1,4 @@
-# Heptio Ark Community Code of Conduct
+# Velero Community Code of Conduct

 ## Contributor Code of Conduct

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,16 @@
 # Contributing
+
+## CHANGELOG 
+
+Authors are expected to include a changelog file with their pull requests. The changelog file
+should be a new file created in the `changelogs/unreleased` folder. The file should follow the
+naming convention of `pr-username` and the contents of the file should be your text for the
+changelog.
+
+    velero/changelogs/unreleased   <- folder
+        000-username            <- file
+
+
 ## DCO Sign off

 All authors to the project retain copyright to their work. However, to ensure
--- a/examples/gcp/00-ark-config.yaml
+++ b/examples/gcp/00-ark-config.yaml
@@ -1,4 +1,4 @@
-# Copyright 2017 the Heptio Ark contributors.
+# Copyright 2018, 2019 the Velero contributors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,18 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

---
-apiVersion: ark.heptio.com/v1
-kind: Config
-metadata:
-  namespace: heptio-ark
-  name: default
-persistentVolumeProvider:
-  name: gcp
-backupStorageProvider:
-  name: gcp
-  bucket: <YOUR_BUCKET>
-backupSyncPeriod: 30m
-gcSyncPeriod: 30m
-scheduleSyncPeriod: 1m
-restoreOnlyMode: false
+FROM debian:stretch-slim
+
+LABEL maintainer="Steve Kriss <krisss@vmware.com>"
+
+ENTRYPOINT ["/bin/bash", "-c", "while true; do sleep 10000; done"]
--- a/Dockerfile-ark.alpine
+++ b/Dockerfile-ark.alpine
@@ -1,4 +1,4 @@
-# Copyright 2017 the Heptio Ark contributors.
+# Copyright 2017, 2019 the Velero contributors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,20 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-FROM alpine:3.7
+FROM debian:stretch-slim

-MAINTAINER Andy Goldstein <andy@heptio.com>
+LABEL maintainer="Steve Kriss <krisss@vmware.com>"

-RUN apk add --no-cache ca-certificates
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends ca-certificates wget bzip2 && \
+    wget --quiet https://github.com/restic/restic/releases/download/v0.9.4/restic_0.9.4_linux_amd64.bz2 && \
+    bunzip2 restic_0.9.4_linux_amd64.bz2 && \
+    mv restic_0.9.4_linux_amd64 /usr/bin/restic && \
+    chmod +x /usr/bin/restic && \
+    apt-get remove -y wget bzip2 && \
+    rm -rf /var/lib/apt/lists/*

-RUN apk add --update --no-cache bzip2 rsync && \
-    wget --quiet https://github.com/restic/restic/releases/download/v0.9.1/restic_0.9.1_linux_amd64.bz2 && \
-    bunzip2 restic_0.9.1_linux_amd64.bz2 && \
-    mv restic_0.9.1_linux_amd64 /restic && \
-    chmod +x /restic

-ADD /bin/linux/amd64/ark /ark
+ADD /bin/linux/amd64/velero /velero

 USER nobody:nobody

-ENTRYPOINT ["/ark"]
+ENTRYPOINT ["/velero"]
--- a/Dockerfile-ark-restic-restore-helper.alpine
+++ b/Dockerfile-ark-restic-restore-helper.alpine
@@ -1,4 +1,4 @@
-# Copyright 2018 the Heptio Ark contributors.
+# Copyright 2018, 2019 the Velero contributors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-FROM alpine:3.7
+FROM debian:stretch-slim

-MAINTAINER Steve Kriss <steve@heptio.com>
+LABEL maintainer="Steve Kriss <krisss@vmware.com>"

-ADD /bin/linux/amd64/ark-restic-restore-helper .
+ADD /bin/linux/amd64/velero-restic-restore-helper .

 USER nobody:nobody

-ENTRYPOINT [ "/ark-restic-restore-helper" ]
+ENTRYPOINT [ "/velero-restic-restore-helper" ]
--- a/Gopkg.lock
+++ b/Gopkg.lock
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -28,21 +28,31 @@
 #
 # Kubernetes packages
 #
+
 [[constraint]]
  name = "k8s.io/kubernetes"
-  version = "~1.10"
+  version = "~1.12"

 [[constraint]]
  name = "k8s.io/client-go"
-  version = "~7.0"
+  version = "~9.0"

 [[constraint]]
  name = "k8s.io/apimachinery"
-  version = "kubernetes-1.10.0"
+  version = "kubernetes-1.12.0"

 [[constraint]]
  name = "k8s.io/api"
-  version = "kubernetes-1.10.0"
+  version = "kubernetes-1.12.0"
+
+[[constraint]]
+  name = "k8s.io/apiextensions-apiserver"
+  version = "kubernetes-1.12.0"
+
+# k8s.io/client-go v9.0 uses f2b4162afba35581b6d4a50d3b8f34e33c144682 (released in v1.1.4)
+[[override]]
+  name = "github.com/json-iterator/go"
+  version = "~1.1.4"

 #
 # Cloud provider packages
@@ -53,12 +63,12 @@

 [[constraint]]
  name = "github.com/Azure/azure-sdk-for-go"
-  version = "~10.2.1-beta"
+  version = "~19.0.0"

+# k8s.io/client-go v9.0 uses bca49d5b51a50dc5bb17bbf6204c711c6dbded06 (v10.14.0)
 [[constraint]]
  name = "github.com/Azure/go-autorest"
-  version = "~8.1.x"
-
+  version = "~10.14.0"

 [[constraint]]
  name = "cloud.google.com/go"
@@ -66,7 +76,7 @@

 [[constraint]]
  name = "google.golang.org/api"
-  branch = "master"
+  version = "~v0.3.2"

 [[constraint]]
  name = "golang.org/x/oauth2"
@@ -83,32 +93,42 @@
  name = "github.com/robfig/cron"
  revision = "df38d32658d8788cd446ba74db4bb5375c4b0cb3"

-# TODO(1.0) this repo is a redirect to github.com/satori/go.uuid. Our
-# current version of azure-sdk-for-go references this redirect, so
-# use it so we don't get a duplicate copy of this dependency. 
-# Once our azure-sdk-for-go is updated to a newer version (where
-# their dependency has changed to .../go.uuid), switch this to 
-# github.com/satori/go.uuid
 [[constraint]]
-  name = "github.com/satori/uuid"
-  version = "1.1.0"
+  name = "github.com/satori/go.uuid"
+  version = "~1.2.0"

 [[constraint]]
  name = "github.com/spf13/afero"
  branch = "master"
-  
+
 [[constraint]]
  name = "github.com/spf13/cobra"
-  branch = "master"
-  
+  version = "0.0.3"
+
 [[constraint]]
  name = "github.com/spf13/pflag"
-  version = "1.0.0"
+  version = "1.0.2"

 [[constraint]]
  name = "github.com/stretchr/testify"
-  branch = "master"
+  version = "~1.2.2"

 [[constraint]]
  name = "github.com/hashicorp/go-plugin"
-  branch = "master"
+  revision = "3f118e8ee104b6f22aeb12453fab56aed1356186"
+
+[[constraint]]
+  name = "github.com/golang/protobuf"
+  version = "~v1.3.1"
+
+[[constraint]]
+  name = "google.golang.org/grpc"
+  version = "~v1.19.0"
+
+[[constraint]]
+  name = "github.com/joho/godotenv"
+  version = "~v1.3.0"
+
+[[override]]
+  name = "golang.org/x/sys"
+  branch = "master"
--- a/98
+++ b/98
@@ -1,6 +1,6 @@
 # Copyright 2016 The Kubernetes Authors.
 #
-# Modifications Copyright 2017 the Heptio Ark contributors.
+# Modifications Copyright 2017 the Velero contributors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,15 +15,18 @@
 # limitations under the License.

 # The binary to build (just the basename).
-BIN ?= ark
+BIN ?= velero

 # This repo's root import path (under GOPATH).
-PKG := github.com/heptio/ark
+PKG := github.com/heptio/velero

 # Where to push the docker image.
 REGISTRY ?= gcr.io/heptio-images

 # Which architecture to build - see $(ALL_ARCH) for options.
+# if the 'local' rule is being run, detect the ARCH from 'go env'
+# if it wasn't specified by the caller.
+local : ARCH ?= $(shell go env GOOS)-$(shell go env GOARCH)
 ARCH ?= linux-amd64

 VERSION ?= master
@@ -34,8 +37,6 @@ TAG_LATEST ?= false
 ### These variables should not need tweaking.
 ###

-SRC_DIRS := cmd pkg # directories which hold app source (not vendored)
-
 CLI_PLATFORMS := linux-amd64 linux-arm linux-arm64 darwin-amd64 windows-amd64
 CONTAINER_PLATFORMS := linux-amd64 linux-arm linux-arm64

@@ -46,7 +47,7 @@ GOARCH = $(word 2, $(platform_temp))
 # TODO(ncdc): support multiple image architectures once gcr.io supports manifest lists
 # Set default base image dynamically for each arch
 ifeq ($(GOARCH),amd64)
-		DOCKERFILE ?= Dockerfile-$(BIN).alpine
+		DOCKERFILE ?= Dockerfile-$(BIN)
 endif
 #ifeq ($(GOARCH),arm)
 #		DOCKERFILE ?= Dockerfile.arm #armel/busybox
@@ -55,14 +56,14 @@ endif
 #		DOCKERFILE ?= Dockerfile.arm64 #aarch64/busybox
 #endif

-IMAGE := $(REGISTRY)/$(BIN)
+IMAGE = $(REGISTRY)/$(BIN)

 # If you want to build all binaries, see the 'all-build' rule.
 # If you want to build all containers, see the 'all-container' rule.
 # If you want to build AND push all containers, see the 'all-push' rule.
-all: 
+all:
 	@$(MAKE) build
-	@$(MAKE) build BIN=ark-restic-restore-helper
+	@$(MAKE) build BIN=velero-restic-restore-helper

 build-%:
 	@$(MAKE) --no-print-directory ARCH=$* build
@@ -79,6 +80,15 @@ all-build: $(addprefix build-, $(CLI_PLATFORMS))

 #all-push: $(addprefix push-, $(CONTAINER_PLATFORMS))

+local: build-dirs
+	GOOS=$(GOOS) \
+	GOARCH=$(GOARCH) \
+	VERSION=$(VERSION) \
+	PKG=$(PKG) \
+	BIN=$(BIN) \
+	OUTPUT_DIR=$$(pwd)/_output/bin/$(GOOS)/$(GOARCH) \
+	./hack/build.sh
+
 build: _output/bin/$(GOOS)/$(GOARCH)/$(BIN)

 _output/bin/$(GOOS)/$(GOARCH)/$(BIN): build-dirs
@@ -94,13 +104,14 @@ _output/bin/$(GOOS)/$(GOARCH)/$(BIN): build-dirs

 TTY := $(shell tty -s && echo "-t")

-BUILDER_IMAGE := ark-builder
+BUILDER_IMAGE := velero-builder

 # Example: make shell CMD="date > datefile"
 shell: build-dirs build-image
 	@# the volume bind-mount of $PWD/vendor/k8s.io/api is needed for code-gen to
 	@# function correctly (ref. https://github.com/kubernetes/kubernetes/pull/64567)
 	@docker run \
+		-e GOFLAGS \
 		-i $(TTY) \
 		--rm \
 		-u $$(id -u):$$(id -g) \
@@ -117,9 +128,26 @@ shell: build-dirs build-image

 DOTFILE_IMAGE = $(subst :,_,$(subst /,_,$(IMAGE))-$(VERSION))

+# Use a slightly customized build/push targets since we don't have a Go binary to build for the fsfreeze image
+build-fsfreeze: BIN = fsfreeze-pause
+build-fsfreeze:
+	@cp $(DOCKERFILE)  _output/.dockerfile-$(BIN).alpine
+	@docker build -t $(IMAGE):$(VERSION) -f _output/.dockerfile-$(BIN).alpine _output
+	@docker images -q $(IMAGE):$(VERSION) > .container-$(DOTFILE_IMAGE)
+
+push-fsfreeze: BIN = fsfreeze-pause
+push-fsfreeze:
+	@docker push $(IMAGE):$(VERSION)
+ifeq ($(TAG_LATEST), true)
+	docker tag $(IMAGE):$(VERSION) $(IMAGE):latest
+	docker push $(IMAGE):latest
+endif
+	@docker images -q $(REGISTRY)/fsfreeze-pause:$(VERSION) > .container-$(DOTFILE_IMAGE)
+
 all-containers:
 	$(MAKE) container
-	$(MAKE) container BIN=ark-restic-restore-helper
+	$(MAKE) container BIN=velero-restic-restore-helper
+	$(MAKE) build-fsfreeze

 container: verify test .container-$(DOTFILE_IMAGE) container-name
 .container-$(DOTFILE_IMAGE): _output/bin/$(GOOS)/$(GOARCH)/$(BIN) $(DOCKERFILE)
@@ -132,16 +160,17 @@ container-name:

 all-push:
 	$(MAKE) push
-	$(MAKE) push BIN=ark-restic-restore-helper
+	$(MAKE) push BIN=velero-restic-restore-helper
+	$(MAKE) push-fsfreeze


 push: .push-$(DOTFILE_IMAGE) push-name
 .push-$(DOTFILE_IMAGE): .container-$(DOTFILE_IMAGE)
 	@docker push $(IMAGE):$(VERSION)
-	@if [[ "$(TAG_LATEST)" == "true" ]]; then \
-		docker tag $(IMAGE):$(VERSION) $(IMAGE):latest; \
-		docker push $(IMAGE):latest; \
-	fi
+ifeq ($(TAG_LATEST), true)
+	docker tag $(IMAGE):$(VERSION) $(IMAGE):latest
+	docker push $(IMAGE):latest
+endif
 	@docker images -q $(IMAGE):$(VERSION) > $@

 push-name:
@@ -150,7 +179,12 @@ push-name:
 SKIP_TESTS ?=
 test: build-dirs
 ifneq ($(SKIP_TESTS), 1)
-	@$(MAKE) shell CMD="-c 'hack/test.sh $(SRC_DIRS)'"
+	@$(MAKE) shell CMD="-c 'hack/test.sh $(WHAT)'"
+endif
+
+test-local: build-dirs
+ifneq ($(SKIP_TESTS), 1)
+	hack/test.sh $(WHAT)
 endif

 verify:
@@ -161,30 +195,6 @@ endif
 update:
 	@$(MAKE) shell CMD="-c 'hack/update-all.sh'"

-release: all-tar-bin checksum
-
-checksum:
-	@cd _output/release; \
-	sha256sum *.tar.gz > CHECKSUM; \
-	cat CHECKSUM; \
-	sha256sum CHECKSUM
-
-all-tar-bin: $(addprefix tar-bin-, $(CLI_PLATFORMS))
-
-tar-bin-%:
-	$(MAKE) ARCH=$* VERSION=$(VERSION) tar-bin
-
-GIT_DESCRIBE = $(shell git describe --tags --always --dirty)
-tar-bin: build
-	mkdir -p _output/release
-
-# We do the subshell & wildcard ls so we can pick up $(BIN).exe for windows
-	(cd _output/bin/$(GOOS)/$(GOARCH) && ls $(BIN)*) | \
-		tar \
-			-C _output/bin/$(GOOS)/$(GOARCH) \
-			--files-from=- \
-			-zcf _output/release/$(BIN)-$(GIT_DESCRIBE)-$(GOOS)-$(GOARCH).tar.gz
-
 build-dirs:
 	@mkdir -p _output/bin/$(GOOS)/$(GOARCH)
 	@mkdir -p .go/src/$(PKG) .go/pkg .go/bin .go/std/$(GOOS)/$(GOARCH) .go/go-build
@@ -198,3 +208,9 @@ clean:
 	docker rmi $(BUILDER_IMAGE)

 ci: all verify test
+
+changelog:
+	hack/changelog.sh
+
+release:
+	hack/goreleaser.sh
--- a/README.md
+++ b/README.md
@@ -1,190 +1,53 @@
-# Heptio Ark
-
-**Maintainers:** [Heptio][0]
+![100]

 [![Build Status][1]][2]

 ## Overview

-Ark gives you tools to back up and restore your Kubernetes cluster resources and persistent volumes. Ark lets you:
+Velero (formerly Heptio Ark) gives you tools to back up and restore your Kubernetes cluster resources and persistent volumes. Velero lets you:

 * Take backups of your cluster and restore in case of loss.
-* Copy cluster resources across cloud providers. NOTE: Cloud volume migrations are not yet supported.
+* Copy cluster resources to other clusters.
 * Replicate your production environment for development and testing environments.

-Ark consists of:
+Velero consists of:

 * A server that runs on your cluster
 * A command-line client that runs locally

+You can run Velero in clusters on a cloud provider or on-premises. For detailed information, see [Compatible Storage Providers][99].
+
+## Installation
+
+We strongly recommend that you use an [official release][6] of Velero. The tarballs for each release contain the
+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!_
+
 ## More information

-[The documentation][29] provides detailed information about building from source, architecture, extending Ark, and more.
+[The documentation][29] provides a getting started guide, plus information about building from source, architecture, extending Velero, and more. 

-## Getting started
-
-The following example sets up the Ark server and client, then backs up and restores a sample application.
-
-For simplicity, the example uses Minio, an S3-compatible storage service that runs locally on your cluster. See [Set up Ark with your cloud provider][3] for how to run on a cloud provider. 
-
-### Prerequisites
-
-* Access to a Kubernetes cluster, version 1.7 or later. Version 1.7.5 or later is required to run `ark backup delete`.
-* A DNS server on the cluster
-* `kubectl` installed
-
-### Download
-
-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.
-
-### Set up server
-
-1. Start the server and the local storage service. In the root directory of Ark, run:
-
-    ```bash
-    kubectl apply -f examples/common/00-prereqs.yaml
-    kubectl apply -f examples/minio/
-    ```
-
-    NOTE: If you get an error about Config creation, wait for a minute, then run the commands again.
-
-1. Deploy the example nginx application:
-
-    ```bash
-    kubectl apply -f examples/nginx-app/base.yaml
-    ```
-
-1. Check to see that both the Ark and nginx deployments are successfully created:
-
-    ```
-    kubectl get deployments -l component=ark --namespace=heptio-ark
-    kubectl get deployments --namespace=nginx-example
-    ```
-
-### Install client
-
-For this example, we recommend that you [download a pre-built release][26].
-
-You can also [build from source][7].
-
-Make sure that you install somewhere in your `$PATH`.
-
-### Back up
-
-1. Create a backup for any object that matches the `app=nginx` label selector:
-
-    ```
-    ark backup create nginx-backup --selector app=nginx
-    ```
-
-   Alternatively if you want to backup all objects *except* those matching the label `backup=ignore`:
-
-   ```
-   ark backup create nginx-backup --selector 'backup notin (ignore)'
-   ```
-
-1. Simulate a disaster:
-
-    ```
-    kubectl delete namespace nginx-example
-    ```
-
-1. To check that the nginx deployment and service are gone, run:
-
-    ```
-    kubectl get deployments --namespace=nginx-example
-    kubectl get services --namespace=nginx-example
-    kubectl get namespace/nginx-example
-    ```
-
-    You should get no results.
-    
-    NOTE: You might need to wait for a few minutes for the namespace to be fully cleaned up.
-
-### Restore
-
-1. Run:
-
-    ```
-    ark restore create --from-backup nginx-backup
-    ```
-
-1. Run:
-
-    ```
-    ark restore get
-    ```
-
-    After the restore finishes, the output looks like the following:
-
-    ```
-    NAME                          BACKUP         STATUS      WARNINGS   ERRORS    CREATED                         SELECTOR
-    nginx-backup-20170727200524   nginx-backup   Completed   0          0         2017-07-27 20:05:24 +0000 UTC   <none>
-    ```
-
-NOTE: The restore can take a few moments to finish. During this time, the `STATUS` column reads `InProgress`.
-
-After a successful restore, the `STATUS` column is `Completed`, and `WARNINGS` and `ERRORS` are 0. All objects in the `nginx-example` namespacee should be just as they were before you deleted them.
-
-If there are errors or warnings, you can look at them in detail:
-
-```
-ark restore describe <RESTORE_NAME>
-```
-
-For more information, see [the debugging information][18].
-
-### Clean up
-
-If you want to delete any backups you created, including data in object storage and persistent
-volume snapshots, you can run:
-
-```
-ark backup delete BACKUP_NAME
-```
-
-This asks the Ark server to delete all backup data associated with `BACKUP_NAME`.  You need to do
-this for each backup you want to permanently delete. A future version of Ark will allow you to
-delete multiple backups by name or label selector.
-
-Once fully removed, the backup is no longer visible when you run:
-
-```
-ark backup get BACKUP_NAME
-```
-
-If you want to uninstall Ark but preserve the backup data in object storage and persistent volume
-snapshots, it is safe to remove the `heptio-ark` namespace and everything else created for this
-example:
-
-```
-kubectl delete -f examples/common/
-kubectl delete -f examples/minio/
-kubectl delete -f examples/nginx-app/base.yaml
-```
+Please use the version selector at the top of the site to ensure you are using the appropriate documentation for your version of Velero.

 ## Troubleshooting

-If you encounter issues, review the [troubleshooting docs][30], [file an issue][4], or talk to us on the [#ark-dr channel][25] on the Kubernetes Slack server. 
+If you encounter issues, review the [troubleshooting docs][30], [file an issue][4], or talk to us on the [#velero channel][25] on the Kubernetes Slack server.

 ## Contributing

 Thanks for taking the time to join our community and start contributing!

-Feedback and discussion is available on [the mailing list][24].
+Feedback and discussion are available on [the mailing list][24].

-#### Before you start
+### Before you start

 * Please familiarize yourself with the [Code of Conduct][8] before contributing.
 * See [CONTRIBUTING.md][5] for instructions on the developer certificate of origin that we require.
+* Read how [we're using ZenHub][26] for project and roadmap planning

-#### Pull requests
+### Pull requests

 * We welcome pull requests. Feel free to dig through the [issues][4] and jump in.

@@ -192,33 +55,27 @@ 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
-[2]: https://travis-ci.org/heptio/ark
-[3]: /docs/cloud-common.md
-[4]: https://github.com/heptio/ark/issues
-[5]: https://github.com/heptio/ark/blob/master/CONTRIBUTING.md
-[6]: https://github.com/heptio/ark/releases
-[7]: /docs/build-from-scratch.md
-[8]: https://github.com/heptio/ark/blob/master/CODE_OF_CONDUCT.md
+[1]: https://travis-ci.org/heptio/velero.svg?branch=master
+[2]: https://travis-ci.org/heptio/velero
+
+[4]: https://github.com/heptio/velero/issues
+[5]: https://github.com/heptio/velero/blob/master/CONTRIBUTING.md
+[6]: https://github.com/heptio/velero/releases
+
+[8]: https://github.com/heptio/velero/blob/master/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
-[13]: /docs/output-file-format.md
 [14]: https://github.com/kubernetes/kubernetes
-[15]: https://aws.amazon.com/
-[16]: https://cloud.google.com/
-[17]: https://azure.microsoft.com/
-[18]: /docs/debugging-restores.md
-[19]: /docs/img/backup-process.png
-[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
-[24]: http://j.hept.io/ark-list
-[25]: https://kubernetes.slack.com/messages/ark-dr
-[26]: https://github.com/heptio/ark/releases
-[27]: /docs/hooks.md
-[28]: /docs/plugins.md
-[29]: https://heptio.github.io/ark/
+
+[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
+
+
+[29]: https://heptio.github.io/velero/
 [30]: /docs/troubleshooting.md
+
+[99]: /docs/support-matrix.md
+[100]: /docs/img/velero.png
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,40 +0,0 @@
-# Heptio Ark Roadmap
-
-## Upcoming Versions
-
-The following versions, dates, and features are approximate and are subject to change.
-
-### v0.9.0 - ~ 2018-06-14
- Backup targets
- Snapshot & restore non-cloud volumes - [#19](https://github.com/heptio/ark/issues/19)
- Backup & restore across multiple regions and zones - [#103](https://github.com/heptio/ark/issues/103)
- Ability to clone PVs - [#192](https://github.com/heptio/ark/issues/192)
- Ark install command - [#52](https://github.com/heptio/ark/issues/52)
- Backup & restore progress reporting - [#20](https://github.com/heptio/ark/issues/20) [#21](https://github.com/heptio/ark/issues/21)
-
-
-## Released Versions
-
-### v0.8.0 - 2018-04-19
-
-[See release notes](https://github.com/heptio/ark/blob/master/CHANGELOG.md#v080---2018-04-19).
-
-### v0.7.0 - 2018-02-15
-
-[See release notes](https://github.com/heptio/ark/blob/master/CHANGELOG.md#v070---2018-02-15).
-
-### v0.6.0 - 2017-11-30
-
-[See release notes](https://github.com/heptio/ark/blob/master/CHANGELOG.md#v060---2017-11-30).
-
-### v0.5.0 - 2017-10-26
-
-[See release notes](https://github.com/heptio/ark/blob/master/CHANGELOG.md#v050---2017-10-26).
-
-### v0.4.0 - 2017-09-14
-
-[See release notes](https://github.com/heptio/ark/blob/master/CHANGELOG.md#v040---2017-09-14).
-
-### v0.3.0 - 2017-08-03
-
-[See release notes](https://github.com/heptio/ark/blob/master/CHANGELOG.md#v030---2017-08-03).
--- a/SUPPORT.md
+++ b/SUPPORT.md
@@ -1,5 +1,5 @@
-# Ark Support
+# Velero Support

-Thanks for trying out Ark! We welcome all feedback, please consider joining our mailing list: 
+Thanks for trying out Velero! We welcome all feedback, please consider joining our mailing list: 

- [Mailing List](http://j.hept.io/ark-list)
+- [Mailing List](https://groups.google.com/forum/#!forum/projectvelero)
--- a/changelogs/CHANGELOG-0.10.md
+++ b/changelogs/CHANGELOG-0.10.md
@@ -0,0 +1,261 @@
+  - [v0.10.2](#v0102)
+  - [v0.10.1](#v0101)
+  - [v0.10.0](#v0100)
+
+## v0.10.2
+#### 2019-02-28
+
+### Download
+- https://github.com/heptio/ark/releases/tag/v0.10.2
+
+### Changes
+  * upgrade restic to v0.9.4 & replace --hostname flag with --host (#1156, @skriss)
+  * use 'restic stats' instead of 'restic check' to determine if repo exists (#1171, @skriss)
+  * Fix concurrency bug in code ensuring restic repository exists (#1235, @skriss)
+
+## v0.10.1
+#### 2019-01-10
+
+### Download
+- https://github.com/heptio/ark/releases/tag/v0.10.1
+
+### Changes
+  * Fix minio setup job command (#1118, @acbramley)
+  * Add debugging-install link in doc get-started.md (#1131, @hex108)
+  * `ark version`: show full git SHA & combine git tree state indicator with git SHA line (#1124, @skriss)
+  * Delete spec.priority in pod restore action (#879, @mwieczorek)
+  * Allow to use AWS Signature v1 for creating signed AWS urls (#811, @bashofmann)
+  * add multizone/regional support to gcp (#765, @wwitzel3)
+  * Fixed the newline output when deleting a schedule. (#1120, @jwhitcraft)
+  * Remove obsolete make targets and rename 'make goreleaser' to 'make release' (#1114, @skriss)
+  * Update to go 1.11 (#1069, @gliptak)
+  * Update CHANGELOGs (#1063, @wwitzel3)
+  * Initialize empty schedule metrics on server init (#1054, @cbeneke)
+  * Added brew reference (#1051, @omerlh)
+  * Remove default token from all service accounts (#1048, @ncdc)
+  * Add pprof support to the Ark server (#234, @ncdc)
+
+## v0.10.0
+#### 2018-11-15
+
+### Download
+- https://github.com/heptio/ark/releases/tag/v0.10.0
+
+### Highlights
+- We've introduced two new custom resource definitions, `BackupStorageLocation` and `VolumeSnapshotLocation`, that replace the `Config` CRD from
+previous versions. As part of this, you may now configure more than one possible location for where backups and snapshots are stored, and when you
+create a `Backup` you can select the location where you'd like that particular backup to be stored. See the [Locations documentation][2] for an overview
+of this feature.
+- Ark's plugin system has been significantly refactored to improve robustness and ease of development. Plugin processes are now automatically restarted
+if they unexpectedly terminate. Additionally, plugin binaries can now contain more than one plugin implementation (e.g. and object store *and* a block store,
+or many backup item actions).
+- The sync process, which ensures that Backup custom resources exist for each backup in object storage, has been revamped to run much more frequently (once
+per minute rather than once per hour), to use significantly fewer cloud provider API calls, and to not generate spurious Kubernetes API errors.
+- Ark can now be configured to store all data under a prefix within an object storage bucket. This means that you no longer need a separate bucket per Ark
+instance; you can now have all of your clusters' Ark backups go into a single bucket, with each cluster having its own prefix/subdirectory
+within that bucket.
+- Restic backup data is now automatically stored within the same bucket/prefix as the rest of the Ark data. A separate bucket is no longer required (or allowed).
+- Ark resources (backups, restores, schedules) can now be bulk-deleted through the `ark` CLI, using the `--all` or `--selector` flags, or by specifying 
+multiple resource names as arguments to the `delete` commands.
+- The `ark` CLI now supports waiting for backups and restores to complete with the `--wait` flag for `ark backup create` and `ark restore create`
+- Restores can be created directly from the most recent backup for a schedule, using `ark restore create --from-schedule SCHEDULE_NAME`
+
+### Breaking Changes
+
+Heptio Ark v0.10 contains a number of breaking changes.  Upgrading will require some additional steps beyond just updating your client binary and your
+container image tag. We've provided a [detailed set of instructions][1] to help you with the upgrade process. **Please read and follow these instructions 
+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 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
+-   [b9de44ff](https://github.com/heptio/ark/commit/b9de44ff)	update docs to reference config/ dir within release tarballs
+-   [eace0255](https://github.com/heptio/ark/commit/eace0255)	goreleaser: update example image tags to match version being released
+-   [cff02159](https://github.com/heptio/ark/commit/cff02159)	add rbac content, rework get-started for NodePort and publicUrl, add versioning information
+-   [fa14255e](https://github.com/heptio/ark/commit/fa14255e)	add content for docs issue 819
+-   [22959071](https://github.com/heptio/ark/commit/22959071)	add doc explaining locations
+-   [e5556fe6](https://github.com/heptio/ark/commit/e5556fe6)	Added qps and burst to server's client
+-   [9ae861c9](https://github.com/heptio/ark/commit/9ae861c9)	Support a separate URL base for pre-signed URLs
+-   [698420b6](https://github.com/heptio/ark/commit/698420b6)	Update storage-layout-reorg-v0.10.md
+-   [6c9e1f18](https://github.com/heptio/ark/commit/6c9e1f18)	lower some noisy logs to debug level
+-   [318fd8a8](https://github.com/heptio/ark/commit/318fd8a8)	add troubleshooting for loadbalancer restores
+-   [defb8aa8](https://github.com/heptio/ark/commit/defb8aa8)	remove code that checks directly for a backup from restore controller
+-   [7abe1156](https://github.com/heptio/ark/commit/7abe1156)	Move clearing up of metadata before plugin's actions
+-   [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
+-   [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
+-   [90638086](https://github.com/heptio/ark/commit/90638086)	v0.10 changelog
+-   [6e2166c4](https://github.com/heptio/ark/commit/6e2166c4)	add docs page on versions and upgrading
+-   [18b434cb](https://github.com/heptio/ark/commit/18b434cb)	goreleaser scripts for building/creating a release on a workstation
+-   [bb65d67a](https://github.com/heptio/ark/commit/bb65d67a)	update restic prerequisite with min k8s version
+-   [b5a2ccd5](https://github.com/heptio/ark/commit/b5a2ccd5)	Silence git detached HEAD advice in build container
+-   [67749141](https://github.com/heptio/ark/commit/67749141)	instructions for upgrading to v0.10
+-   [516422c2](https://github.com/heptio/ark/commit/516422c2)	sync controller: fill in missing .spec.storageLocation
+- 	[195e6aaf](https://github.com/heptio/ark/commit/195e6aaf)	fix bug preventing PV snapshots from v0.10 backups from restoring
+- 	[bca58516](https://github.com/heptio/ark/commit/bca58516)	Run 'make update' to update formatting
+- 	[573ce7d0](https://github.com/heptio/ark/commit/573ce7d0)	Update formatting script
+- 	[90d9be59](https://github.com/heptio/ark/commit/90d9be59)	support restoring/deleting legacy backups with .status.volumeBackups
+- 	[ef194972](https://github.com/heptio/ark/commit/ef194972)	rename variables #967
+- 	[6d4e702c](https://github.com/heptio/ark/commit/6d4e702c)	fix broken link
+- 	[596eea1b](https://github.com/heptio/ark/commit/596eea1b)	restore storageclasses before pvs and pvcs
+- 	[f014cab1](https://github.com/heptio/ark/commit/f014cab1)	backup describer: show snapshot summary by default, details optionally
+- 	[8acc66d0](https://github.com/heptio/ark/commit/8acc66d0)	remove pvProviderExists param from NewRestoreController
+- 	[57ce590f](https://github.com/heptio/ark/commit/57ce590f)	create a struct for multiple return of same type in restore_contoroller #967
+- 	[028fafb6](https://github.com/heptio/ark/commit/028fafb6)	Corrected grammatical  error
+- 	[db856aff](https://github.com/heptio/ark/commit/db856aff)	Specify return arguments
+- 	[9952dfb0](https://github.com/heptio/ark/commit/9952dfb0)	Address #424: Add CRDs to list of prioritized resources
+- 	[cf2c2714](https://github.com/heptio/ark/commit/cf2c2714)	fix bugs in GetBackupVolumeSnapshots and add test
+- 	[ec124673](https://github.com/heptio/ark/commit/ec124673)	remove all references to Config from docs/examples
+- 	[c36131a0](https://github.com/heptio/ark/commit/c36131a0)	remove Config-related code
+- 	[406b50a7](https://github.com/heptio/ark/commit/406b50a7)	update restore process using snapshot locations
+- 	[268080ad](https://github.com/heptio/ark/commit/268080ad)	avoid panics if can't get block store during deletion
+- 	[4a03370f](https://github.com/heptio/ark/commit/4a03370f)	update backup deletion controller for snapshot locations
+- 	[38c72b8c](https://github.com/heptio/ark/commit/38c72b8c)	include snapshot locations in created schedule's backup spec
+- 	[0ec2de55](https://github.com/heptio/ark/commit/0ec2de55)	azure: update blockstore to allow storing snaps in different resource group
+- 	[35bb533c](https://github.com/heptio/ark/commit/35bb533c)	close gzip writer before uploading volumesnapshots file
+- 	[da9ed38c](https://github.com/heptio/ark/commit/da9ed38c)	store volume snapshot info as JSON in backup storage
+- 	[e24248e0](https://github.com/heptio/ark/commit/e24248e0)	add --volume-snapshot-locations flag to ark backup create
+- 	[df07b7dc](https://github.com/heptio/ark/commit/df07b7dc)	update backup code to work with volume snapshot locations
+- 	[4af89fa8](https://github.com/heptio/ark/commit/4af89fa8)	add unit test for getDefaultVolumeSnapshotLocations
+- 	[02f50b9c](https://github.com/heptio/ark/commit/02f50b9c)	add default-volume-snapshot-locations to server cmd
+- 	[1aa712d2](https://github.com/heptio/ark/commit/1aa712d2)	Default and validate VolumeSnapshotLocations
+- 	[bbf76985](https://github.com/heptio/ark/commit/bbf76985)	add create CLI command for snapshot locations
+- 	[aeb221ea](https://github.com/heptio/ark/commit/aeb221ea)	Add printer for snapshot locations
+- 	[ffc612ac](https://github.com/heptio/ark/commit/ffc612ac)	Add volume snapshot CLI get command
+- 	[f20342aa](https://github.com/heptio/ark/commit/f20342aa)	Add VolumeLocation and Snapshot.
+- 	[7172db8a](https://github.com/heptio/ark/commit/7172db8a)	upgrade to restic v0.9.3
+- 	[99adc4fa](https://github.com/heptio/ark/commit/99adc4fa)	Remove broken references to docs that are not existing
+- 	[474efde6](https://github.com/heptio/ark/commit/474efde6)	Fixed relative link for image
+- 	[41735154](https://github.com/heptio/ark/commit/41735154)	don't require a default backup storage location to exist
+- 	[0612c5de](https://github.com/heptio/ark/commit/0612c5de)	templatize error message in DeleteOptions
+- 	[66bcbc05](https://github.com/heptio/ark/commit/66bcbc05)	add support for bulk deletion to ark schedule delete
+- 	[3af43b49](https://github.com/heptio/ark/commit/3af43b49)	add azure-specific code to support multi-location restic
+- 	[d009163b](https://github.com/heptio/ark/commit/d009163b)	update restic to support multiple backup storage locations
+- 	[f4c99c77](https://github.com/heptio/ark/commit/f4c99c77)	Change link for the support matrix
+- 	[91e45d56](https://github.com/heptio/ark/commit/91e45d56)	Fix broken storage providers link
+- 	[ed0eb865](https://github.com/heptio/ark/commit/ed0eb865)	fix backup storage location example YAMLs
+- 	[eb709b8f](https://github.com/heptio/ark/commit/eb709b8f)	only sync a backup location if it's changed since last sync
+- 	[af3af1b5](https://github.com/heptio/ark/commit/af3af1b5)	clarify Azure resource group usage in docs
+- 	[9fdf8513](https://github.com/heptio/ark/commit/9fdf8513)	Minor code cleanup
+- 	[2073e15a](https://github.com/heptio/ark/commit/2073e15a)	Fix formatting for live site
+- 	[0fc3e8d8](https://github.com/heptio/ark/commit/0fc3e8d8)	add documentation on running Ark on-premises
+- 	[e46e89cb](https://github.com/heptio/ark/commit/e46e89cb)	have restic share main Ark bucket
+- 	[42b54586](https://github.com/heptio/ark/commit/42b54586)	refactor to make valid dirs part of an object store layout
+- 	[8bc7e4f6](https://github.com/heptio/ark/commit/8bc7e4f6)	store backups & restores in backups/, restores/ subdirs in obj storage
+- 	[e3232b7e](https://github.com/heptio/ark/commit/e3232b7e)	add support for bulk deletion to ark restore delete
+- 	[17be71e1](https://github.com/heptio/ark/commit/17be71e1)	remove deps used for docs gen
+- 	[20635106](https://github.com/heptio/ark/commit/20635106)	remove script for generating docs
+- 	[6fd9ea9d](https://github.com/heptio/ark/commit/6fd9ea9d)	remove cli reference docs and related scripts
+- 	[4833607a](https://github.com/heptio/ark/commit/4833607a)	Fix infinite sleep in fsfreeze container
+- 	[7668bfd4](https://github.com/heptio/ark/commit/7668bfd4)	Add links for Portworx plugin support
+- 	[468006e6](https://github.com/heptio/ark/commit/468006e6)	Fix Portworx name in doc
+- 	[e6b44539](https://github.com/heptio/ark/commit/e6b44539)	Make fsfreeze image building consistent
+- 	[fcd27a13](https://github.com/heptio/ark/commit/fcd27a13)	get a new metadata accessor after calling backup item actions
+- 	[ffef86e3](https://github.com/heptio/ark/commit/ffef86e3)	Adding support for the AWS_CLUSTER_NAME env variable allowing to claim volumes ownership
+- 	[cda3dff8](https://github.com/heptio/ark/commit/cda3dff8)	Document single binary plugins
+- 	[f049e078](https://github.com/heptio/ark/commit/f049e078)	Remove ROADMAP.md, update ZenHub link to Ark board
+- 	[94617b30](https://github.com/heptio/ark/commit/94617b30)	convert all controllers to use genericController, logContext -> log
+- 	[779cb428](https://github.com/heptio/ark/commit/779cb428)	Document SignatureDoesNotMatch error and triaging
+- 	[7d8813a9](https://github.com/heptio/ark/commit/7d8813a9)	move ObjectStore mock into pkg/cloudprovider/mocks
+- 	[f0edf733](https://github.com/heptio/ark/commit/f0edf733)	add a BackupStore to pkg/persistence that supports prefixes
+- 	[af64069d](https://github.com/heptio/ark/commit/af64069d)	create pkg/persistence and move relevant code from pkg/cloudprovider into it
+- 	[29d75d72](https://github.com/heptio/ark/commit/29d75d72)	move object and block store interfaces to their own files
+- 	[211aa7b7](https://github.com/heptio/ark/commit/211aa7b7)	Set schedule labels to subsequent backups
+- 	[d34994cb](https://github.com/heptio/ark/commit/d34994cb)	set azure restic env vars based on default backup location's config
+- 	[a50367f1](https://github.com/heptio/ark/commit/a50367f1)	Regenerate CLI docs
+- 	[7bc27bbb](https://github.com/heptio/ark/commit/7bc27bbb)	Pin cobra version
+- 	[e94277ac](https://github.com/heptio/ark/commit/e94277ac)	Update pflag version
+- 	[df69b274](https://github.com/heptio/ark/commit/df69b274)	azure: update documentation and examples
+- 	[cb321db2](https://github.com/heptio/ark/commit/cb321db2)	azure: refactor to not use helpers/ pkg, validate all env/config inputs
+- 	[9d7ea748](https://github.com/heptio/ark/commit/9d7ea748)	azure: support different RGs/storage accounts per backup location
+- 	[cd4e9f53](https://github.com/heptio/ark/commit/cd4e9f53)	azure: fix for breaking change in blob.GetSASURI
+- 	[a440029c](https://github.com/heptio/ark/commit/a440029c)	bump Azure SDK version and include storage mgmt package
+- 	[b31e25bf](https://github.com/heptio/ark/commit/b31e25bf)	server: remove unused code, replace deprecated func
+- 	[729d7339](https://github.com/heptio/ark/commit/729d7339)	controllers: take a newPluginManager func in constructors
+- 	[6445dbf1](https://github.com/heptio/ark/commit/6445dbf1)	Update examples and docs for backup locations
+- 	[133dc185](https://github.com/heptio/ark/commit/133dc185)	backup sync: process the default location first
+- 	[7a1e6d16](https://github.com/heptio/ark/commit/7a1e6d16)	generic controller: allow controllers with only a resync func
+- 	[6f7bfe54](https://github.com/heptio/ark/commit/6f7bfe54)	remove Config CRD's BackupStorageProvider & other obsolete code
+- 	[bd4d97b9](https://github.com/heptio/ark/commit/bd4d97b9)	move server's defaultBackupLocation into config struct
+- 	[0e94fa37](https://github.com/heptio/ark/commit/0e94fa37)	update sync controller for backup locations
+- 	[2750aa71](https://github.com/heptio/ark/commit/2750aa71)	Use backup storage location during restore
+- 	[20f89fbc](https://github.com/heptio/ark/commit/20f89fbc)	use the default backup storage location for restic
+- 	[833a6307](https://github.com/heptio/ark/commit/833a6307)	Add storage location to backup get/describe
+- 	[cf7c8587](https://github.com/heptio/ark/commit/cf7c8587)	download request: fix setting of log level for plugin manager
+- 	[3234124a](https://github.com/heptio/ark/commit/3234124a)	backup deletion: fix setting of log level in plugin manager
+- 	[74043ab4](https://github.com/heptio/ark/commit/74043ab4)	download request controller: fix bug in determining expiration
+- 	[7007f198](https://github.com/heptio/ark/commit/7007f198)	refactor download request controller test and add test cases
+- 	[8f534615](https://github.com/heptio/ark/commit/8f534615)	download request controller: use backup location for object store
+- 	[bab08ed1](https://github.com/heptio/ark/commit/bab08ed1)	backup deletion controller: use backup location for object store
+- 	[c6f488f7](https://github.com/heptio/ark/commit/c6f488f7)	Use backup location in the backup controller
+- 	[06b5af44](https://github.com/heptio/ark/commit/06b5af44)	add create and get CLI commands for backup locations
+- 	[adbcd370](https://github.com/heptio/ark/commit/adbcd370)	add --default-backup-storage-location flag to server cmd
+- 	[2a34772e](https://github.com/heptio/ark/commit/2a34772e)	Add --storage-location argument to create commands
+- 	[56f16170](https://github.com/heptio/ark/commit/56f16170)	Correct metadata for BackupStorageLocationList
+- 	[345c3c39](https://github.com/heptio/ark/commit/345c3c39)	Generate clients for BackupStorageLocation
+- 	[a25eb032](https://github.com/heptio/ark/commit/a25eb032)	Add BackupStorageLocation API type
+- 	[575c4ddc](https://github.com/heptio/ark/commit/575c4ddc)	apply annotations on single line, no restore mode
+- 	[030ea6c0](https://github.com/heptio/ark/commit/030ea6c0)	minor word updates and command wrapping
+- 	[d32f8dbb](https://github.com/heptio/ark/commit/d32f8dbb)	Update hooks/fsfreeze example
+- 	[342a1c64](https://github.com/heptio/ark/commit/342a1c64)	add an ark bug command
+- 	[9c11ba90](https://github.com/heptio/ark/commit/9c11ba90)	Add DigitalOcean to S3-compatible backup providers
+- 	[ea50ebf2](https://github.com/heptio/ark/commit/ea50ebf2)	Fix map merging logic
+- 	[9508e4a2](https://github.com/heptio/ark/commit/9508e4a2)	Switch Config CRD elements to server flags
+- 	[0c3ac67b](https://github.com/heptio/ark/commit/0c3ac67b)	start using a namespaced label on restored objects, deprecate old label
+- 	[6e53aa03](https://github.com/heptio/ark/commit/6e53aa03)	Bring back 'make local'
+- 	[5acccaa7](https://github.com/heptio/ark/commit/5acccaa7)	add bulk deletion support to ark backup delete
+- 	[3aa241a7](https://github.com/heptio/ark/commit/3aa241a7)	Preserve node ports during restore when annotations hold specification.
+- 	[c5f5862c](https://github.com/heptio/ark/commit/c5f5862c)	Add --wait support to ark backup create
+- 	[eb6f742b](https://github.com/heptio/ark/commit/eb6f742b)	Document CRD not found errors
+- 	[fb4d507c](https://github.com/heptio/ark/commit/fb4d507c)	Extend doc about synchronization
+- 	[e7bb5926](https://github.com/heptio/ark/commit/e7bb5926)	Add --wait support to `ark restore create`
+- 	[8ce513ac](https://github.com/heptio/ark/commit/8ce513ac)	Only delete unused backup if they are complete
+- 	[1c26fbde](https://github.com/heptio/ark/commit/1c26fbde)	remove SnapshotService, replace with direct BlockStore usage
+- 	[13051218](https://github.com/heptio/ark/commit/13051218)	Refactor plugin management
+- 	[74dbf387](https://github.com/heptio/ark/commit/74dbf387)	Add restore failed phase and metrics
+- 	[8789ae5c](https://github.com/heptio/ark/commit/8789ae5c)	update testify to latest released version
+- 	[fe9d61a9](https://github.com/heptio/ark/commit/fe9d61a9)	Add schedule command info to quickstart
+- 	[ca5656c2](https://github.com/heptio/ark/commit/ca5656c2)	fix bug preventing backup item action item updates from saving
+- 	[d2e629f5](https://github.com/heptio/ark/commit/d2e629f5)	Delete backups from etcd if they're not in storage
+- 	[625ba481](https://github.com/heptio/ark/commit/625ba481)	Fix ZenHub link on Readme.md
+- 	[dcae6eb0](https://github.com/heptio/ark/commit/dcae6eb0)	Update gcp-config.md
+- 	[06d6665a](https://github.com/heptio/ark/commit/06d6665a)	check s3URL scheme upon AWS ObjectStore Init()
+- 	[cc359f6e](https://github.com/heptio/ark/commit/cc359f6e)	Add contributor docs for our ZenHub usage
+- 	[f6204562](https://github.com/heptio/ark/commit/f6204562)	cleanup service account action log statement
+- 	[450fa72f](https://github.com/heptio/ark/commit/450fa72f)	Initialize schedule Prometheus metrics to have them created beforehand (see https://prometheus.io/docs/practices/instrumentation/#avoid-missing-metrics)
+- 	[39c4267a](https://github.com/heptio/ark/commit/39c4267a)	Clarify that object storage should per-cluster
+- 	[78cbdf95](https://github.com/heptio/ark/commit/78cbdf95)	delete old deletion requests for backup when processing a new one
+- 	[85a61b8e](https://github.com/heptio/ark/commit/85a61b8e)	return nil error if 404 encountered when deleting snapshots
+- 	[a2a7dbda](https://github.com/heptio/ark/commit/a2a7dbda)	fix tagging latest by using make's ifeq
+- 	[b4a52e45](https://github.com/heptio/ark/commit/b4a52e45)	Add commands for context to the bug template
+- 	[3efe6770](https://github.com/heptio/ark/commit/3efe6770)	Update Ark library code to work with Kubernetes 1.11
+- 	[7e8c8c69](https://github.com/heptio/ark/commit/7e8c8c69)	Add some basic troubleshooting commands
+- 	[d1955120](https://github.com/heptio/ark/commit/d1955120)	require namespace for backups/etc. to exist at server startup
+- 	[683f7afc](https://github.com/heptio/ark/commit/683f7afc)	switch to using .status.startTimestamp for sorting backups
+- 	[b71a37db](https://github.com/heptio/ark/commit/b71a37db)	Record backup completion time before uploading
+- 	[217084cd](https://github.com/heptio/ark/commit/217084cd)	Add example ark version command to issue templates
+- 	[040788bb](https://github.com/heptio/ark/commit/040788bb)	Add minor improvements and aws example<Plug>delimitMateCR
+- 	[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
+- 	[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
+- 	[f0426538](https://github.com/heptio/ark/commit/f0426538)	use posix-compliant conditional for checking TAG_LATEST
+- 	[cf336d80](https://github.com/heptio/ark/commit/cf336d80)	Added new templates
+- 	[795dc262](https://github.com/heptio/ark/commit/795dc262)	replace pkg/restore's osFileSystem with pkg/util/filesystem's
+- 	[eabef085](https://github.com/heptio/ark/commit/eabef085)	Update generated Ark code based on the 1.11 k8s.io/code-generator script
+- 	[f5eac0b4](https://github.com/heptio/ark/commit/f5eac0b4)	Update vendored library code for Kubernetes 1.11
+
+[1]: https://heptio.github.io/velero/v0.10.0/upgrading-to-v0.10
+[2]: locations.md
--- a/changelogs/CHANGELOG-0.11.md
+++ b/changelogs/CHANGELOG-0.11.md
@@ -0,0 +1,25 @@
+  - [v0.11.0](#v0110)
+
+## v0.11.0
+#### 2019-02-28
+
+### Download
+- https://github.com/heptio/velero/releases/tag/v0.11.0
+
+### Highlights
+* Heptio Ark is now Velero! This release is the first one to use the new name. For details on the changes and how to migrate to v0.11, see the [migration instructions][1]. **Please follow the instructions to ensure a successful upgrade to v0.11.**
+* Restic has been upgraded to v0.9.4, which brings significantly faster restores thanks to a new multi-threaded restorer.
+* Velero now waits for terminating namespaces and persistent volumes to delete before attempting to restore them, rather than trying and failing to restore them while they're being deleted.
+
+### All Changes
+* Fix concurrency bug in code ensuring restic repository exists (#1235, @skriss)
+* Wait for PVs and namespaces to delete before attempting to restore them. (#826, @nrb)
+* Set the zones for GCP regional disks on restore. This requires the `compute.zones.get` permission on the GCP serviceaccount in order to work correctly. (#1200, @nrb)
+* Renamed Heptio Ark to Velero. Changed internal imports, environment variables, and binary name. (#1184, @nrb)
+* use 'restic stats' instead of 'restic check' to determine if repo exists (#1171, @skriss)
+* upgrade restic to v0.9.4 & replace --hostname flag with --host (#1156, @skriss)
+* Clarify restore log when object unchanged (#1153, @daved)
+* Add backup-version file in backup tarball. (#1117, @wwitzel3)
+* add ServerStatusRequest CRD and show server version in `ark version` output (#1116, @skriss)
+
+[1]: https://heptio.github.io/velero/v0.11.0/migrating-to-velero
--- a/changelogs/CHANGELOG-0.3.md
+++ b/changelogs/CHANGELOG-0.3.md
@@ -0,0 +1,39 @@
+- [v0.3.3](#v033)
+- [v0.3.2](#v032)
+- [v0.3.1](#v031)
+- [v0.3.0](#v030)
+
+## v0.3.3
+#### 2017-08-10
+### Download
+  - https://github.com/heptio/ark/tree/v0.3.3
+
+### Bug Fixes
+  * Treat the first field in a schedule's cron expression as minutes, not seconds
+
+
+## v0.3.2
+#### 2017-08-07
+### Download
+  - https://github.com/heptio/ark/tree/v0.3.2
+
+### New Features
+  * Add client-go auth provider plugins for Azure, GCP, OIDC
+
+
+## v0.3.1
+#### 2017-08-03
+### Download
+  - https://github.com/heptio/ark/tree/v0.3.1
+
+### Bug Fixes
+  * Fix Makefile VERSION
+
+
+## v0.3.0
+#### 2017-08-03
+### Download
+  - https://github.com/heptio/ark/tree/v0.3.0
+
+### All New Features
+  *  Initial Release
--- a/changelogs/CHANGELOG-0.4.md
+++ b/changelogs/CHANGELOG-0.4.md
@@ -0,0 +1,29 @@
+- [v0.4.0](#v040)
+
+## v0.4.0
+#### 2017-09-14
+### Download
+  - https://github.com/heptio/ark/tree/v0.4.0
+
+### Breaking changes
+  * Snapshotting and restoring volumes is now enabled by default
+  * The --namespaces flag for 'ark restore create' has been replaced by --include-namespaces and
+    --exclude-namespaces
+
+### New features
+  * Support for S3 SSE with KMS
+  * Cloud provider configurations are validated at startup
+  * The persistentVolumeProvider is now optional
+  * Restore objects are garbage collected
+  * Each backup now has an associated log file, viewable via 'ark backup logs'
+  * Each restore now has an associated log file, viewable via 'ark restore logs'
+  * Add --include-resources/--exclude-resources for restores
+
+### Bug fixes
+  * Only save/use iops for io1 volumes on AWS
+  * When restoring, try to retrieve the Backup directly from object storage if it's not found
+  * When syncing Backups from object storage to Kubernetes, don't return at the first error
+    encountered
+  * More closely match how kubectl performs kubeconfig resolution
+  * Increase default Azure API request timeout to 2 minutes
+  * Update Azure diskURI to match diskName
--- a/changelogs/CHANGELOG-0.5.md
+++ b/changelogs/CHANGELOG-0.5.md
@@ -0,0 +1,41 @@
+- [v0.5.1](#v051)
+- [v0.5.0](#v050)
+
+## v0.5.1
+#### 2017-11-06
+### Download
+  - https://github.com/heptio/ark/tree/v0.5.1
+
+### Bug fixes
+  * If a Service is headless, retain ClusterIP = None when backing up and restoring.
+  * Use the specifed --label-selector when listing backups, schedules, and restores.
+  * Restore namespace mapping functionality that was accidentally broken in 0.5.0.
+  * Always include namespaces in the backup, regardless of the --include-cluster-resources setting.
+
+
+## v0.5.0
+#### 2017-10-26
+### Download
+  - https://github.com/heptio/ark/tree/v0.5.0
+
+### Breaking changes
+  * The backup tar file format has changed. Backups created using previous versions of Ark cannot be restored using v0.5.0.
+  * When backing up one or more specific namespaces, cluster-scoped resources are no longer backed up by default, with the exception of PVs that are used within the target namespace(s). Cluster-scoped resources can still be included by explicitly specifying `--include-cluster-resources`.
+
+### New features
+  * Add customized user-agent string for Ark CLI
+  * Switch from glog to logrus
+  * Exclude nodes from restoration
+  * Add a FAQ
+  * Record PV availability zone and use it when restoring volumes from snapshots
+  * Back up the PV associated with a PVC
+  * Add `--include-cluster-resources` flag to `ark backup create`
+  * Add `--include-cluster-resources` flag to `ark restore create`
+  * Properly support resource restore priorities across cluster-scoped and namespace-scoped resources
+  * Support `ark create ...` and `ark get ...`
+  * Make ark run as cluster-admin
+  * Add pod exec backup hooks
+  * Support cross-compilation & upgrade to go 1.9
+  
+### Bug fixes
+  * Make config change detection more robust
--- a/changelogs/CHANGELOG-0.6.md
+++ b/changelogs/CHANGELOG-0.6.md
@@ -0,0 +1,31 @@
+- [v0.6.0](#v060)
+
+## v0.6.0
+#### 2017-11-30
+### Download
+  - https://github.com/heptio/ark/tree/v0.6.0
+
+### Highlights
+  * **Plugins** - We now support user-defined plugins that can extend Ark functionality to meet your custom backup/restore needs without needing to be compiled into the core binary. We support pluggable block and object stores as well as per-item backup and restore actions that can execute arbitrary logic, including modifying the items being backed up or restored. For more information see the [documentation](docs/plugins.md), which includes a reference to a fully-functional sample plugin repository. (#174 #188 #206 #213 #215 #217 #223 #226)
+  * **Describers** - The Ark CLI now includes `describe` commands for `backups`, `restores`, and `schedules` that provide human-friendly representations of the relevant API objects.
+
+### Breaking Changes
+  * The config object format has changed. In order to upgrade to v0.6.0, the config object will have to be updated to match the new format. See the [examples](examples) and [documentation](docs/config-definition.md) for more information.
+  * The restore object format has changed. The `warnings` and `errors` fields are now ints containing the counts, while full warnings and errors are now stored in the object store instead of etcd. Restore objects created prior to v.0.6.0 should be deleted, or a new bucket used, and the old restore objects deleted from Kubernetes (`kubectl -n heptio-ark delete restore --all`).
+
+### All New Features
+  * Add `ark plugin add` and `ark plugin remove` commands #217, @skriss
+  * Add plugin support for block/object stores, backup/restore item actions #174 #188 #206 #213 #215 #223 #226, @skriss @ncdc
+  * Improve Azure deployment instructions #216, @ncdc
+  * Change default TTL for backups to 30 days #204, @nrb
+  * Improve logging for backups and restores #199, @ncdc
+  * Add `ark backup describe`, `ark schedule describe` #196, @ncdc
+  * Add `ark restore describe` and move restore warnings/errors to object storage #173 #201 #202, @ncdc
+  * Upgrade to client-go v5.0.1, kubernetes v1.8.2 #157, @ncdc
+  * Add Travis CI support #165 #166, @ncdc
+
+### Bug Fixes
+  * Fix log location hook prefix stripping #222, @ncdc
+  * When running `ark backup download`, remove file if there's an error #154, @ncdc
+  * Update documentation for AWS KMS Key alias support #163, @lli-hiya
+  * Remove clock from `volume_snapshot_action` #137, @athampy
--- a/changelogs/CHANGELOG-0.7.md
+++ b/changelogs/CHANGELOG-0.7.md
@@ -0,0 +1,30 @@
+- [v0.7.1](#v071)
+- [v0.7.0](#v070)
+
+## v0.7.1
+#### 2018-02-22
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.7.1
+
+### Bug Fixes:
+  * Run the Ark server in its own namespace, separate from backups/schedules/restores/config (#322, @ncdc)
+
+
+## v0.7.0
+#### 2018-02-15
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.7.0
+
+### New Features:
+  * Run the Ark server in any namespace (#272, @ncdc)
+  * Add ability to delete backups and their associated data (#252, @skriss)
+  * Support both pre and post backup hooks (#243, @ncdc)
+
+### Bug Fixes / Other Changes:
+  * Switch from Update() to Patch() when updating Ark resources (#241, @skriss)
+  * Don't fail the backup if a PVC is not bound to a PV (#256, @skriss)
+  * Restore serviceaccounts prior to workload controllers (#258, @ncdc)
+  * Stop removing annotations from PVs when restoring them (#263, @skriss)
+  * Update GCP client libraries (#249, @skriss)
+  * Clarify backup and restore creation messages (#270, @nrb)
+  * Update S3 bucket creation docs for us-east-1 (#285, @lypht)
--- a/changelogs/CHANGELOG-0.8.md
+++ b/changelogs/CHANGELOG-0.8.md
@@ -0,0 +1,100 @@
+- [v0.8.3](#v083)
+- [v0.8.2](#v082)
+- [v0.8.1](#v081)
+- [v0.8.0](#v080)
+
+## v0.8.3
+#### 2018-06-29
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.8.3
+
+### Bug Fixes:
+  * Don't restore backup and restore resources to avoid possible data corruption (#622, @ncdc)
+
+
+## v0.8.2
+#### 2018-06-01
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.8.2
+
+### Bug Fixes:
+  * Don't crash when a persistent volume claim is missing spec.volumeName (#520, @ncdc)
+
+
+## v0.8.1
+#### 2018-04-23
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.8.1
+
+### Bug Fixes:
+  * Azure: allow pre-v0.8.0 backups with disk snapshots to be restored and deleted (#446 #449, @skriss)
+
+
+## v0.8.0
+#### 2018-04-19
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.8.0
+
+### Highlights:
+  * Backup deletion has been completely revamped to make it simpler and less error-prone. As a user, you still use the `ark backup delete` command to request deletion of a backup and its associated cloud
+  resources; behind the scenes, we've switched to using a new `DeleteBackupRequest` Custom Resource and associated controller for processing deletion requests.
+  * We've reduced the number of required fields in the Ark config. For Azure, `location` is no longer required, and for GCP, `project` is not needed.
+  * Ark now copies tags from volumes to snapshots during backup, and from snapshots to new volumes during restore. 
+
+### Breaking Changes:
+  * Ark has moved back to a single namespace (`heptio-ark` by default) as part of #383.
+
+### All New Features:
+  * Add global `--kubecontext` flag to Ark CLI (#296, @blakebarnett)
+  * Azure: support cross-resource group restores of volumes (#356 #378, @skriss)
+  * AWS/Azure/GCP: copy tags from volumes to snapshots, and from snapshots to volumes (#341, @skriss)
+  * Replace finalizer for backup deletion with `DeleteBackupRequest` custom resource & controller (#383 #431, @ncdc @nrb)
+  * Don't log warnings during restore if an identical object already exists in the cluster (#405, @nrb)
+  * Add bash & zsh completion support (#384, @containscafeine)
+  
+### Bug Fixes / Other Changes:
+  * Error from the Ark CLI if attempting to restore a non-existent backup (#302, @ncdc)
+  * Enable running the Ark server locally for development purposes (#334, @ncdc)
+  * Add examples to `ark schedule create` documentation (#331, @lypht)
+  * GCP: Remove `project` requirement from Ark config (#345, @skriss)
+  * Add `--from-backup` flag to `ark restore create` and allow custom restore names (#342 #409, @skriss)
+  * Azure: remove `location` requirement from Ark config (#344, @skriss)
+  * Add documentation/examples for storing backups in IBM Cloud Object Storage (#321, @roytman)
+  * Reduce verbosity of hooks logging (#362, @skriss)
+  * AWS: Add minimal IAM policy to documentation (#363 #419, @hopkinsth)
+  * Don't restore events (#374, @sanketjpatel)
+  * Azure: reduce API polling interval from 60s to 5s (#359, @skriss)
+  * Switch from hostPath to emptyDir volume type for minio example (#386, @containscafeine)
+  * Add limit ranges as a prioritized resource for restores (#392, @containscafeine)
+  * AWS: Add documentation on using Ark with kube2iam (#402, @domderen)
+  * Azure: add node selector so Ark pod is scheduled on a linux node (#415, @ffd2subroutine)
+  * Error from the Ark CLI if attempting to get logs for a non-existent restore (#391, @containscafeine)
+  * GCP: Add minimal IAM policy to documentation (#429, @skriss @jody-frankowski)
+
+### Upgrading from v0.7.1:
+  Ark v0.7.1 moved the Ark server deployment into a separate namespace, `heptio-ark-server`. As of v0.8.0 we've
+  returned to a single namespace, `heptio-ark`, for all Ark-related resources. If you're currently running v0.7.1,
+  here are the steps you can take to upgrade:
+
+1. Execute the steps from the **Credentials and configuration** section for your cloud:
+    * [AWS](https://heptio.github.io/velero/v0.8.0/aws-config#credentials-and-configuration)
+    * [Azure](https://heptio.github.io/velero/v0.8.0/azure-config#credentials-and-configuration)
+    * [GCP](https://heptio.github.io/velero/v0.8.0/gcp-config#credentials-and-configuration)
+
+    When you get to the secret creation step, if you don't have your `credentials-ark` file handy, 
+    you can copy the existing secret from your `heptio-ark-server` namespace into the `heptio-ark` namespace:
+    ```bash
+    kubectl get secret/cloud-credentials -n heptio-ark-server --export -o json | \
+      jq '.metadata.namespace="heptio-ark"' | \
+      kubectl apply -f -
+    ```
+
+2. You can now safely delete the `heptio-ark-server` namespace:
+    ```bash
+    kubectl delete namespace heptio-ark-server
+    ```
+
+3. Execute the commands from the **Start the server** section for your cloud:
+    * [AWS](https://heptio.github.io/velero/v0.8.0/aws-config#start-the-server)
+    * [Azure](https://heptio.github.io/velero/v0.8.0/azure-config#start-the-server)
+    * [GCP](https://heptio.github.io/velero/v0.8.0/gcp-config#start-the-server)
--- a/changelogs/CHANGELOG-0.9.md
+++ b/changelogs/CHANGELOG-0.9.md
@@ -0,0 +1,181 @@
+  - [v0.9.11](#v0911)
+  - [v0.9.10](#v0910)
+  - [v0.9.9](#v099)
+  - [v0.9.8](#v098)
+  - [v0.9.7](#v097)
+  - [v0.9.6](#v096)
+  - [v0.9.5](#v095)
+  - [v0.9.4](#v094)
+  - [v0.9.3](#v093)
+  - [v0.9.2](#v092)
+  - [v0.9.1](#v091)
+  - [v0.9.0](#v090)
+
+## v0.9.11
+#### 2018-11-08
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.9.11
+
+### Bug Fixes
+  * Fix bug preventing PV snapshots from being restored (#1040, @ncdc)
+
+
+## v0.9.10
+#### 2018-11-01
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.9.10
+
+### Bug Fixes
+  * restore storageclasses before pvs and pvcs (#594, @shubheksha)
+  * AWS: Ensure that the order returned by ListObjects is consistent (#999, @bashofmann)
+  * Add CRDs to list of prioritized resources (#424, @domenicrosati)
+  * Verify PV doesn't exist before creating new volume (#609, @nrb)
+  * Update README.md - Grammar mistake corrected (#1018, @midhunbiju)
+
+
+## v0.9.9
+#### 2018-10-24
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.9.9
+
+### Bug Fixes
+  * Check if initContainers key exists before attempting to remove volume mounts. (#927, @skriss)
+
+
+## v0.9.8
+#### 2018-10-18
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.9.8
+
+### Bug Fixes
+  * Discard service account token volume mounts from init containers on restore (#910, @james-powis)
+  * Support --include-cluster-resources flag when creating schedule (#942, @captjt)
+  * Remove logic to get a GCP project (#926, @shubheksha)
+  * Only try to back up PVCs linked PV if the PVC's phase is Bound (#920, @skriss)
+  * Claim ownership of new AWS volumes on Kubernetes cluster being restored into (#801, @ljakimczuk)
+  * Remove timeout check when taking snapshots (#928, @carlisia)
+
+
+## v0.9.7
+#### 2018-10-04
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.9.7
+
+### Bug Fixes
+  * Preserve explicitly-specified node ports during restore (#712, @timoreimann)
+  * Enable restoring resources with ownerReference set (#837, @mwieczorek)
+  * Fix error when restoring ExternalName services (#869, @shubheksha)
+  * remove restore log helper for accurate line numbers (#891, @skriss)
+  * Display backup StartTimestamp in `ark backup get` output (#894, @marctc)
+  * Fix restic restores when using namespace mappings (#900, @skriss)
+
+
+## v0.9.6
+#### 2018-09-21
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.9.6
+
+### Bug Fixes
+  * Discard service account tokens from non-default service accounts on restore (#843, @james-powis)
+  * Update Docker images to use `alpine:3.8` (#852, @nrb)
+
+
+## v0.9.5
+#### 2018-09-17
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.9.5
+
+### Bug Fixes
+  * Fix issue causing restic restores not to work (#834, @skriss)
+
+
+## v0.9.4
+#### 20180-09-05
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.9.4
+
+### Bug Fixes
+  * Terminate plugin clients to resolve memory leaks (#797, @skriss)
+  * Fix nil map errors when merging annotations (#812, @nrb)
+
+
+## v0.9.3
+#### 2018-08-10
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.9.3
+### Bug Fixes
+  * Initalize Prometheus metrics when creating a new schedule (#689, @lemaral)
+
+
+## v0.9.2
+#### 2018-07-26
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.9.2) - 2018-07-26
+
+### Bug Fixes:
+  * Fix issue where modifications made by backup item actions were not being saved to backup tarball (#704, @skriss)
+
+
+## v0.9.1
+#### 2018-07-23
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.9.1
+
+### Bug Fixes:
+  * Require namespace for Ark's CRDs to already exist at server startup (#676, @skriss)
+  * Require all Ark CRDs to exist at server startup (#683, @skriss)
+  * Fix `latest` tagging in Makefile (#690, @skriss)
+  * Make Ark compatible with clusters that don't have the `rbac.authorization.k8s.io/v1` API group (#682, @nrb)
+  * Don't consider missing snapshots an error during backup deletion, limit backup deletion requests per backup to 1 (#687, @skriss)
+
+
+## v0.9.0
+#### 2018-07-06
+### Download
+  - https://github.com/heptio/ark/releases/tag/v0.9.0
+
+### 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).
+  * 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!
+
+### All New Features:
+  * Add restic support (#508 #532 #533 #534 #535 #537 #540 #541 #545 #546 #547 #548 #555 #557 #561 #563 #569 #570 #571 #606 #608 #610 #621 #631 #636, @skriss)
+  * Add prometheus metrics (#531 #551 #564, @ashish-amarnath @nrb)
+  * When backing up a service account, include cluster roles/cluster role bindings that reference it (#470, @skriss)
+  * When restoring service accounts, copy secrets/image pull secrets into the target cluster even if the service account already exists (#403, @nrb)
+
+### Bug Fixes / Other Changes:
+  * Upgrade to Kubernetes 1.10 dependencies (#417, @skriss)
+  * Upgrade to go 1.10 and alpine 3.7 (#456, @skriss)
+  * Display no excluded resources/namespaces as `<none>` rather than `*` (#453, @nrb)
+  * Skip completed jobs and pods when restoring (#463, @nrb)
+  * Set namespace correctly when syncing backups from object storage (#472, @skriss)
+  * When building on macOS, bind-mount volumes with delegated config (#478, @skriss)
+  * Add replica sets and daemonsets to cohabitating resources so they're not backed up twice (#482 #485, @skriss)
+  * Shut down the Ark server gracefully on SIGINT/SIGTERM (#483, @skriss)
+  * Only back up resources that support GET and DELETE in addition to LIST and CREATE (#486, @nrb)
+  * Show a better error message when trying to get an incomplete restore's logs (#496, @nrb)
+  * Stop processing when setting a backup deletion request's phase to `Deleting` fails (#500, @nrb)
+  * Add library code to install Ark's server components (#437 #506, @marpaia)
+  * Properly handle errors when backing up additional items (#512, @carlpett)
+  * Run post hooks even if backup actions fail (#514, @carlpett)
+  * GCP: fail backup if upload to object storage fails (#510, @nrb)
+  * AWS: don't require `region` as part of backup storage provider config (#455, @skriss)
+  * Ignore terminating resources while doing a backup (#526, @yastij)
+  * Log to stdout instead of stderr (#553, @ncdc)
+  * Move sample minio deployment's config to an emptyDir (#566, @runyontr)
+  * Add `omitempty` tag to optional API fields (@580, @nikhita)
+  * Don't restore PVs with a reclaim policy of `Delete` and no snapshot (#613, @ncdc)
+  * Don't restore mirror pods (#619, @ncdc)
+
+### Docs Contributors:
+  * @gianrubio
+  * @castrojo
+  * @dhananjaysathe
+  * @c-knowles
+  * @mattkelly
+  * @ae-v
+  * @hamidzr
--- a/changelogs/CHANGELOG-1.0.md
+++ b/changelogs/CHANGELOG-1.0.md
@@ -0,0 +1,140 @@
+## v1.0.0-alpha.2
+#### 2019-04-24
+
+### Download
+- https://github.com/heptio/velero/releases/tag/v1.0.0-alpha.2
+
+### Container Image
+`gcr.io/heptio-images/velero:v1.0.0-alpha.2`
+
+### Highlights
+Our second v1.0 alpha is ready for testing! Please try it out in your non-critial environments. This alpha contains a bunch of bug fixes and smaller enhancements. See the **All Changes** section below for details.
+
+We expect that our next release will be `v1.0.0-beta.1`, meaning that all key features for v1.0.0 will be included. Following that release, we'll continue to fix
+bugs and make minor improvements, and we expect to ship at least one more beta and/or release candidate prior to the general availability of v1.0.0.
+
+### All Changes
+* restic repo ensurer: return error if new repository does not become ready within a minute, and fix channel closing/deletion (#1367, @skriss)
+* remove deprecated "hooks" for backups (they've been replaced by "pre hooks") (#1384, @skriss)
+* fix setting up restic identifiers when fully-qualified plugin names are used (#1377, @jmontleon)
+* add `--namespace` flag to `velero install` (@1380, @nrb)
+* GCP: allow `storageLocation` to be specified as a config parameter for VolumeSnapshotLocations (#1375, @ctrox)
+* add new prometheus gauge metrics `backup_total` and `restore_total` (#1353, @fabito)
+* update install docs to use `velero install` (#1376 #1393 #1394, @nrb and @skriss)
+* fix panic in API discovery when 1+ API groups cannot be reached (#1399, @skriss)
+* fail backup if it already exists in object storage (#1390, @carlisia and @ncdc)
+
+## v1.0.0-alpha.1
+#### 2019-04-15
+
+### Download
+- https://github.com/heptio/velero/releases/tag/v1.0.0-alpha.1
+
+### Highlights
+We're excited to release our first alpha for v1.0! Please take it for a spin in your non-critical environments. Although we've finished the majority of the planned development work for v1.0, we are still working on a handful of items, so don't consider this alpha release to be fully feature-complete. Here's a quick rundown of the major changes in this release:
+
+- We've added a new command, `velero install`, to make it easier to get up and running with Velero
+- We've made a bunch of improvements to the plugin framework:
+    - we've reorganized the relevant packages to minimize the import surface for plugin authors
+    - all plugins are now wrapped in panic handlers that will report information on panics back to Velero
+    - Velero's `--log-level` flag is now passed to plugin implementations
+    - Errors logged within plugins are now annotated with the file/line of where the error occurred
+    - Restore item actions can now optionally return a list of additional related items that should be restored
+    - Restore item actions can now indicate that an item *should not* be restored
+- The restic restore helper image used by Velero can now optionally be overridden via config map
+
+### Breaking & Notable Changes
+
+#### API
+* All legacy Ark data types and pre-1.0 compatibility code has been removed. Users should migrate any backups created pre-v0.11.0 with the v0.11.1 migration command (not yet released)
+
+#### Azure
+* During installation, the `cloud-credentials` secret can now be created from a file, whose contents look like the following:
+    ```
+    AZURE_TENANT_ID=${AZURE_TENANT_ID}
+    AZURE_SUBSCRIPTION_ID=${AZURE_SUBSCRIPTION_ID}
+    AZURE_CLIENT_ID=${AZURE_CLIENT_ID}
+    AZURE_CLIENT_SECRET=${AZURE_CLIENT_SECRET}
+    AZURE_RESOURCE_GROUP=${AZURE_RESOURCE_GROUP}
+    ```
+  When using this method, the `cloud-credentials` secret should be mounted as a volume into the Velero deployment and daemon set, at the path `/credentials`. Additionally, the `$AZURE_CREDENTIALS_FILE` environment variable should be set to `/credentials/cloud` (the location of the file within the Velero pods). Note that `velero install` always uses this method of providing credentials for Azure.
+
+#### Image
+* The base container image has been switched to `debian:stretch-slim`
+
+#### Plugin Development
+* `BlockStore` plugins are now named `VolumeSnapshotter` plugins
+* Plugin APIs have moved to reduce the import surface:
+    * Plugin gRPC servers live in `github.com/heptio/velero/pkg/plugin/framework`
+    * Plugin interface types live in `github.com/heptio/velero/pkg/plugin/velero`
+* RestoreItemAction interface now takes the original item from the backup as a parameter
+* RestoreItemAction plugins can now return additional items to restore
+* RestoreItemAction plugins can now skip restoring an item
+* Plugins may now send stack traces with errors to the Velero server, so that the errors may be put into the server log
+* Plugins must now be "namespaced," using `example.domain.com/plugin-name` format
+    * For external ObjectStore and VolumeSnapshotter plugins. this name will also be the provider name in BackupStorageLoction and VolumeSnapshotLocation objects
+* `--log-level` flag is now passed to all plugins
+
+#### Validation
+* Configs for Azure, AWS, and GCP are now checked for invalid or extra keys, and the server is halted if any are found
+
+### All Changes
+* change container base images to debian:stretch-slim and upgrade to go 1.12 (#1365, @skriss)
+* Azure: allow credentials to be provided in a .env file (#1364, @skriss)
+* remove deprecated code in preparation for v1.0 release:
+    - remove ark.heptio.com API group
+    - remove support for reading ark-backup.json files from object storage
+    - remove Ark field from RestoreResult type
+    - remove support for "hook.backup.ark.heptio.com/..." annotations for specifying hooks
+    - remove support for $HOME/.config/ark/ client config directory
+    - remove support for restoring Azure snapshots using short snapshot ID formats in backup metadata
+    - stop applying "velero-restore" label to restored resources and remove it from the API pkg
+    - remove code that strips the "gc.ark.heptio.com" finalizer from backups
+    - remove support for "backup.ark.heptio.com/..." annotations for requesting restic backups
+    - remove "ark"-prefixed prometheus metrics
+    - remove VolumeBackups field and related code from Backup's status (#1323, @skriss)
+* Add velero install command for basic use cases. (#1287, @nrb)
+* Support non-namespaced names for built-in plugins (#1366, @nrb)
+* instantiate the plugin manager with the per-restore logger so plugin logs are captured in the per-restore log (#1358, @skriss)
+* Validate that there can't be any duplicate plugin name, and that the name format is `example.io/name`. (#1339, @carlisia)
+* Added ability to dynamically disable controllers (#1326, @amanw)
+* set default TTL for backups (#1352, @vorar)
+* aws/azure/gcp: fail fast if unsupported keys are provided in BackupStorageLocation/VolumeSnapshotLocation config (#1338, @skriss)
+* velero backup logs & velero restore logs: show helpful error message if backup/restore does not exist or is not finished processing (#1337, @skriss)
+* Add support for allowing a RestoreItemAction to skip item restore. (#1336, @sseago)
+* Improve error message around invalid S3 URLs, and gracefully handle trailing backslashes. (#1331, @skriss)
+* set backup's start timestamp before patching it to InProgress so start times display in `velero backup get` while in progress (#1330, @skriss)
+* rename BlockStore plugin to VolumeSnapshotter (#1321, @skriss)
+* Bump plugin ProtocolVersion to version 2 (#1319, @carlisia)
+* remove Warning field from restore item action output (#1318, @skriss)
+* Fix for #1312, use describe to determine if AWS EBS snapshot is encrypted and explicitly pass that value in EC2 CreateVolume call. (#1316, @mstump)
+* Allow restic restore helper image name to be optionally specified via ConfigMap (#1311, @skriss)
+* compile only once to lower the initialization cost for regexp.MustCompile. (#1306, @pei0804)
+* enable restore item actions to return additional related items to be restored; have pods return PVCs and PVCs return PVs (#1304, @skriss)
+* log error locations from plugin logger, and don't overwrite them in the client logger if they exist already (#1301, @skriss)
+* Send stack traces from plugin errors to Velero via gRPC so error location info can be logged (#1300, @skriss)
+* check for and exclude hostPath-based persistent volumes from restic backup (#1297, @skriss)
+* make resticrepositories non-restorable resources (#1296, @skriss)
+* gracefully handle failed API groups from the discovery API (#1293, @fabito)
+* Collect 3 new metrics: backup_deletion_{attempt|failure|success}_total (#1280, @fabito)
+* Pass --log-level flag to internal/external plugins, matching Velero server's log level (#1278, @skriss)
+* AWS EBS Volume IDs now contain AZ (#1274, @tsturzl)
+* add panic handlers to all server-side plugin methods (#1270, @skriss)
+* Move all the interfaces and associated types necessary to implement all of the Velero plugins to under the new package `pkg/plugin/velero`. (#1264, @carlisia)
+* Update velero restore to not open every single file open during extraction of the data (#1261, @asaf)
+* remove restore code that waits for a PV to become Available (#1254, @skriss)
+* Improve `describe` output:
+    * Move Phase to right under Metadata(name/namespace/label/annotations)
+    * Move Validation errors: section right after Phase: section and only show it if the item has a phase of FailedValidation
+    * For restores move Warnings and Errors under Validation errors. Leave their display as is. (#1248, @DheerajSShetty)
+* don't remove storageclass from a persistent volume when restoring it (#1246, @skriss)
+* Need to defer closing the the ReadCloser in ObjectStoreGRPCServer.GetObject (#1236, @DheerajSShetty)
+* update Kubernetes dependencies to match v1.12, and update Azure SDK to v19.0.0 (GA) (#1231, @skriss)
+* remove pkg/util/collections/map_utils.go, replace with structured API types and apimachinery's unstructured helpers (#1146, @skriss)
+* Add original resource (from backup) to restore item action interface (#1123, @mwieczorek)
+
+### Coming in Future Alpha/Beta Releases:
+- backup & restore phases will be modified to more clearly indicate successes, failures, and partial failures
+- additional safety checks to ensure backups are never overwritten in object storage
+- revised installation documentation that takes advantage of the `velero install` command
+- as many additional stability and UX issues as we can get to
--- a/changelogs/unreleased/.keep
+++ b/changelogs/unreleased/.keep
--- a/changelogs/unreleased/1123-mwieczorek
+++ b/changelogs/unreleased/1123-mwieczorek
@@ -0,0 +1 @@
+Add original resource (from backup) to restore item action interface
--- a/changelogs/unreleased/1146-skriss
+++ b/changelogs/unreleased/1146-skriss
@@ -0,0 +1 @@
+remove pkg/util/collections/map_utils.go, replace with structured API types and apimachinery's unstructured helpers
--- a/changelogs/unreleased/1231-skriss
+++ b/changelogs/unreleased/1231-skriss
@@ -0,0 +1 @@
+update Kubernetes dependencies to match v1.12, and update Azure SDK to v19.0.0 (GA)
--- a/changelogs/unreleased/1236-DheerajSShetty
+++ b/changelogs/unreleased/1236-DheerajSShetty
@@ -0,0 +1 @@
+Need to defer closing the the ReadCloser in ObjectStoreGRPCServer.GetObject
--- a/changelogs/unreleased/1246-skriss
+++ b/changelogs/unreleased/1246-skriss
@@ -0,0 +1 @@
+don't remove storageclass from a persistent volume when restoring it
--- a/changelogs/unreleased/1248-DheerajSShetty
+++ b/changelogs/unreleased/1248-DheerajSShetty
@@ -0,0 +1,6 @@
+Improve `describe` output
+   * Move Phase to right under Metadata(name/namespace/label/annotations)
+   * Move Validation errors: section right after Phase: section and only
+     show it if the item has a phase of FailedValidation
+   * For restores move Warnings and Errors under Validation errors. Leave
+     their display as is.
--- a/changelogs/unreleased/1254-skriss
+++ b/changelogs/unreleased/1254-skriss
@@ -0,0 +1 @@
+remove restore code that waits for a PV to become Available
--- a/changelogs/unreleased/1261-asaf-erlich
+++ b/changelogs/unreleased/1261-asaf-erlich
@@ -0,0 +1 @@
+Update velero restore to not open every single file open during extraction of the data
--- a/changelogs/unreleased/1264-carlisia
+++ b/changelogs/unreleased/1264-carlisia
@@ -0,0 +1 @@
+Move all the interfaces and associated types necessary to implement all of the Velero plugins to under the new package `velero`.
--- a/changelogs/unreleased/1270-skriss
+++ b/changelogs/unreleased/1270-skriss
@@ -0,0 +1 @@
+add panic handlers to all server-side plugin methods
--- a/changelogs/unreleased/1274-tsturzl
+++ b/changelogs/unreleased/1274-tsturzl
@@ -0,0 +1 @@
+AWS EBS Volume IDs now contain AZ
--- a/changelogs/unreleased/1278-skriss
+++ b/changelogs/unreleased/1278-skriss
@@ -0,0 +1 @@
+Pass --log-level flag to internal/external plugins, matching Velero server's log level
--- a/changelogs/unreleased/1280-fabito
+++ b/changelogs/unreleased/1280-fabito
@@ -0,0 +1 @@
+Collect 3 new metrics: backup_deletion_{attempt|failure|success}_total
--- a/changelogs/unreleased/1287-nrb
+++ b/changelogs/unreleased/1287-nrb
@@ -0,0 +1 @@
+Add velero install command for basic use cases.
--- a/changelogs/unreleased/1293-fabito
+++ b/changelogs/unreleased/1293-fabito
@@ -0,0 +1 @@
+gracefully handle failed API groups from the discovery API
--- a/changelogs/unreleased/1296-skriss
+++ b/changelogs/unreleased/1296-skriss
@@ -0,0 +1 @@
+make resticrepositories non-restorable resources
--- a/changelogs/unreleased/1297-skriss
+++ b/changelogs/unreleased/1297-skriss
@@ -0,0 +1 @@
+check for and exclude hostPath-based persistent volumes from restic backup
--- a/changelogs/unreleased/1300-skriss
+++ b/changelogs/unreleased/1300-skriss
@@ -0,0 +1 @@
+Send stack traces from plugin errors to Velero via gRPC so error location info can be logged
--- a/changelogs/unreleased/1301-skriss
+++ b/changelogs/unreleased/1301-skriss
@@ -0,0 +1 @@
+log error locations from plugin logger, and don't overwrite them in the client logger if they exist already
--- a/changelogs/unreleased/1304-skriss
+++ b/changelogs/unreleased/1304-skriss
@@ -0,0 +1 @@
+enable restore item actions to return additional related items to be restored; have pods return PVCs and PVCs return PVs
--- a/changelogs/unreleased/1306-pei0804
+++ b/changelogs/unreleased/1306-pei0804
@@ -0,0 +1 @@
+compile only once to lower the initialization cost for regexp.MustCompile.
--- a/changelogs/unreleased/1311-skriss
+++ b/changelogs/unreleased/1311-skriss
@@ -0,0 +1 @@
+Allow restic restore helper image name to be optionally specified via ConfigMap
--- a/changelogs/unreleased/1316-mstump
+++ b/changelogs/unreleased/1316-mstump
@@ -0,0 +1 @@
+Fix for #1312, use describe to determine if AWS EBS snapshot is encrypted and explicitly pass that value in EC2 CreateVolume call.
--- a/changelogs/unreleased/1318-skriss
+++ b/changelogs/unreleased/1318-skriss
@@ -0,0 +1 @@
+remove Warning field from restore item action output
--- a/changelogs/unreleased/1319-carlisia
+++ b/changelogs/unreleased/1319-carlisia
@@ -0,0 +1 @@
+Bump plugin ProtocolVersion to version 2
--- a/changelogs/unreleased/1321-skriss
+++ b/changelogs/unreleased/1321-skriss
@@ -0,0 +1 @@
+rename BlockStore plugin to VolumeSnapshotter
--- a/changelogs/unreleased/1323-skriss
+++ b/changelogs/unreleased/1323-skriss
@@ -0,0 +1,12 @@
+remove deprecated code in preparation for v1.0 release:
+    - remove ark.heptio.com API group
+    - remove support for reading ark-backup.json files from object storage
+    - remove Ark field from RestoreResult type
+    - remove support for "hook.backup.ark.heptio.com/..." annotations for specifying hooks
+    - remove support for $HOME/.config/ark/ client config directory
+    - remove support for restoring Azure snapshots using short snapshot ID formats in backup metadata
+    - stop applying "velero-restore" label to restored resources and remove it from the API pkg
+    - remove code that strips the "gc.ark.heptio.com" finalizer from backups
+    - remove support for "backup.ark.heptio.com/..." annotations for requesting restic backups
+    - remove "ark"-prefixed prometheus metrics
+    - remove VolumeBackups field and related code from Backup's status
--- a/changelogs/unreleased/1326-amanw
+++ b/changelogs/unreleased/1326-amanw
@@ -0,0 +1 @@
+Added ability to dynamically disable controllers
--- a/changelogs/unreleased/1330-skriss
+++ b/changelogs/unreleased/1330-skriss
@@ -0,0 +1 @@
+set backup's start timestamp before patching it to InProgress so start times display in `velero backup get` while in progress
--- a/changelogs/unreleased/1331-skriss
+++ b/changelogs/unreleased/1331-skriss
@@ -0,0 +1 @@
+Improve error message around invalid S3 URLs, and gracefully handle trailing backslashes.
--- a/changelogs/unreleased/1336-sseago
+++ b/changelogs/unreleased/1336-sseago
@@ -0,0 +1 @@
+Add support for allowing a RestoreItemAction to skip item restore.
--- a/changelogs/unreleased/1337-skriss
+++ b/changelogs/unreleased/1337-skriss
@@ -0,0 +1 @@
+velero backup logs & velero restore logs: show helpful error message if backup/restore does not exist or is not finished processing
--- a/changelogs/unreleased/1338-skriss
+++ b/changelogs/unreleased/1338-skriss
@@ -0,0 +1 @@
+aws/azure/gcp: fail fast if unsupported keys are provided in BackupStorageLocation/VolumeSnapshotLocation config
--- a/changelogs/unreleased/1339-carlisia
+++ b/changelogs/unreleased/1339-carlisia
@@ -0,0 +1 @@
+Validate that there can't be any duplicate plugin name, and that the name format is `example.io/name`.
--- a/changelogs/unreleased/1352-vorar
+++ b/changelogs/unreleased/1352-vorar
@@ -0,0 +1 @@
+set default TTL for backups
--- a/changelogs/unreleased/1353-fabito
+++ b/changelogs/unreleased/1353-fabito
@@ -0,0 +1 @@
+Add gauge metrics for number of existing backups and restores
--- a/changelogs/unreleased/1358-skriss
+++ b/changelogs/unreleased/1358-skriss
@@ -0,0 +1 @@
+instantiate the plugin manager with the per-restore logger so plugin logs are captured in the per-restore log
--- a/changelogs/unreleased/1364-skriss
+++ b/changelogs/unreleased/1364-skriss
@@ -0,0 +1,7 @@
+Azure: allow credentials to be provided in a .env file (path specified by $AZURE_CREDENTIALS_FILE), formatted like:
+    
+    AZURE_TENANT_ID=${AZURE_TENANT_ID}
+    AZURE_SUBSCRIPTION_ID=${AZURE_SUBSCRIPTION_ID}
+    AZURE_CLIENT_ID=${AZURE_CLIENT_ID}
+    AZURE_CLIENT_SECRET=${AZURE_CLIENT_SECRET}
+    AZURE_RESOURCE_GROUP=${AZURE_RESOURCE_GROUP}
--- a/changelogs/unreleased/1365-skriss
+++ b/changelogs/unreleased/1365-skriss
@@ -0,0 +1 @@
+change container base images to debian:stretch-slim and upgrade to go 1.12
--- a/changelogs/unreleased/1366-nrb
+++ b/changelogs/unreleased/1366-nrb
@@ -0,0 +1 @@
+Support non-namespaced names for built-in plugins
--- a/changelogs/unreleased/1367-skriss
+++ b/changelogs/unreleased/1367-skriss
@@ -0,0 +1 @@
+restic repo ensurer: return error if new repository does not become ready within a minute, and fix channel closing/deletion
--- a/changelogs/unreleased/1384-skriss
+++ b/changelogs/unreleased/1384-skriss
@@ -0,0 +1 @@
+remove deprecated "hooks" for backups (they've been replaced by "pre hooks")
--- a/changelogs/unreleased/1390-ncdc,carlisia
+++ b/changelogs/unreleased/1390-ncdc,carlisia
@@ -0,0 +1 @@
+Fail backup if it already exists in object storage.
--- a/cmd/velero-restic-restore-helper/main.go
+++ b/cmd/velero-restic-restore-helper/main.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 the Heptio Ark contributors.
+Copyright 2018 the Velero contributors.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ func main() {
 }

 // done returns true if for each directory under /restores, a file exists
-// within the .ark/ subdirectory whose name is equal to os.Args[1], or
+// within the .velero/ subdirectory whose name is equal to os.Args[1], or
 // false otherwise
 func done() bool {
 	children, err := ioutil.ReadDir("/restores")
@@ -60,7 +60,7 @@ func done() bool {
 			continue
 		}

-		doneFile := filepath.Join("/restores", child.Name(), ".ark", os.Args[1])
+		doneFile := filepath.Join("/restores", child.Name(), ".velero", os.Args[1])

 		if _, err := os.Stat(doneFile); os.IsNotExist(err) {
 			fmt.Printf("Not found: %s\n", doneFile)
--- a/cmd/velero/main.go
+++ b/cmd/velero/main.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 the Heptio Ark contributors.
+Copyright 2017 the Velero contributors.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ import (

 	"github.com/golang/glog"

-	"github.com/heptio/ark/pkg/cmd"
-	"github.com/heptio/ark/pkg/cmd/ark"
+	"github.com/heptio/velero/pkg/cmd"
+	"github.com/heptio/velero/pkg/cmd/velero"
 )

 func main() {
@@ -31,6 +31,6 @@ func main() {

 	baseName := filepath.Base(os.Args[0])

-	err := ark.NewCommand(baseName).Execute()
+	err := velero.NewCommand(baseName).Execute()
 	cmd.CheckError(err)
 }
--- a/docs/about.md
+++ b/docs/about.md
@@ -1,22 +1,12 @@
-# About Heptio Ark
+# How Velero Works

-Heptio Ark provides customizable degrees of recovery for all Kubernetes objects (Pods, Deployments, Jobs, Custom Resource Definitions, etc.), as well as for persistent volumes. This recovery can be cluster-wide, or fine-tuned according to object type, namespace, or labels.
+Each Velero operation -- on-demand backup, scheduled backup, restore -- is a custom resource, defined with a Kubernetes [Custom Resource Definition (CRD)][20] and stored in [etcd][22]. Velero also includes controllers that process the custom resources to perform backups, restores, and all related operations.

-Ark is ideal for the disaster recovery use case, as well as for snapshotting your application state, prior to performing system operations on your cluster (e.g. upgrades).
+You can back up or restore all objects in your cluster, or you can filter objects by type, namespace, and/or label.

-## Features
+Velero is ideal for the disaster recovery use case, as well as for snapshotting your application state, prior to performing system operations on your cluster (e.g. upgrades).

-Ark provides the following operations:
-
-* On-demand backups
-* Scheduled backups
-* Restores
-
-Each operation is a custom resource, defined with a Kubernetes [Custom Resource Definition (CRD)][20] and stored in [etcd][22]. An additional custom resource, Config, specifies required information and customized options, such as cloud provider settings. These resources are handled by [custom controllers][21] when their corresponding requests are submitted to the Kubernetes API server.
-
-Each controller watches its custom resource for API requests (Ark operations), performs validations, and handles the logic for interacting with the cloud provider API -- for example, managing object storage and persistent volumes.
-
-### On-demand backups
+## On-demand backups

 The **backup** operation:

@@ -29,27 +19,25 @@ need to tell a database to flush its in-memory buffers to disk before taking a s

 Note that cluster backups are not strictly atomic. If Kubernetes objects are being created or edited at the time of backup, they might not be included in the backup. The odds of capturing inconsistent information are low, but it is possible.

-### Scheduled backups
+## Scheduled backups

 The **schedule** operation allows you to back up your data at recurring intervals. The first backup is performed when the schedule is first created, and subsequent backups happen at the schedule's specified interval. These intervals are specified by a Cron expression.

-A Schedule acts as a wrapper for Backups; when triggered, it creates them behind the scenes.
-
 Scheduled backups are saved with the name `<SCHEDULE NAME>-<TIMESTAMP>`, where `<TIMESTAMP>` is formatted as *YYYYMMDDhhmmss*.

-### Restores
+## Restores

-The **restore** operation allows you to restore all of the objects and persistent volumes from a previously created Backup. Heptio Ark supports multiple namespace remapping--for example, in a single restore, objects in namespace "abc" can be recreated under namespace "def", and the ones in "123" under "456".
+The **restore** operation allows you to restore all of the objects and persistent volumes from a previously created backup. You can also restore only a filtered subset of objects and persistent volumes. Velero supports multiple namespace remapping--for example, in a single restore, objects in namespace "abc" can be recreated under namespace "def", and the objects in namespace "123" under "456".

-Kubernetes objects that have been restored can be identified with a label that looks like `ark-restore=<BACKUP NAME>-<TIMESTAMP>`, where `<TIMESTAMP>` is formatted as *YYYYMMDDhhmmss*.
+The default name of a restore is `<BACKUP NAME>-<TIMESTAMP>`, where `<TIMESTAMP>` is formatted as *YYYYMMDDhhmmss*. You can also specify a custom name. A restored object also includes a label with key `velero.io/restore-name` and value `<RESTORE NAME>`.

-You can also run the Ark server in restore-only mode, which disables backup, schedule, and garbage collection functionality during disaster recovery.
+You can also run the Velero server in restore-only mode, which disables backup, schedule, and garbage collection functionality during disaster recovery.

 ## Backup workflow

-Here's what happens when you run `ark backup create test-backup`:
+When you run `velero backup create test-backup`:

-1. The Ark client makes a call to the Kubernetes API server to create a `Backup` object.
+1. The Velero client makes a call to the Kubernetes API server to create a `Backup` object.

 1. The `BackupController` notices the new `Backup` object and performs validation.

@@ -57,24 +45,36 @@ Here's what happens when you run `ark backup create test-backup`:

 1. The `BackupController` makes a call to the object storage service -- for example, AWS S3 -- to upload the backup file.

-By default `ark backup create` makes disk snapshots of any persistent volumes. You can adjust the snapshots by specifying additional flags. See [the CLI help][30] for more information. Snapshots can be disabled with the option `--snapshot-volumes=false`.
+By default, `velero backup create` makes disk snapshots of any persistent volumes. You can adjust the snapshots by specifying additional flags. Run `velero backup create --help` to see available flags. Snapshots can be disabled with the option `--snapshot-volumes=false`.

 ![19]

+## Backed-up API versions
+
+Velero backs up resources using the Kubernetes API server's *preferred version* for each group/resource. When restoring a resource, this same API group/version must exist in the target cluster in order for the restore to be successful.
+
+For example, if the cluster being backed up has a `gizmos` resource in the `things` API group, with group/versions `things/v1alpha1`, `things/v1beta1`, and `things/v1`, and the server's preferred group/version is `things/v1`, then all `gizmos` will be backed up from the `things/v1` API endpoint. When backups from this cluster are restored, the target cluster **must** have the `things/v1` endpoint in order for `gizmos` to be restored. Note that `things/v1` **does not** need to be the preferred version in the target cluster; it just needs to exist.
+
 ## Set a backup to expire

-When you create a backup, you can specify a TTL by adding the flag `--ttl <DURATION>`. If Ark sees that an existing Backup resource is expired, it removes:
+When you create a backup, you can specify a TTL by adding the flag `--ttl <DURATION>`. If Velero sees that an existing backup resource is expired, it removes:

-* The Backup resource
+* The backup resource
 * The backup file from cloud object storage
 * All PersistentVolume snapshots
 * All associated Restores

 ## Object storage sync

-Heptio Ark treats object storage as the source of truth. It continuously checks to see that the correct Backup resources are always present. If there is a properly formatted backup file in the storage bucket, but no corresponding Backup resources in the Kubernetes API, Ark synchronizes the information from object storage to Kubernetes.
+Velero treats object storage as the source of truth. It continuously checks to see that the correct backup resources are always present. If there is a properly formatted backup file in the storage bucket, but no corresponding backup resource in the Kubernetes API, Velero synchronizes the information from object storage to Kubernetes.

-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.
+This allows restore functionality to work in a cluster migration scenario, where the original backup objects do not exist in the new cluster.
+
+Likewise, if a backup object exists in Kubernetes but not in object storage, it will be deleted from Kubernetes since the backup tarball no longer exists.
+
+[10]: hooks.md
+[19]: /docs/img/backup-process.png
+[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

-[19]: /img/backup-process.png
-[30]: https://github.com/heptio/ark/blob/master/docs/cli-reference/ark_create_backup.md
--- a/docs/api-types/README.md
+++ b/docs/api-types/README.md
@@ -2,6 +2,9 @@

 ## API types

+Here we list the API types that have some functionality that you can only configure via json/yaml vs the `velero` cli
+(hooks)
+
 * [Backup][1]

 [1]: backup.md
--- a/docs/api-types/backup.md
+++ b/docs/api-types/backup.md
@@ -2,12 +2,12 @@

 ## Use

-The `Backup` API type is used as a request for the Ark Server to perform a backup. Once created, the
-Ark Server immediately starts the backup process.
+The `Backup` API type is used as a request for the Velero Server to perform a backup. Once created, the
+Velero Server immediately starts the backup process.

 ## API GroupVersion

-Backup belongs to the API group version `ark.heptio.com/v1`.
+Backup belongs to the API group version `velero.io/v1`.

 ## Definition

@@ -15,15 +15,15 @@ Here is a sample `Backup` object with each of the fields documented:

 ```yaml
 # Standard Kubernetes API Version declaration. Required.
-apiVersion: ark.heptio.com/v1
+apiVersion: velero.io/v1
 # Standard Kubernetes Kind declaration. Required.
 kind: Backup
 # Standard Kubernetes metadata. Required.
 metadata:
  # Backup name. May be any valid Kubernetes object name. Required.
  name: a
-  # Backup namespace. Required. In version 0.7.0 and later, can be any string. Must be the namespace of the Ark server.
-  namespace: heptio-ark
+  # Backup namespace. Required. In version 0.7.0 and later, can be any string. Must be the namespace of the Velero server.
+  namespace: velero
 # Parameters about the backup. Required.
 spec:
  # Array of namespaces to include in the backup. If unspecified, all namespaces are included.
@@ -54,13 +54,21 @@ spec:
  # Individual objects must match this label selector to be included in the backup. Optional.
  labelSelector:
    matchLabels:
-      app: ark
+      app: velero
      component: server
  # Whether or not to snapshot volumes. This only applies to PersistentVolumes for Azure, GCE, and
-  # AWS. Valid values are true, false, and null/unset. If unset, Ark performs snapshots as long as
-  # a persistent volume provider is configured for Ark.
+  # AWS. Valid values are true, false, and null/unset. If unset, Velero performs snapshots as long as
+  # a persistent volume provider is configured for Velero.
  snapshotVolumes: null
-  # The amount of time before this backup is eligible for garbage collection.
+  # Where to store the tarball and logs.
+  storageLocation: aws-primary
+  # The list of locations in which to store volume snapshots created for this backup.
+  volumeSnapshotLocations:
+    - aws-primary
+    - gcp-primary
+  # The amount of time before this backup is eligible for garbage collection. If not specified, 
+  # a default value of 30 days will be used. The default can be configured on the velero server
+  # by passing the flag --default-backup-ttl. 
  ttl: 24h0m0s
  # Actions to perform at different times during a backup. The only hook currently supported is
  # executing a command in a container in a pod using the pod exec API. Optional.
@@ -86,13 +94,9 @@ spec:
        # This hook only applies to objects matching this label selector. Optional.
        labelSelector:
          matchLabels:
-            app: ark
+            app: velero
            component: server
        # An array of hooks to run before executing custom actions. Currently only "exec" hooks are supported.
-        # DEPRECATED. Use pre instead.
-        hooks:
-          # Same content as pre below.
-        # An array of hooks to run before executing custom actions. Currently only "exec" hooks are supported.
        pre:
          - 
            # The type of hook. This must be "exec".
--- a/docs/api-types/backupstoragelocation.md
+++ b/docs/api-types/backupstoragelocation.md
@@ -0,0 +1,73 @@
+# Velero Backup Storage Locations
+
+## Backup Storage Location
+
+Velero can store backups in a number of locations. These are represented in the cluster via the `BackupStorageLocation` CRD.
+
+Velero must have at least one `BackupStorageLocation`. By default, this is expected to be named `default`, however the name can be changed by specifying `--default-backup-storage-location` on `velero server`.  Backups that do not explicitly specify a storage location will be saved to this `BackupStorageLocation`.
+
+> *NOTE*: `BackupStorageLocation` takes the place of the `Config.backupStorageProvider` key as of v0.10.0
+
+A sample YAML `BackupStorageLocation` looks like the following:
+
+```yaml
+apiVersion: velero.io/v1
+kind: BackupStorageLocation
+metadata:
+  name: default
+  namespace: velero
+spec:
+  provider: aws
+  objectStorage:
+    bucket: myBucket
+  config:
+    region: us-west-2
+```
+
+### Parameter Reference
+
+The configurable parameters are as follows:
+
+#### Main config parameters
+
+| Key | Type | Default | Meaning |
+| --- | --- | --- | --- |
+| `provider` | String (Velero natively supports `aws`, `gcp`, and `azure`. Other providers may be available via external plugins.)| Required Field | The name for whichever cloud provider will be used to actually store the backups. |
+| `objectStorage` | ObjectStorageLocation | Specification of the object storage for the given provider. |
+| `objectStorage/bucket` | String | Required Field | The storage bucket where backups are to be uploaded. |
+| `objectStorage/prefix` | String | Optional Field | The directory inside a storage bucket where backups are to be uploaded. |
+| `config` | map[string]string<br><br>(See the corresponding [AWS][0], [GCP][1], and [Azure][2]-specific configs or your provider's documentation.) | None (Optional) | Configuration keys/values to be passed to the cloud provider for backup storage. |
+
+#### AWS
+
+**(Or other S3-compatible storage)**
+
+##### config
+
+| Key | Type | Default | Meaning |
+| --- | --- | --- | --- |
+| `region` | string | Empty | *Example*: "us-east-1"<br><br>See [AWS documentation][3] for the full list.<br><br>Queried from the AWS S3 API if not provided. |
+| `s3ForcePathStyle` | bool | `false` | Set this to `true` if you are using a local storage service like Minio. |
+| `s3Url` | string | Required field for non-AWS-hosted storage| *Example*: http://minio:9000<br><br>You can specify the AWS S3 URL here for explicitness, but Velero can already generate it from `region`, and `bucket`. This field is primarily for local storage services like Minio.|
+| `publicUrl` | string | Empty | *Example*: https://minio.mycluster.com<br><br>If specified, use this instead of `s3Url` when generating download URLs (e.g., for logs). This field is primarily for local storage services like Minio.|
+| `kmsKeyId` | string | Empty | *Example*: "502b409c-4da1-419f-a16e-eif453b3i49f" or "alias/`<KMS-Key-Alias-Name>`"<br><br>Specify an [AWS KMS key][10] id or alias to enable encryption of the backups stored in S3. Only works with AWS S3 and may require explicitly granting key usage rights.|
+| `signatureVersion` | string | `"4"` | Version of the signature algorithm used to create signed URLs that are used by velero cli to download backups or fetch logs. Possible versions are "1" and "4". Usually the default version 4 is correct, but some S3-compatible providers like Quobyte only support version 1.|
+
+#### Azure
+
+##### config
+
+| Key | Type | Default | Meaning |
+| --- | --- | --- | --- |
+| `resourceGroup` | string | Required Field | Name of the resource group containing the storage account for this backup storage location. |
+| `storageAccount` | string | Required Field | Name of the storage account for this backup storage location. |
+
+#### GCP
+
+No parameters required.
+
+[0]: #aws
+[1]: #gcp
+[2]: #azure
+[3]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html#concepts-available-regions
+[10]: http://docs.aws.amazon.com/kms/latest/developerguide/overview.html
--- a/docs/api-types/volumesnapshotlocation.md
+++ b/docs/api-types/volumesnapshotlocation.md
@@ -0,0 +1,66 @@
+# Velero Volume Snapshot Location
+
+## Volume Snapshot Location
+
+A volume snapshot location is the location in which to store the volume snapshots created for a backup.
+
+Velero can be configured to take snapshots of volumes from multiple providers. Velero also allows you to configure multiple possible `VolumeSnapshotLocation` per provider, although you can only select one location per provider at backup time.
+
+Each VolumeSnapshotLocation describes a provider + location. These are represented in the cluster via the `VolumeSnapshotLocation` CRD. Velero must have at least one `VolumeSnapshotLocation` per cloud provider.
+
+A sample YAML `VolumeSnapshotLocation` looks like the following:
+
+```yaml
+apiVersion: velero.io/v1
+kind: VolumeSnapshotLocation
+metadata:
+  name: aws-default
+  namespace: velero
+spec:
+  provider: aws
+  config:
+    region: us-west-2
+```
+
+### Parameter Reference
+
+The configurable parameters are as follows:
+
+#### Main config parameters
+
+| Key | Type | Default | Meaning |
+| --- | --- | --- | --- |
+| `provider` | String (Velero natively supports `aws`, `gcp`, and `azure`. Other providers may be available via external plugins.)| Required Field | The name for whichever cloud provider will be used to actually store the volume. |
+| `config` | See the corresponding [AWS][0], [GCP][1], and [Azure][2]-specific configs or your provider's documentation.
+
+#### AWS
+
+##### config
+
+| Key | Type | Default | Meaning |
+| --- | --- | --- | --- |
+| `region` | string | Empty | *Example*: "us-east-1"<br><br>See [AWS documentation][3] for the full list.<br><br>Queried from the AWS S3 API if not provided. |
+
+#### Azure
+
+##### config
+
+| Key | Type | Default | Meaning |
+| --- | --- | --- | --- |
+| `apiTimeout` | metav1.Duration | 2m0s | How long to wait for an Azure API request to complete before timeout. |
+| `resourceGroup` | string | Optional | The name of the resource group where volume snapshots should be stored, if different from the cluster's resource group. |
+
+#### GCP
+
+##### config
+
+| Key | Type | Default | Meaning |
+| --- | --- | --- | --- |
+| `snapshotLocation` | string | Empty | *Example*: "us-central1"<br><br>See [GCP documentation][4] for the full list.<br><br>If not specified the snapshots are stored in the [default location][5]. |
+
+[0]: #aws
+[1]: #gcp
+[2]: #azure
+[3]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html#concepts-available-regions
+[4]: https://cloud.google.com/storage/docs/locations#available_locations
+[5]: https://cloud.google.com/compute/docs/disks/create-snapshots#default_location
--- a/docs/aws-config.md
+++ b/docs/aws-config.md
@@ -1,29 +1,47 @@
-# Run Ark on AWS
+# Run Velero on AWS

-To set up Ark on AWS, you:
+To set up Velero on AWS, you:

+* Download an official release of Velero
 * Create your S3 bucket
-* Create an AWS IAM user for Ark
-* Configure the server
-* Create a Secret for your credentials
+* Create an AWS IAM user for Velero
+* Install the server

 If you do not have the `aws` CLI locally installed, follow the [user guide][5] to set it up.

+## Download Velero
+
+1. Download the [latest official release's](https://github.com/heptio/velero/releases) tarball for your client platform.
+
+    _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. The code in the master branch
+of the Velero repository is under active development and is not guaranteed to be stable!_
+
+1. Extract the tarball:
+    ```bash
+    tar -xvf <RELEASE-TARBALL-NAME>.tar.gz -C /dir/to/extract/to 
+    ```
+    We'll refer to the directory you extracted to as the "Velero directory" in subsequent steps.
+
+1. Move the `velero` binary from the Velero directory to somewhere in your PATH.
+
 ## Create S3 bucket

-Heptio Ark requires an object storage bucket to store backups in. Create an S3 bucket, replacing placeholders appropriately:
+Velero requires an object storage bucket to store backups in, preferrably unique to a single Kubernetes cluster (see the [FAQ][20] for more details). Create an S3 bucket, replacing placeholders appropriately:

 ```bash
+BUCKET=<YOUR_BUCKET>
+REGION=<YOUR_REGION>
 aws s3api create-bucket \
-    --bucket <YOUR_BUCKET> \
-    --region <YOUR_REGION> \
-    --create-bucket-configuration LocationConstraint=<YOUR_REGION>
+    --bucket $BUCKET \
+    --region $REGION \
+    --create-bucket-configuration LocationConstraint=$REGION
 ```
 NOTE: us-east-1 does not support a `LocationConstraint`.  If your region is `us-east-1`, omit the bucket configuration:

 ```bash
 aws s3api create-bucket \
-    --bucket <YOUR_BUCKET> \
+    --bucket $BUCKET \
    --region us-east-1
 ```

@@ -34,14 +52,15 @@ For more information, see [the AWS documentation on IAM users][14].
 1. Create the IAM user:

    ```bash
-    aws iam create-user --user-name heptio-ark
+    aws iam create-user --user-name velero
    ```
+    
+    > If you'll be using Velero to backup multiple clusters with multiple S3 buckets, it may be desirable to create a unique username per cluster rather than the default `velero`.

-2. Attach policies to give `heptio-ark` the necessary permissions:
+2. Attach policies to give `velero` the necessary permissions:

    ```bash
-    BUCKET=<YOUR_BUCKET>
-    cat > heptio-ark-policy.json <<EOF
+    cat > velero-policy.json <<EOF
    {
        "Version": "2012-10-17",
        "Statement": [
@@ -84,15 +103,15 @@ For more information, see [the AWS documentation on IAM users][14].
    EOF

    aws iam put-user-policy \
-      --user-name heptio-ark \
-      --policy-name heptio-ark \
-      --policy-document file://heptio-ark-policy.json
+      --user-name velero \
+      --policy-name velero \
+      --policy-document file://velero-policy.json
    ```

 3. Create an access key for the user:

    ```bash
-    aws iam create-access-key --user-name heptio-ark
+    aws iam create-access-key --user-name velero
    ```

    The result should look like:
@@ -100,7 +119,7 @@ For more information, see [the AWS documentation on IAM users][14].
    ```json
     {
        "AccessKey": {
-              "UserName": "heptio-ark",
+              "UserName": "velero",
              "Status": "Active",
              "CreateDate": "2017-07-31T22:24:41.576Z",
              "SecretAccessKey": <AWS_SECRET_ACCESS_KEY>,
@@ -109,7 +128,7 @@ For more information, see [the AWS documentation on IAM users][14].
     }
    ```

-4. Create an Ark-specific credentials file (`credentials-ark`) in your local directory:
+4. Create a Velero-specific credentials file (`credentials-velero`) in your local directory:

    ```
    [default]
@@ -119,53 +138,65 @@ For more information, see [the AWS documentation on IAM users][14].

    where the access key id and secret are the values returned from the `create-access-key` request.

-## Credentials and configuration

-In the Ark root directory, run the following to first set up namespaces, RBAC, and other scaffolding. To run in a custom namespace, make sure that you have edited the YAML files to specify the namespace. See [Run in custom namespace][0].
+## Install and start Velero
+
+Install Velero, including all prerequisites, into the cluster and start the deployment. This will create a namespace called `velero`, and place a deployment named `velero` in it.

 ```bash
-kubectl apply -f examples/common/00-prereqs.yaml
+velero install \
+    --provider aws \
+    --bucket $BUCKET \
+    --secret-file ./credentials-velero
+    --backup-location-config region=$REGION \
+    --snapshot-location-config region=$REGION \
+    --secret-file ./credentials-velero
 ```

-Create a Secret. In the directory of the credentials file you just created, run:
+Additionally, you can specify `--use-restic` to enable restic support, and `--wait` to wait for the deployment to be ready.

-```bash
-kubectl create secret generic cloud-credentials \
-    --namespace <ARK_NAMESPACE> \
-    --from-file cloud=credentials-ark
-```
+For more complex installation needs, use either the Helm chart, or add `--dry-run -o yaml` options for generating the YAML representation for the installation.

-Specify the following values in the example files:

-* In `examples/aws/00-ark-config.yaml`:
+## Setting AWS_CLUSTER_NAME (Optional)

-  * Replace `<YOUR_BUCKET>` and `<YOUR_REGION>` (for S3, region is optional and will be queried from the AWS S3 API if not provided). See the [Config definition][6] for details.
+* If you have multiple clusters and you want to support migration of resources between them, you can use `kubectl edit deploy/velero -n velero` to edit your deployment:

-* (Optional) If you run the nginx example, in file `examples/nginx-app/with-pv.yaml`:
+    * Add the environment variable `AWS_CLUSTER_NAME` under `spec.template.spec.env`, with the current cluster's name. When restoring backup, it will make Velero (and cluster it's running on) claim ownership of AWS volumes created from snapshots taken on different cluster.
+    The best way to get the current cluster's name is to either check it with used deployment tool or to read it directly from the EC2 instances tags. 
+    
+      The following listing shows how to get the cluster's nodes EC2 Tags. First, get the nodes external IDs (EC2 IDs):

-    * Replace `<YOUR_STORAGE_CLASS_NAME>` with `gp2`. This is AWS's default `StorageClass` name.
+        ```bash
+        kubectl get nodes -o jsonpath='{.items[*].spec.externalID}'
+        ```
+    
+      Copy one of the returned IDs `<ID>` and use it with the `aws` CLI tool to search for one of the following:

-## Start the server
+      * The `kubernetes.io/cluster/<AWS_CLUSTER_NAME>` tag of the value `owned`. The `<AWS_CLUSTER_NAME>` is then your cluster's name:

-In the root of your Ark directory, run:
+          ```bash
+          aws ec2 describe-tags --filters "Name=resource-id,Values=<ID>" "Name=value,Values=owned"
+          ```
+    
+      * If the first output returns nothing, then check for the legacy Tag `KubernetesCluster` of the value `<AWS_CLUSTER_NAME>`:

-  ```bash
-  kubectl apply -f examples/aws/00-ark-config.yaml
-  kubectl apply -f examples/aws/10-deployment.yaml
-  ```
+          ```bash
+          aws ec2 describe-tags --filters "Name=resource-id,Values=<ID>" "Name=key,Values=KubernetesCluster"
+        ```

 ## ALTERNATIVE: Setup permissions using kube2iam

 [Kube2iam](https://github.com/jtblin/kube2iam) is a Kubernetes application that allows managing AWS IAM permissions for pod via annotations rather than operating on API keys.

-> This path assumes you have `kube2iam` already running in your Kubernetes cluster. If that is not the case, please install it first, following the docs here: https://github.com/jtblin/kube2iam
+> This path assumes you have `kube2iam` already running in your Kubernetes cluster. If that is not the case, please install it first, following the docs here: [https://github.com/jtblin/kube2iam](https://github.com/jtblin/kube2iam)

-It can be set up for Ark by creating a role that will have required permissions, and later by adding the permissions annotation on the ark deployment to define which role it should use internally.
+It can be set up for Velero by creating a role that will have required permissions, and later by adding the permissions annotation on the velero deployment to define which role it should use internally.

 1. Create a Trust Policy document to allow the role being used for EC2 management & assume kube2iam role:

    ```bash
-    cat > heptio-ark-trust-policy.json <<EOF
+    cat > velero-trust-policy.json <<EOF
    {
        "Version": "2012-10-17",
        "Statement": [
@@ -191,14 +222,14 @@ It can be set up for Ark by creating a role that will have required permissions,
 2. Create the IAM role:

    ```bash
-    aws iam create-role --role-name heptio-ark --assume-role-policy-document file://./heptio-ark-trust-policy.json
+    aws iam create-role --role-name velero --assume-role-policy-document file://./velero-trust-policy.json
    ```

-3. Attach policies to give `heptio-ark` the necessary permissions:
+3. Attach policies to give `velero` the necessary permissions:

    ```bash
    BUCKET=<YOUR_BUCKET>
-    cat > heptio-ark-policy.json <<EOF
+    cat > velero-policy.json <<EOF
    {
        "Version": "2012-10-17",
        "Statement": [
@@ -241,33 +272,39 @@ It can be set up for Ark by creating a role that will have required permissions,
    EOF

    aws iam put-role-policy \
-      --role-name heptio-ark \
-      --policy-name heptio-ark-policy \
-      --policy-document file://./heptio-ark-policy.json
+      --role-name velero \
+      --policy-name velero-policy \
+      --policy-document file://./velero-policy.json
    ```
-4. Update AWS_ACCOUNT_ID & HEPTIO_ARK_ROLE_NAME in the file `examples/aws/10-deployment-kube2iam.yaml`:
+4. Update `AWS_ACCOUNT_ID` & `VELERO_ROLE_NAME` with `kubectl edit deploy/velero -n velero` and add the following annotation:

    ```
    ---
    apiVersion: apps/v1beta1
    kind: Deployment
    metadata:
-        namespace: heptio-ark
-        name: ark
+        namespace: velero
+        name: velero
    spec:
        replicas: 1
        template:
            metadata:
                labels:
-                    component: ark
+                    component: velero
                annotations:
-                    iam.amazonaws.com/role: arn:aws:iam::<AWS_ACCOUNT_ID>:role/heptio-ark
+                    iam.amazonaws.com/role: arn:aws:iam::<AWS_ACCOUNT_ID>:role/<VELERO_ROLE_NAME>
    ...
    ```

-5. Run Ark deployment using the file `examples/aws/10-deployment-kube2iam.yaml`.
+## Installing the nginx example (optional)
+
+If you run the nginx example, in file `config/nginx-app/with-pv.yaml`:
+
+    * Replace `<YOUR_STORAGE_CLASS_NAME>` with `gp2`. This is AWS's default `StorageClass` name.

 [0]: namespace.md
 [5]: https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-welcome.html
-[6]: config-definition.md#aws
+[6]: api-types/volumesnapshotlocation.md#aws
 [14]: http://docs.aws.amazon.com/IAM/latest/UserGuide/introduction.html
+[20]: faq.md
+[21]: api-types/backupstoragelocation.md#aws
--- a/docs/azure-config.md
+++ b/docs/azure-config.md
@@ -1,11 +1,11 @@
-# Run Ark on Azure
+# Run Velero on Azure

-To configure Ark on Azure, you:
+To configure Velero on Azure, you:

+* Download an official release of Velero
 * Create your Azure storage account and blob container
-* Create Azure service principal for Ark
-* Configure the server
-* Create a Secret for your credentials
+* Create Azure service principal for Velero
+* Install the server

 If you do not have the `az` Azure CLI 2.0 installed locally, follow the [install guide][18] to set it up. 

@@ -20,13 +20,29 @@ az login
 Ensure that the VMs for your agent pool allow Managed Disks. If I/O performance is critical,
 consider using Premium Managed Disks, which are SSD backed.

+## Download Velero
+
+1. Download the [latest official release's](https://github.com/heptio/velero/releases) tarball for your client platform.
+
+    _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. The code in the master branch
+of the Velero repository is under active development and is not guaranteed to be stable!_
+
+1. Extract the tarball:
+    ```bash
+    tar -xvf <RELEASE-TARBALL-NAME>.tar.gz -C /dir/to/extract/to 
+    ```
+    We'll refer to the directory you extracted to as the "Velero directory" in subsequent steps.
+
+1. Move the `velero` binary from the Velero directory to somewhere in your PATH.
+
 ## Create Azure storage account and blob container

-Heptio Ark requires a storage account and blob container in which to store backups.
+Velero requires a storage account and blob container in which to store backups.

 The storage account can be created in the same Resource Group as your Kubernetes cluster or
 separated into its own Resource Group. The example below shows the storage account created in a
-separate `Ark_Backups` Resource Group.
+separate `Velero_Backups` Resource Group.

 The storage account needs to be created with a globally unique id since this is used for dns. In
 the sample script below, we're generating a random name using `uuidgen`, but you can come up with 
@@ -36,11 +52,11 @@ configured to only allow access via https.

 ```bash
 # Create a resource group for the backups storage account. Change the location as needed.
-AZURE_BACKUP_RESOURCE_GROUP=Ark_Backups
+AZURE_BACKUP_RESOURCE_GROUP=Velero_Backups
 az group create -n $AZURE_BACKUP_RESOURCE_GROUP --location WestUS

 # Create the storage account
-AZURE_STORAGE_ACCOUNT_ID="ark$(uuidgen | cut -d '-' -f5 | tr '[A-Z]' '[a-z]')"
+AZURE_STORAGE_ACCOUNT_ID="velero$(uuidgen | cut -d '-' -f5 | tr '[A-Z]' '[a-z]')"
 az storage account create \
    --name $AZURE_STORAGE_ACCOUNT_ID \
    --resource-group $AZURE_BACKUP_RESOURCE_GROUP \
@@ -49,39 +65,26 @@ az storage account create \
    --https-only true \
    --kind BlobStorage \
    --access-tier Hot
-
-# Create the blob container named "ark". Feel free to use a different name; you'll need to
-# adjust the `bucket` field under `backupStorageProvider` in the Ark Config accordingly if you do.
-az storage container create -n ark --public-access off --account-name $AZURE_STORAGE_ACCOUNT_ID
-
-# Obtain the storage access key for the storage account just created
-AZURE_STORAGE_KEY=`az storage account keys list \
-    --account-name $AZURE_STORAGE_ACCOUNT_ID \
-    --resource-group $AZURE_BACKUP_RESOURCE_GROUP \
-    --query '[0].value' \
-    -o tsv`
 ```

-## Create service principal
+Create the blob container named `velero`. Feel free to use a different name, preferably unique to a single Kubernetes cluster. See the [FAQ][20] for more details.

-To integrate Ark with Azure, you must create an Ark-specific [service principal][17]. Note that seven environment variables must be set for Ark to work properly.
+```bash
+BLOB_CONTAINER=velero
+az storage container create -n $BLOB_CONTAINER --public-access off --account-name $AZURE_STORAGE_ACCOUNT_ID
+```

-1. Obtain your Azure Account Subscription ID and Tenant ID:
+## Get resource group for persistent volume snapshots
+
+1. Set the name of the Resource Group that contains your Kubernetes cluster's virtual machines/disks.
+
+    > **WARNING**: If you're using [AKS][22], `AZURE_RESOURCE_GROUP` must be set to the name of the auto-generated resource group that is created 
+    when you provision your cluster in Azure, since this is the resource group that contains your cluster's virtual machines/disks.

    ```bash
-    AZURE_SUBSCRIPTION_ID=`az account list --query '[?isDefault].id' -o tsv`
-    AZURE_TENANT_ID=`az account list --query '[?isDefault].tenantId' -o tsv`
+    AZURE_RESOURCE_GROUP=<NAME_OF_RESOURCE_GROUP>
    ```

-1. Set the name of the Resource Group that contains your Kubernetes cluster.
-
-    ```bash
-    # Make sure this is the name of the second resource group. See warning.
-    AZURE_RESOURCE_GROUP=<NAME_OF_RESOURCE_GROUP_2>
-    ```
-
-    WARNING: `AZURE_RESOURCE_GROUP` must be set to the name of the second resource group that is created when you provision your cluster in Azure. Your cluster is provisioned in the resource group that you specified when you created the cluster. Your disks, however, are provisioned in the second resource group.
-
    If you are unsure of the Resource Group name, run the following command to get a list that you can select from. Then set the `AZURE_RESOURCE_GROUP` environment variable to the appropriate value.

    ```bash
@@ -90,79 +93,73 @@ To integrate Ark with Azure, you must create an Ark-specific [service principal]

    Get your cluster's Resource Group name from the `ResourceGroup` value in the response, and use it to set `$AZURE_RESOURCE_GROUP`.

+## Create service principal
+
+To integrate Velero with Azure, you must create an Velero-specific [service principal][17].
+
+1. Obtain your Azure Account Subscription ID and Tenant ID:
+
+    ```bash
+    AZURE_SUBSCRIPTION_ID=`az account list --query '[?isDefault].id' -o tsv`
+    AZURE_TENANT_ID=`az account list --query '[?isDefault].tenantId' -o tsv`
+    ```
+
 1. Create a service principal with `Contributor` role. This will have subscription-wide access, so protect this credential. You can specify a password or let the `az ad sp create-for-rbac` command create one for you.

+    > If you'll be using Velero to backup multiple clusters with multiple blob containers, it may be desirable to create a unique username per cluster rather than the default `velero`.
+
    ```bash
    # Create service principal and specify your own password
    AZURE_CLIENT_SECRET=super_secret_and_high_entropy_password_replace_me_with_your_own
-    az ad sp create-for-rbac --name "heptio-ark" --role "Contributor" --password $AZURE_CLIENT_SECRET
+    az ad sp create-for-rbac --name "velero" --role "Contributor" --password $AZURE_CLIENT_SECRET

    # Or create service principal and let the CLI generate a password for you. Make sure to capture the password.
-    AZURE_CLIENT_SECRET=`az ad sp create-for-rbac --name "heptio-ark" --role "Contributor" --query 'password' -o tsv`
+    AZURE_CLIENT_SECRET=`az ad sp create-for-rbac --name "velero" --role "Contributor" --query 'password' -o tsv`

    # After creating the service principal, obtain the client id
-    AZURE_CLIENT_ID=`az ad sp list --display-name "heptio-ark" --query '[0].appId' -o tsv`
+    AZURE_CLIENT_ID=`az ad sp list --display-name "velero" --query '[0].appId' -o tsv`
    ```

-## Credentials and configuration
-
-In the Ark root directory, run the following to first set up namespaces, RBAC, and other scaffolding. To run in a custom namespace, make sure that you have edited the YAML file to specify the namespace. See [Run in custom namespace][0].
+Now you need to create a file that contains all the environment variables you just set. The command looks like the following:

 ```bash
-kubectl apply -f examples/common/00-prereqs.yaml
+cat << EOF  > ./credentials-velero
+AZURE_SUBSCRIPTION_ID=${AZURE_SUBSCRIPTION_ID}
+AZURE_TENANT_ID=${AZURE_TENANT_ID}
+AZURE_CLIENT_ID=${AZURE_CLIENT_ID}
+AZURE_CLIENT_SECRET=${AZURE_CLIENT_SECRET}
+AZURE_RESOURCE_GROUP=${AZURE_RESOURCE_GROUP}
+EOF
 ```

-Now you need to create a Secret that contains all the seven environment variables you just set. The command looks like the following:
+## Install and start Velero
+
+Install Velero, including all prerequisites, into the cluster and start the deployment. This will create a namespace called `velero`, and place a deployment named `velero` in it.

 ```bash
-kubectl create secret generic cloud-credentials \
-    --namespace <ARK_NAMESPACE> \
-    --from-literal AZURE_SUBSCRIPTION_ID=${AZURE_SUBSCRIPTION_ID} \
-    --from-literal AZURE_TENANT_ID=${AZURE_TENANT_ID} \
-    --from-literal AZURE_RESOURCE_GROUP=${AZURE_RESOURCE_GROUP} \
-    --from-literal AZURE_CLIENT_ID=${AZURE_CLIENT_ID} \
-    --from-literal AZURE_CLIENT_SECRET=${AZURE_CLIENT_SECRET} \
-    --from-literal AZURE_STORAGE_ACCOUNT_ID=${AZURE_STORAGE_ACCOUNT_ID} \
-    --from-literal AZURE_STORAGE_KEY=${AZURE_STORAGE_KEY}
+velero install \
+    --provider azure \
+    --bucket $BLOB_CONTAINER \
+    --secret-file ./credentials-velero \
+    --backup-location-config resourceGroup=$AZURE_BACKUP_RESOURCE_GROUP,storageAccount=$AZURE_STORAGE_ACCOUNT_ID \
+    --snapshot-location-config apiTimeout=<YOUR_TIMEOUT>
 ```

-Now that you have your Azure credentials stored in a Secret, you need to replace some placeholder values in the template files. Specifically, you need to change the following:
+Additionally, you can specify `--use-restic` to enable restic support, and `--wait` to wait for the deployment to be ready.

-* In file `examples/azure/10-ark-config.yaml`:
+For more complex installation needs, use either the Helm chart, or add `--dry-run -o yaml` options for generating the YAML representation for the installation.

-  * Replace `<YOUR_BUCKET>` and `<YOUR_TIMEOUT>`. See the [Config definition][8] for details.
+## Installing the nginx example (optional)

-Here is an example of a completed file.
+If you run the nginx example, in file `config/nginx-app/with-pv.yaml`:

-```yaml
-apiVersion: ark.heptio.com/v1
-kind: Config
-metadata:
-  namespace: heptio-ark
-  name: default
-persistentVolumeProvider:
-  name: azure
-  config:
-    apiTimeout: 15m
-backupStorageProvider:
-  name: azure
-  bucket: ark
-backupSyncPeriod: 30m
-gcSyncPeriod: 30m
-scheduleSyncPeriod: 1m
-restoreOnlyMode: false
-```
+    * Replace `<YOUR_STORAGE_CLASS_NAME>` with `default`. This is Azure's default `StorageClass` name.

-## Start the server
-
-In the root of your Ark directory, run:
-
-  ```bash
-  kubectl apply -f examples/azure/
-  ```
-
-  [0]: namespace.md
-  [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
+[0]: namespace.md
+[8]: api-types/volumesnapshotlocation.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
+[20]: faq.md
+[21]: api-types/backupstoragelocation.md#azure
+[22]: https://azure.microsoft.com/en-us/services/kubernetes-service/
--- a/docs/build-from-scratch.md
+++ b/docs/build-from-scratch.md
@@ -1,7 +1,7 @@
 # Build from source

 * [Prerequisites][1]
-* [Download][2]
+* [Getting the source][2]
 * [Build][3]
 * [Test][12]
 * [Run][7]
@@ -9,26 +9,37 @@

 ## Prerequisites

-* Access to a Kubernetes cluster, version 1.7 or later. Version 1.7.5 or later is required to run `ark backup delete`.
+* Access to a Kubernetes cluster, version 1.7 or later. Version 1.7.5 or later is required to run `velero backup delete`.
 * A DNS server on the cluster
 * `kubectl` installed
 * [Go][5] installed (minimum version 1.8)

-## Download
+## Getting the source

-Install with go:
+### Option 1) Get latest (recommended)
+
+```bash
+mkdir $HOME/go
+export GOPATH=$HOME/go
+go get github.com/heptio/velero
 ```
-go get github.com/heptio/ark
-```
-The files are installed in `$GOPATH/src/github.com/heptio/ark`.
+
+Where `go` is your [import path][4] for Go.
+
+For Go development, it is recommended to add the Go import path (`$HOME/go` in this example) to your path.
+
+### Option 2) Release archive
+Download the archive named `Source code` from the [release page][22] and extract it in your Go import path as `src/github.com/heptio/velero`.
+
+Note that the Makefile targets assume building from a git repository. When building from an archive, you will be limited to the `go build` commands described below.

 ## Build

-You can build your Ark image locally on the machine where you run your cluster, or you can push it to a private registry. This section covers both workflows.
+You can build your Velero image locally on the machine where you run your cluster, or you can push it to a private registry. This section covers both workflows.

-Set the `$REGISTRY` environment variable (used in the `Makefile`) to push the Heptio Ark images to your own registry. This allows any node in your cluster to pull your locally built image.
+Set the `$REGISTRY` environment variable (used in the `Makefile`) to push the Velero images to your own registry. This allows any node in your cluster to pull your locally built image.

-In the Ark root directory, to build your container with the tag `$REGISTRY/ark:$VERSION`, run:
+In the Velero root directory, to build your container with the tag `$REGISTRY/velero:$VERSION`, run:

 ```
 make container
@@ -36,6 +47,11 @@ make container

 To push your image to a registry, use `make push`.

+To build only the `velero` binary, run:
+```
+go build ./cmd/velero
+```
+
 ### Update generated files

 The following files are automatically generated from the source code:
@@ -46,25 +62,25 @@ The following files are automatically generated from the source code:
 * Documentation
 * Protobuf/gRPC types

-If you make any of the following changes, you must run `make update` to regenerate
-the files:
+Run `make update` to regenerate files if you make the following changes:

 * Add/edit/remove command line flags and/or their help text
 * Add/edit/remove commands or subcommands
 * Add new API types

-If you make the following change, you must run [generate-proto.sh][13] to regenerate files:
+Run [generate-proto.sh][13] to regenerate files if you make the following changes:

-* Add/edit/remove protobuf message or service definitions. These changes require the [proto compiler][14]. 
+* Add/edit/remove protobuf message or service definitions. These changes require the [proto compiler][14] and compiler plugin `protoc-gen-go` version v1.0.0. 

 ### Cross compiling

-By default, `make` builds an `ark` binary that runs on your host operating system and architecture. 
-To build for another platform, run `make build-<GOOS>-<GOARCH`.
+By default, `make build` builds an `velero` binary for `linux-amd64`.
+To build for another platform, run `make build-<GOOS>-<GOARCH>`.
 For example, to build for the Mac, run `make build-darwin-amd64`.
-All binaries are placed in `_output/bin/<GOOS>/<GOARCH>`-- for example, `_output/bin/darwin/amd64/ark`.
+All binaries are placed in `_output/bin/<GOOS>/<GOARCH>`-- for example, `_output/bin/darwin/amd64/velero`.
+
+Velero's `Makefile` has a convenience target, `all-build`, that builds the following platforms:

-Ark's `Makefile` has a convenience target, `all-build`, that builds the following platforms:
 * linux-amd64
 * linux-arm
 * linux-arm64
@@ -78,7 +94,9 @@ files (clientset, listers, shared informers, docs) are up to date.

 ## 4. Run

-When running Heptio Ark, you will need to account for the following (all of which are handled in the [`/examples`][6] manifests):
+### Prerequisites 
+
+When running Velero, you will need to account for the following (all of which are handled in the [`/examples`][6] manifests):

 * Appropriate RBAC permissions in the cluster
  * Read access for all data from the source cluster and namespaces
@@ -86,18 +104,110 @@ When running Heptio Ark, you will need to account for the following (all of whic
 * Cloud provider credentials
  * Read/write access to volumes
  * Read/write access to object storage for backup data
-* A [Config object][8] definition for the Ark server
+* A [BackupStorageLocation][20] object definition for the Velero server
+* (Optional) A [VolumeSnapshotLocation][21] object definition for the Velero server, to take PV snapshots

-See [Cloud Provider Specifics][9] for more details.
+### Create a cluster

-### Specifying your image
+To provision a cluster on AWS using Amazon’s official CloudFormation templates, here are two options:

-When your Ark deployment is up and running, you must replace the Heptio-provided Ark image with the image that you built. Run:
+* EC2 [Quick Start for Kubernetes][17]
+
+* eksctl - [a CLI for Amazon EKS][18]
+
+### Option 1: Run your Velero server locally
+
+Running the Velero server locally can speed up iterative development. This eliminates the need to rebuild the Velero server
+image and redeploy it to the cluster with each change.
+
+#### 1. Set enviroment variables
+
+Set the appropriate environment variable for your cloud provider:
+
+AWS: [AWS_SHARED_CREDENTIALS_FILE][15]
+
+GCP: [GOOGLE_APPLICATION_CREDENTIALS][16]
+
+Azure:
+
+  1. AZURE_CLIENT_ID
+
+  2. AZURE_CLIENT_SECRET
+
+  3. AZURE_SUBSCRIPTION_ID
+
+  4. AZURE_TENANT_ID
+
+  5. AZURE_STORAGE_ACCOUNT_ID
+
+  6. AZURE_STORAGE_KEY
+
+  7. AZURE_RESOURCE_GROUP
+
+#### 2. Create resources in a cluster
+
+You may create resources on a cluster using our [example configurations][19].
+
+##### Example
+
+Here is how to setup using an existing cluster in AWS: At the root of the Velero repo:
+
+- Edit `examples/aws/05-backupstoragelocation.yaml` to point to your AWS S3 bucket and region. Note: you can run `aws s3api list-buckets` to get the name of all your buckets.
+
+- (Optional) Edit `examples/aws/06-volumesnapshotlocation.yaml` to point to your AWS region.
+
+Then run the commands below.
+
+`00-prereqs.yaml` contains all our CustomResourceDefinitions (CRDs) that allow us to perform CRUD operations on backups, restores, schedules, etc. it also contains the `velero` namespace, the `velero` ServiceAccount, and a cluster role binding to grant the `velero` ServiceAccount the cluster-admin role:
+
+```bash
+kubectl apply -f examples/common/00-prereqs.yaml
+```
+
+`10-deployment.yaml` is a sample Velero config resource for AWS:
+
+```bash
+kubectl apply -f examples/aws/10-deployment.yaml
+```
+
+And `05-backupstoragelocation.yaml` specifies the location of your backup storage, together with the optional `06-volumesnapshotlocation.yaml`:
+
+```bash
+kubectl apply -f examples/aws/05-backupstoragelocation.yaml
+```
+
+or
+
+```bash
+kubectl apply -f examples/aws/05-backupstoragelocation.yaml examples/aws/06-volumesnapshotlocation.yaml
+```
+
+### 3. Start the Velero server
+
+* Make sure `velero` is in your `PATH` or specify the full path.
+
+* Set variable for Velero as needed. The variables below can be exported as environment variables or passed as CLI cmd flags:
+  * `--kubeconfig`: set the path to the kubeconfig file the Velero server uses to talk to the Kubernetes apiserver
+  * `--namespace`: the set namespace where the Velero server should look for backups, schedules, restores
+  * `--log-level`: set the Velero server's log level
+  * `--plugin-dir`: set the directory where the Velero server looks for plugins
+  * `--metrics-address`: set the bind address and port where Prometheus metrics are exposed
+
+* Start the server: `velero server`
+
+### Option 2: Run your Velero server in a deployment
+
+1. Install Velero using a deployment:
+
+We have examples of deployments for different cloud providers in `examples/<cloud-provider>/10-deployment.yaml`.
+
+2. Replace the deployment's default Velero image with the image that you built. Run:

 ```
-kubectl set image deployment/ark ark=$REGISTRY/ark:$VERSION
+kubectl --namespace=velero set image deployment/velero velero=$REGISTRY/velero:$VERSION
 ```
-where `$REGISTRY` and `$VERSION` are the values that you built with.
+
+where `$REGISTRY` and `$VERSION` are the values that you built Velero with.

 ## 5. Vendoring dependencies

@@ -105,16 +215,23 @@ If you need to add or update the vendored dependencies, see [Vendoring dependenc

 [0]: ../README.md
 [1]: #prerequisites
-[2]: #download
+[2]: #getting-the-source
 [3]: #build
-[4]: ../README.md#quickstart
+[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/velero/tree/master/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
+[13]: https://github.com/heptio/velero/blob/master/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
+[17]: https://aws.amazon.com/quickstart/architecture/heptio-kubernetes/
+[18]: https://eksctl.io/
+[19]: ../examples/README.md
+[20]: api-types/backupstoragelocation.md
+[21]: api-types/volumesnapshotlocation.md
+[22]: https://github.com/heptio/velero/releases
--- a/docs/cli-reference/README.md
+++ b/docs/cli-reference/README.md
@@ -1,20 +0,0 @@
-# Command line reference
-
-The Ark client provides a CLI that allows you to initiate ad-hoc backups, scheduled backups, or restores.
-
-[The files in the CLI reference directory][1] in the repository enumerate each of the possible `ark` commands and their flags. 
-This information is available in the CLI, using the `--help` flag.
-
-## Running the client
-
-We recommend that you [download a pre-built release][26], but you can also build and run the `ark` executable. 
-
-## Kubernetes cluster credentials
-
-In general, Ark will search for your cluster credentials in the following order:
-* `--kubeconfig` command line flag
-* `$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
-[26]: https://github.com/heptio/ark/releases
--- a/docs/cli-reference/ark.md
+++ b/docs/cli-reference/ark.md
@@ -1,46 +0,0 @@
-## ark
-
-Back up and restore Kubernetes cluster resources.
-
-### Synopsis
-
-
-Heptio Ark is a tool for managing disaster recovery, specifically for Kubernetes
-cluster resources. It provides a simple, configurable, and operationally robust
-way to back up your application state and associated data.
-
-If you're familiar with kubectl, Ark supports a similar model, allowing you to
-execute commands such as 'ark get backup' and 'ark create schedule'. The same
-operations can also be performed as 'ark backup get' and 'ark schedule create'.
-
-### Options
-
-```
-      --alsologtostderr                  log to standard error as well as files
-  -h, --help                             help for ark
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark backup](ark_backup.md)	 - Work with backups
-* [ark client](ark_client.md)	 - Ark client related commands
-* [ark completion](ark_completion.md)	 - Output shell completion code for the specified shell (bash or zsh)
-* [ark create](ark_create.md)	 - Create ark resources
-* [ark delete](ark_delete.md)	 - Delete ark resources
-* [ark describe](ark_describe.md)	 - Describe ark resources
-* [ark get](ark_get.md)	 - Get ark resources
-* [ark plugin](ark_plugin.md)	 - Work with plugins
-* [ark restic](ark_restic.md)	 - Work with restic repositories
-* [ark restore](ark_restore.md)	 - Work with restores
-* [ark schedule](ark_schedule.md)	 - Work with schedules
-* [ark server](ark_server.md)	 - Run the ark server
-* [ark version](ark_version.md)	 - Print the ark version and associated image
-
--- a/docs/cli-reference/ark_backup.md
+++ b/docs/cli-reference/ark_backup.md
@@ -1,39 +0,0 @@
-## ark backup
-
-Work with backups
-
-### Synopsis
-
-
-Work with backups
-
-### Options
-
-```
-  -h, --help   help for backup
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark](ark.md)	 - Back up and restore Kubernetes cluster resources.
-* [ark backup create](ark_backup_create.md)	 - Create a backup
-* [ark backup delete](ark_backup_delete.md)	 - Delete a backup
-* [ark backup describe](ark_backup_describe.md)	 - Describe backups
-* [ark backup download](ark_backup_download.md)	 - Download a backup
-* [ark backup get](ark_backup_get.md)	 - Get backups
-* [ark backup logs](ark_backup_logs.md)	 - Get backup logs
-
--- a/docs/cli-reference/ark_backup_create.md
+++ b/docs/cli-reference/ark_backup_create.md
@@ -1,49 +0,0 @@
-## ark backup create
-
-Create a backup
-
-### Synopsis
-
-
-Create a backup
-
-```
-ark backup create NAME [flags]
-```
-
-### Options
-
-```
-      --exclude-namespaces stringArray                  namespaces to exclude from the backup
-      --exclude-resources stringArray                   resources to exclude from the backup, formatted as resource.group, such as storageclasses.storage.k8s.io
-  -h, --help                                            help for create
-      --include-cluster-resources optionalBool[=true]   include cluster-scoped resources in the backup
-      --include-namespaces stringArray                  namespaces to include in the backup (use '*' for all namespaces) (default *)
-      --include-resources stringArray                   resources to include in the backup, formatted as resource.group, such as storageclasses.storage.k8s.io (use '*' for all resources)
-      --label-columns stringArray                       a comma-separated list of labels to be displayed as columns
-      --labels mapStringString                          labels to apply to the backup
-  -o, --output string                                   Output display format. For create commands, display the object but do not send it to the server. Valid formats are 'table', 'json', and 'yaml'.
-  -l, --selector labelSelector                          only back up resources matching this label selector (default <none>)
-      --show-labels                                     show labels in the last column
-      --snapshot-volumes optionalBool[=true]            take snapshots of PersistentVolumes as part of the backup
-      --ttl duration                                    how long before the backup can be garbage collected (default 720h0m0s)
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark backup](ark_backup.md)	 - Work with backups
-
--- a/docs/cli-reference/ark_backup_delete.md
+++ b/docs/cli-reference/ark_backup_delete.md
@@ -1,38 +0,0 @@
-## ark backup delete
-
-Delete a backup
-
-### Synopsis
-
-
-Delete a backup
-
-```
-ark backup delete NAME [flags]
-```
-
-### Options
-
-```
-      --confirm   Confirm deletion
-  -h, --help      help for delete
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark backup](ark_backup.md)	 - Work with backups
-
--- a/docs/cli-reference/ark_backup_describe.md
+++ b/docs/cli-reference/ark_backup_describe.md
@@ -1,38 +0,0 @@
-## ark backup describe
-
-Describe backups
-
-### Synopsis
-
-
-Describe backups
-
-```
-ark backup describe [NAME1] [NAME2] [NAME...] [flags]
-```
-
-### Options
-
-```
-  -h, --help              help for describe
-  -l, --selector string   only show items matching this label selector
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark backup](ark_backup.md)	 - Work with backups
-
--- a/docs/cli-reference/ark_backup_download.md
+++ b/docs/cli-reference/ark_backup_download.md
@@ -1,40 +0,0 @@
-## ark backup download
-
-Download a backup
-
-### Synopsis
-
-
-Download a backup
-
-```
-ark backup download NAME [flags]
-```
-
-### Options
-
-```
-      --force              forces the download and will overwrite file if it exists already
-  -h, --help               help for download
-  -o, --output string      path to output file. Defaults to <NAME>-data.tar.gz in the current directory
-      --timeout duration   maximum time to wait to process download request (default 1m0s)
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark backup](ark_backup.md)	 - Work with backups
-
--- a/docs/cli-reference/ark_backup_get.md
+++ b/docs/cli-reference/ark_backup_get.md
@@ -1,41 +0,0 @@
-## ark backup get
-
-Get backups
-
-### Synopsis
-
-
-Get backups
-
-```
-ark backup get [flags]
-```
-
-### Options
-
-```
-  -h, --help                        help for get
-      --label-columns stringArray   a comma-separated list of labels to be displayed as columns
-  -o, --output string               Output display format. For create commands, display the object but do not send it to the server. Valid formats are 'table', 'json', and 'yaml'. (default "table")
-  -l, --selector string             only show items matching this label selector
-      --show-labels                 show labels in the last column
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark backup](ark_backup.md)	 - Work with backups
-
--- a/docs/cli-reference/ark_backup_logs.md
+++ b/docs/cli-reference/ark_backup_logs.md
@@ -1,38 +0,0 @@
-## ark backup logs
-
-Get backup logs
-
-### Synopsis
-
-
-Get backup logs
-
-```
-ark backup logs BACKUP [flags]
-```
-
-### Options
-
-```
-  -h, --help               help for logs
-      --timeout duration   how long to wait to receive logs (default 1m0s)
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark backup](ark_backup.md)	 - Work with backups
-
--- a/docs/cli-reference/ark_client.md
+++ b/docs/cli-reference/ark_client.md
@@ -1,34 +0,0 @@
-## ark client
-
-Ark client related commands
-
-### Synopsis
-
-
-Ark client related commands
-
-### Options
-
-```
-  -h, --help   help for client
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark](ark.md)	 - Back up and restore Kubernetes cluster resources.
-* [ark client config](ark_client_config.md)	 - Get and set client configuration file values
-
--- a/docs/cli-reference/ark_client_config.md
+++ b/docs/cli-reference/ark_client_config.md
@@ -1,35 +0,0 @@
-## ark client config
-
-Get and set client configuration file values
-
-### Synopsis
-
-
-Get and set client configuration file values
-
-### Options
-
-```
-  -h, --help   help for config
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark client](ark_client.md)	 - Ark client related commands
-* [ark client config get](ark_client_config_get.md)	 - Get client configuration file values
-* [ark client config set](ark_client_config_set.md)	 - Set client configuration file values
-
--- a/docs/cli-reference/ark_client_config_get.md
+++ b/docs/cli-reference/ark_client_config_get.md
@@ -1,37 +0,0 @@
-## ark client config get
-
-Get client configuration file values
-
-### Synopsis
-
-
-Get client configuration file values
-
-```
-ark client config get [KEY 1] [KEY 2] [...] [flags]
-```
-
-### Options
-
-```
-  -h, --help   help for get
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark client config](ark_client_config.md)	 - Get and set client configuration file values
-
--- a/docs/cli-reference/ark_client_config_set.md
+++ b/docs/cli-reference/ark_client_config_set.md
@@ -1,37 +0,0 @@
-## ark client config set
-
-Set client configuration file values
-
-### Synopsis
-
-
-Set client configuration file values
-
-```
-ark client config set KEY=VALUE [KEY=VALUE]... [flags]
-```
-
-### Options
-
-```
-  -h, --help   help for set
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark client config](ark_client_config.md)	 - Get and set client configuration file values
-
--- a/docs/cli-reference/ark_completion.md
+++ b/docs/cli-reference/ark_completion.md
@@ -1,46 +0,0 @@
-## ark completion
-
-Output shell completion code for the specified shell (bash or zsh)
-
-### Synopsis
-
-
-Generate shell completion code.
-
-Auto completion supports both bash and zsh. Output is to STDOUT.
-
-Load the ark completion code for bash into the current shell -
-source <(ark completion bash)
-
-Load the ark completion code for zsh into the current shell -
-source <(ark completion zsh)
-
-
-```
-ark completion SHELL [flags]
-```
-
-### Options
-
-```
-  -h, --help   help for completion
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark](ark.md)	 - Back up and restore Kubernetes cluster resources.
-
--- a/docs/cli-reference/ark_create.md
+++ b/docs/cli-reference/ark_create.md
@@ -1,36 +0,0 @@
-## ark create
-
-Create ark resources
-
-### Synopsis
-
-
-Create ark resources
-
-### Options
-
-```
-  -h, --help   help for create
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark](ark.md)	 - Back up and restore Kubernetes cluster resources.
-* [ark create backup](ark_create_backup.md)	 - Create a backup
-* [ark create restore](ark_create_restore.md)	 - Create a restore
-* [ark create schedule](ark_create_schedule.md)	 - Create a schedule
-
--- a/docs/cli-reference/ark_create_backup.md
+++ b/docs/cli-reference/ark_create_backup.md
@@ -1,49 +0,0 @@
-## ark create backup
-
-Create a backup
-
-### Synopsis
-
-
-Create a backup
-
-```
-ark create backup NAME [flags]
-```
-
-### Options
-
-```
-      --exclude-namespaces stringArray                  namespaces to exclude from the backup
-      --exclude-resources stringArray                   resources to exclude from the backup, formatted as resource.group, such as storageclasses.storage.k8s.io
-  -h, --help                                            help for backup
-      --include-cluster-resources optionalBool[=true]   include cluster-scoped resources in the backup
-      --include-namespaces stringArray                  namespaces to include in the backup (use '*' for all namespaces) (default *)
-      --include-resources stringArray                   resources to include in the backup, formatted as resource.group, such as storageclasses.storage.k8s.io (use '*' for all resources)
-      --label-columns stringArray                       a comma-separated list of labels to be displayed as columns
-      --labels mapStringString                          labels to apply to the backup
-  -o, --output string                                   Output display format. For create commands, display the object but do not send it to the server. Valid formats are 'table', 'json', and 'yaml'.
-  -l, --selector labelSelector                          only back up resources matching this label selector (default <none>)
-      --show-labels                                     show labels in the last column
-      --snapshot-volumes optionalBool[=true]            take snapshots of PersistentVolumes as part of the backup
-      --ttl duration                                    how long before the backup can be garbage collected (default 720h0m0s)
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark create](ark_create.md)	 - Create ark resources
-
--- a/docs/cli-reference/ark_create_restore.md
+++ b/docs/cli-reference/ark_create_restore.md
@@ -1,60 +0,0 @@
-## ark create restore
-
-Create a restore
-
-### Synopsis
-
-
-Create a restore
-
-```
-ark create restore [RESTORE_NAME] --from-backup BACKUP_NAME [flags]
-```
-
-### Examples
-
-```
-  # create a restore named "restore-1" from backup "backup-1"
-  ark restore create restore-1 --from-backup backup-1
-
-  # create a restore with a default name ("backup-1-<timestamp>") from backup "backup-1"
-  ark restore create --from-backup backup-1
-```
-
-### Options
-
-```
-      --exclude-namespaces stringArray                  namespaces to exclude from the restore
-      --exclude-resources stringArray                   resources to exclude from the restore, formatted as resource.group, such as storageclasses.storage.k8s.io
-      --from-backup string                              backup to restore from
-  -h, --help                                            help for restore
-      --include-cluster-resources optionalBool[=true]   include cluster-scoped resources in the restore
-      --include-namespaces stringArray                  namespaces to include in the restore (use '*' for all namespaces) (default *)
-      --include-resources stringArray                   resources to include in the restore, formatted as resource.group, such as storageclasses.storage.k8s.io (use '*' for all resources)
-      --label-columns stringArray                       a comma-separated list of labels to be displayed as columns
-      --labels mapStringString                          labels to apply to the restore
-      --namespace-mappings mapStringString              namespace mappings from name in the backup to desired restored name in the form src1:dst1,src2:dst2,...
-  -o, --output string                                   Output display format. For create commands, display the object but do not send it to the server. Valid formats are 'table', 'json', and 'yaml'.
-      --restore-volumes optionalBool[=true]             whether to restore volumes from snapshots
-  -l, --selector labelSelector                          only restore resources matching this label selector (default <none>)
-      --show-labels                                     show labels in the last column
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark create](ark_create.md)	 - Create ark resources
-
--- a/docs/cli-reference/ark_create_schedule.md
+++ b/docs/cli-reference/ark_create_schedule.md
@@ -1,64 +0,0 @@
-## ark create schedule
-
-Create a schedule
-
-### Synopsis
-
-
-The --schedule flag is required, in cron notation:
-
-| Character Position | Character Period | Acceptable Values |
-| -------------------|:----------------:| -----------------:|
-| 1                  | Minute           | 0-59,*            |
-| 2                  | Hour             | 0-23,*            |
-| 3                  | Day of Month     | 1-31,*            |
-| 4                  | Month            | 1-12,*            |
-| 5                  | Day of Week      | 0-7,*             |
-
-```
-ark create schedule NAME --schedule [flags]
-```
-
-### Examples
-
-```
-ark create schedule NAME --schedule="0 */6 * * *"
-```
-
-### Options
-
-```
-      --exclude-namespaces stringArray                  namespaces to exclude from the backup
-      --exclude-resources stringArray                   resources to exclude from the backup, formatted as resource.group, such as storageclasses.storage.k8s.io
-  -h, --help                                            help for schedule
-      --include-cluster-resources optionalBool[=true]   include cluster-scoped resources in the backup
-      --include-namespaces stringArray                  namespaces to include in the backup (use '*' for all namespaces) (default *)
-      --include-resources stringArray                   resources to include in the backup, formatted as resource.group, such as storageclasses.storage.k8s.io (use '*' for all resources)
-      --label-columns stringArray                       a comma-separated list of labels to be displayed as columns
-      --labels mapStringString                          labels to apply to the backup
-  -o, --output string                                   Output display format. For create commands, display the object but do not send it to the server. Valid formats are 'table', 'json', and 'yaml'.
-      --schedule string                                 a cron expression specifying a recurring schedule for this backup to run
-  -l, --selector labelSelector                          only back up resources matching this label selector (default <none>)
-      --show-labels                                     show labels in the last column
-      --snapshot-volumes optionalBool[=true]            take snapshots of PersistentVolumes as part of the backup
-      --ttl duration                                    how long before the backup can be garbage collected (default 720h0m0s)
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark create](ark_create.md)	 - Create ark resources
-
--- a/docs/cli-reference/ark_delete.md
+++ b/docs/cli-reference/ark_delete.md
@@ -1,36 +0,0 @@
-## ark delete
-
-Delete ark resources
-
-### Synopsis
-
-
-Delete ark resources
-
-### Options
-
-```
-  -h, --help   help for delete
-```
-
-### Options inherited from parent commands
-
-```
-      --alsologtostderr                  log to standard error as well as files
-      --kubeconfig string                Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration
-      --kubecontext string               The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)
-      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir string                   If non-empty, write log files in this directory
-      --logtostderr                      log to standard error instead of files
-  -n, --namespace string                 The namespace in which Ark should operate (default "heptio-ark")
-      --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
-  -v, --v Level                          log level for V logs
-      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
-```
-
-### SEE ALSO
-* [ark](ark.md)	 - Back up and restore Kubernetes cluster resources.
-* [ark delete backup](ark_delete_backup.md)	 - Delete a backup
-* [ark delete restore](ark_delete_restore.md)	 - Delete a restore
-* [ark delete schedule](ark_delete_schedule.md)	 - Delete a schedule
-
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`Add original resource (from backup) to restore item action interface`
				`@@ -0,0 +1 @@`
				`remove pkg/util/collections/map_utils.go, replace with structured API types and apimachinery's unstructured helpers`
				`@@ -0,0 +1 @@`
				`update Kubernetes dependencies to match v1.12, and update Azure SDK to v19.0.0 (GA)`
				`@@ -0,0 +1 @@`
				`Need to defer closing the the ReadCloser in ObjectStoreGRPCServer.GetObject`
				`@@ -0,0 +1 @@`
				`don't remove storageclass from a persistent volume when restoring it`
				`@@ -0,0 +1 @@`
				`remove restore code that waits for a PV to become Available`
				`@@ -0,0 +1 @@`
				`Update velero restore to not open every single file open during extraction of the data`
				`@@ -0,0 +1 @@`
				Move all the interfaces and associated types necessary to implement all of the Velero plugins to under the new package `velero`.
				`@@ -0,0 +1 @@`
				`add panic handlers to all server-side plugin methods`
				`@@ -0,0 +1 @@`
				`Pass --log-level flag to internal/external plugins, matching Velero server's log level`