Skip to content

Commit

Permalink
replace v1.1.0-beta.1 docs with v1.1.0-beta.2 docs
Browse files Browse the repository at this point in the history
Signed-off-by: Steve Kriss <krisss@vmware.com>
  • Loading branch information
skriss committed Aug 13, 2019
1 parent 3c8020e commit c80f679
Show file tree
Hide file tree
Showing 43 changed files with 45 additions and 162 deletions.
8 changes: 4 additions & 4 deletions site/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ defaults:
gh: https://github.com/heptio/velero/tree/master
layout: "docs"
- scope:
path: docs/v1.1.0-beta.1
path: docs/v1.1.0-beta.2
values:
version: v1.1.0-beta.1
gh: https://github.com/heptio/velero/tree/v1.1.0-beta.1
version: v1.1.0-beta.2
gh: https://github.com/heptio/velero/tree/v1.1.0-beta.2
layout: "docs"
- scope:
path: docs/v1.0.0
Expand Down Expand Up @@ -148,7 +148,7 @@ versioning: true
latest: v1.0.0
versions:
- master
- v1.1.0-beta.1
- v1.1.0-beta.2
- v1.0.0
- v0.11.0
- v0.10.0
Expand Down
2 changes: 1 addition & 1 deletion site/_data/toc-mapping.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# that the navigation for older versions still work.

master: master-toc
v1.1.0-beta.1: v1-1-0-beta-1-toc
v1.1.0-beta.2: v1-1-0-beta-2-toc
v1.0.0: v1-0-0-toc
v0.11.0: v011-toc
v0.10.0: v010-toc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ toc:
subfolderitems:
- page: Overview
url: /install-overview
- page: Upgrade to 1.1
url: /upgrade-to-1.1
- page: Quick start with in-cluster MinIO
url: /get-started
- page: Run on AWS
Expand Down
144 changes: 0 additions & 144 deletions site/docs/v1.1.0-beta.1/upgrade-to-1.0.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ See [the list of releases][6] to find out about feature changes.
[2]: https://travis-ci.org/heptio/velero

[4]: https://github.com/heptio/velero/issues
[5]: https://github.com/heptio/velero/blob/v1.1.0-beta.1/CONTRIBUTING.md
[5]: https://github.com/heptio/velero/blob/v1.1.0-beta.2/CONTRIBUTING.md
[6]: https://github.com/heptio/velero/releases

[8]: https://github.com/heptio/velero/blob/v1.1.0-beta.1/CODE_OF_CONDUCT.md
[8]: https://github.com/heptio/velero/blob/v1.1.0-beta.2/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
Expand All @@ -74,7 +74,7 @@ See [the list of releases][6] to find out about feature changes.


[28]: install-overview.md
[29]: https://velero.io/docs/v1.1.0-beta.1/
[29]: https://velero.io/docs/v1.1.0-beta.2/
[30]: troubleshooting.md

[99]: support-matrix.md
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ If you need to add or update the vendored dependencies, see [Vendoring dependenc
[10]: #vendoring-dependencies
[11]: vendoring-dependencies.md
[12]: #test
[13]: https://github.com/heptio/velero/blob/v1.1.0-beta.1/hack/generate-proto.sh
[13]: https://github.com/heptio/velero/blob/v1.1.0-beta.2/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
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Examples of cases where Velero is useful:

Yes, with some exceptions. For example, when Velero restores pods it deletes the `nodeName` from the
pod so that it can be scheduled onto a new node. You can see some more examples of the differences
in [pod_action.go](https://github.com/heptio/velero/blob/v1.1.0-beta.1/pkg/restore/pod_action.go)
in [pod_action.go](https://github.com/heptio/velero/blob/v1.1.0-beta.2/pkg/restore/pod_action.go)

## I'm using Velero in multiple clusters. Should I use the same bucket to store all of my backups?

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,5 @@ velero backup logs nginx-hook-test | grep hookCommand


[1]: api-types/backup.md
[2]: https://github.com/heptio/velero/blob/v1.1.0-beta.1/examples/nginx-app/with-pv.yaml
[2]: https://github.com/heptio/velero/blob/v1.1.0-beta.2/examples/nginx-app/with-pv.yaml
[3]: cloud-common.md
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -241,5 +241,5 @@ After creating the Velero server in your cluster, try this example:

## Additional Reading

* [Official Velero Documentation](https://velero.io/docs/v1.1.0-beta.1/)
* [Official Velero Documentation](https://velero.io/docs/v1.1.0-beta.2/)
* [Oracle Cloud Infrastructure Documentation](https://docs.cloud.oracle.com/)
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,5 @@ for an example of this -- in particular, the `getPluginConfig(...)` function.


[1]: https://github.com/heptio/velero-plugin-example
[2]: https://github.com/heptio/velero/blob/v1.1.0-beta.1/pkg/plugin/logger.go
[3]: https://github.com/heptio/velero/blob/v1.1.0-beta.1/pkg/restore/restic_restore_action.go
[2]: https://github.com/heptio/velero/blob/v1.1.0-beta.2/pkg/plugin/logger.go
[3]: https://github.com/heptio/velero/blob/v1.1.0-beta.2/pkg/restore/restic_restore_action.go
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -235,19 +235,19 @@ data:
image: myregistry.io/my-custom-helper-image[:OPTIONAL_TAG]
# "cpuRequest" sets the request.cpu value on the restic init containers during restore.
# If not set, it will default to "100m".
# If not set, it will default to "100m". A value of "0" is treated as unbounded.
cpuRequest: 200m
# "memRequest" sets the request.memory value on the restic init containers during restore.
# If not set, it will default to "128Mi".
# If not set, it will default to "128Mi". A value of "0" is treated as unbounded.
memRequest: 128Mi
# "cpuLimit" sets the request.cpu value on the restic init containers during restore.
# If not set, it will default to "100m".
# If not set, it will default to "100m". A value of "0" is treated as unbounded.
cpuLimit: 200m
# "memLimit" sets the request.memory value on the restic init containers during restore.
# If not set, it will default to "128Mi".
# If not set, it will default to "128Mi". A value of "0" is treated as unbounded.
memLimit: 128Mi
Expand Down
File renamed without changes.
File renamed without changes.
25 changes: 25 additions & 0 deletions site/docs/v1.1.0-beta.2/upgrade-to-1.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Upgrading to Velero 1.1

## Prerequisites
- [Velero v1.0][1] installed.

Velero v1.1 only requires user intervention if Velero is running in a namespace other than `velero`.

## Instructions

### Adding VELERO_NAMESPACE environment variable to the deployment

Previous versions of Velero's server detected the namespace in which it was running by inspecting the container's filesystem.
With v1.1, this is no longer the case, and the server must be made aware of the namespace it is running in with the `VELERO_NAMESPACE` environment variable.

`velero install` automatically writes this for new deployments, but existing installations will need to add the environment variable before upgrading.

You can use the following command to patch the deployment:

```bash
kubectl patch deployment/velero -n <YOUR_NAMESPACE> \
--type='json' \
-p='[{"op":"add","path":"/spec/template/spec/containers/0/env/0","value":{"name":"VELERO_NAMESPACE", "valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}}}]'
```

[1]: https://github.com/heptio/velero/releases/tag/v1.0.0
File renamed without changes.

0 comments on commit c80f679

Please sign in to comment.