Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

Commit

Permalink
Merge pull request #1131 from kinvolk/imran/update-velero-to-1.5.2
Browse files Browse the repository at this point in the history
Update velero to 1.5.2
  • Loading branch information
ipochi authored Nov 2, 2020
2 parents 6e9a5e0 + bf9658d commit d804f25
Show file tree
Hide file tree
Showing 22 changed files with 1,475 additions and 202 deletions.
4 changes: 2 additions & 2 deletions assets/charts/components/velero/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v1
appVersion: 1.4.2
appVersion: 1.5.2
description: A Helm chart for velero
home: https://github.com/vmware-tanzu/velero
icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
Expand All @@ -18,4 +18,4 @@ name: velero
sources:
- https://github.com/vmware-tanzu/velero
tillerVersion: '>=2.10.0'
version: 2.12.15
version: 2.13.6
16 changes: 10 additions & 6 deletions assets/charts/components/velero/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ Velero has two main components: a CLI, and a server-side Kubernetes deployment.

## Installing the Velero CLI

See the different options for installing the [Velero CLI](https://velero.io/docs/v1.4/basic-install/#install-the-cli).
See the different options for installing the [Velero CLI](https://velero.io/docs/v1.5/basic-install/#install-the-cli).

## Installing the Velero server

### Velero version

This helm chart installs Velero version v1.4.2 https://github.com/vmware-tanzu/velero/tree/v1.4.2. See the [#Upgrading](#upgrading) section for information on how to upgrade from other versions.
This helm chart installs Velero version v1.5.1 https://github.com/vmware-tanzu/velero/tree/v1.5.1. See the [#Upgrading](#upgrading) section for information on how to upgrade from other versions.

### Provider credentials

Expand All @@ -22,7 +22,7 @@ When installing using the Helm chart, the provider's credential information will

The default configuration values for this chart are listed in values.yaml.

See Velero's full [official documentation](https://velero.io/docs/v1.4/basic-install/). More specifically, find your provider in the Velero list of [supported providers](https://velero.io/docs/v1.4/supported-providers/) for specific configuration information and examples.
See Velero's full [official documentation](https://velero.io/docs/v1.5/basic-install/). More specifically, find your provider in the Velero list of [supported providers](https://velero.io/docs/v1.5/supported-providers/) for specific configuration information and examples.


#### Using Helm 3
Expand All @@ -45,7 +45,7 @@ helm install vmware-tanzu/velero --namespace <YOUR NAMESPACE> \
--set configuration.volumeSnapshotLocation.name=<VOLUME SNAPSHOT LOCATION NAME> \
--set configuration.volumeSnapshotLocation.config.region=<REGION> \
--set image.repository=velero/velero \
--set image.tag=v1.4.2 \
--set image.tag=v1.5.1 \
--set image.pullPolicy=IfNotPresent \
--set initContainers[0].name=velero-plugin-for-aws \
--set initContainers[0].image=velero/velero-plugin-for-aws:v1.1.0 \
Expand Down Expand Up @@ -97,7 +97,7 @@ helm install vmware-tanzu/velero --namespace <YOUR NAMESPACE> \
--set configuration.volumeSnapshotLocation.name=<VOLUME SNAPSHOT LOCATION NAME> \
--set configuration.volumeSnapshotLocation.config.region=<REGION> \
--set image.repository=velero/velero \
--set image.tag=v1.4.2 \
--set image.tag=v1.5.1 \
--set image.pullPolicy=IfNotPresent \
--set initContainers[0].name=velero-plugin-for-aws \
--set initContainers[0].image=velero/velero-plugin-for-aws:v1.1.0 \
Expand All @@ -123,11 +123,15 @@ helm upgrade vmware-tanzu/velero <RELEASE NAME> --reuse-values --set configurati

## Upgrading

### Upgrading to v1.5

The [instructions found here](https://velero.io/docs/v1.5/upgrade-to-1.5/) will assist you in upgrading from version v1.4.x to v1.5.


### Upgrading to v1.4

The [instructions found here](https://velero.io/docs/v1.4/upgrade-to-1.4/) will assist you in upgrading from version v1.3.x to v1.4.


### Upgrading to v1.3.1

The [instructions found here](https://velero.io/docs/v1.3.1/upgrade-to-1.3/) will assist you in upgrading from version v1.2.0 or v1.3.0 to v1.3.1.
Expand Down
10 changes: 10 additions & 0 deletions assets/charts/components/velero/ci/test-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@ configuration:
bucket: velero
region: us-west-1

schedules:
mybackup:
labels:
myenv: foo
schedule: "0 0 * * *"
template:
ttl: "240h"
includedNamespaces:
- foo

# Set a service account so that the CRD clean up job has proper permissions to delete CRDs
serviceAccount:
server:
Expand Down
29 changes: 19 additions & 10 deletions assets/charts/components/velero/crds/backups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ metadata:
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-delete-policy": "before-hook-creation"
controller-gen.kubebuilder.io/version: v0.2.4
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.3.0
name: backups.velero.io
spec:
group: velero.io
Expand All @@ -27,18 +26,24 @@ spec:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
internal value, and may reject unrecognized values. More info:
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
submits requests to. Cannot be updated. In CamelCase. More info:
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: BackupSpec defines the specification for a Velero backup.
properties:
defaultVolumesToRestic:
description: DefaultVolumesToRestic specifies whether restic
should be used to take a backup of all pod volumes by default.
type: boolean
excludedNamespaces:
description: ExcludedNamespaces contains a list of namespaces that are
not included in the backup.
Expand Down Expand Up @@ -302,6 +307,15 @@ spec:
are ANDed.
type: object
type: object
orderedResources:
additionalProperties:
type: string
description: OrderedResources specifies the backup order of resources of
specific Kind. The map key is the Kind name and value is a list of resource
names separeted by commas. Each resource name has format "namespace/resourcename".
For cluster resources, simply use "resourcename".
nullable: true
type: object
snapshotVolumes:
description: SnapshotVolumes specifies whether to take cloud snapshots
of any PV's referenced in the set of objects included in the Backup.
Expand Down Expand Up @@ -414,9 +428,4 @@ spec:
- name: v1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

49 changes: 36 additions & 13 deletions assets/charts/components/velero/crds/backupstoragelocations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,33 @@ metadata:
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-delete-policy": "before-hook-creation"
controller-gen.kubebuilder.io/version: v0.2.4
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.3.0
name: backupstoragelocations.velero.io
spec:
additionalPrinterColumns:
- JSONPath: .status.phase
description: Backup Storage Location status such as Available/Unavailable
name: Phase
type: string
- JSONPath: .status.lastValidationTime
description: LastValidationTime is the last time the backup store location was validated
name: Last Validated
type: date
- JSONPath: .metadata.creationTimestamp
name: Age
type: date
group: velero.io
names:
kind: BackupStorageLocation
listKind: BackupStorageLocationList
plural: backupstoragelocations
shortNames:
- bsl
singular: backupstoragelocation
preserveUnknownFields: false
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: BackupStorageLocation is a location where Velero stores backup
Expand All @@ -27,17 +42,19 @@ spec:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
internal value, and may reject unrecognized values. More info:
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
submits requests to. Cannot be updated. In CamelCase. More info:
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: BackupStorageLocationSpec defines the specification for a Velero
description: BackupStorageLocationSpec defines the desired state of a Velero
BackupStorageLocation.
properties:
accessMode:
Expand Down Expand Up @@ -79,13 +96,18 @@ spec:
provider:
description: Provider is the provider of the backup storage.
type: string
validationFrequency:
description: ValidationFrequency defines how frequently to validate
the corresponding object storage. A value of 0 disables validation.
nullable: true
type: string
required:
- objectStorage
- provider
type: object
status:
description: BackupStorageLocationStatus describes the current status of
a Velero BackupStorageLocation.
description: BackupStorageLocationStatus defines the observed state of
BackupStorageLocation
properties:
accessMode:
description: "AccessMode is an unused field. \n Deprecated: there is
Expand All @@ -108,6 +130,12 @@ spec:
format: date-time
nullable: true
type: string
lastValidationTime:
description: LastValidationTime is the last time the backup store location
was validated the cluster.
format: date-time
nullable: true
type: string
phase:
description: Phase is the current state of the BackupStorageLocation.
enum:
Expand All @@ -121,9 +149,4 @@ spec:
- name: v1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

16 changes: 6 additions & 10 deletions assets/charts/components/velero/crds/deletebackuprequests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ metadata:
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-delete-policy": "before-hook-creation"
controller-gen.kubebuilder.io/version: v0.2.4
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.3.0
name: deletebackuprequests.velero.io
spec:
group: velero.io
Expand All @@ -26,12 +25,14 @@ spec:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
internal value, and may reject unrecognized values. More info:
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
submits requests to. Cannot be updated. In CamelCase. More info:
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
Expand Down Expand Up @@ -68,9 +69,4 @@ spec:
- name: v1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

15 changes: 5 additions & 10 deletions assets/charts/components/velero/crds/downloadrequests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ metadata:
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-delete-policy": "before-hook-creation"
controller-gen.kubebuilder.io/version: v0.2.4
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.3.0
name: downloadrequests.velero.io
spec:
group: velero.io
Expand All @@ -27,12 +26,14 @@ spec:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
internal value, and may reject unrecognized values. More info:
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
submits requests to. Cannot be updated. In CamelCase. More info:
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
Expand Down Expand Up @@ -89,9 +90,3 @@ spec:
- name: v1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading

0 comments on commit d804f25

Please sign in to comment.