Skip to content

Commit ee1f0d5

Browse files
jentingjenting
authored
Merge pull request #709 from Kajot-dev/velero-1.17.0
2 parents e960324 + 4a179e6 commit ee1f0d5

File tree

10 files changed

+121
-80
lines changed

10 files changed

+121
-80
lines changed

‎charts/velero/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: v2
2-
appVersion: 1.16.2
2+
appVersion: 1.17.0
33
kubeVersion: ">=1.16.0-0"
44
description: A Helm chart for velero
55
name: velero
6-
version: 10.1.3
6+
version: 11.0.0
77
home: https://github.com/vmware-tanzu/velero
88
icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
99
sources:

‎charts/velero/crds/backuprepositories.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ spec:
7373
resticIdentifier:
7474
description: |-
7575
ResticIdentifier is the full restic-compatible string for identifying
76-
this repository.
76+
this repository. This field is only used when RepositoryType is "restic".
7777
type: string
7878
volumeNamespace:
7979
description: |-
@@ -83,7 +83,6 @@ spec:
8383
required:
8484
- backupStorageLocation
8585
- maintenanceFrequency
86-
- resticIdentifier
8786
- volumeNamespace
8887
type: object
8988
status:

‎charts/velero/crds/backups.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,10 @@ spec:
512512
uploads to perform when using the uploader.
513513
type: integer
514514
type: object
515+
volumeGroupSnapshotLabelKey:
516+
description: VolumeGroupSnapshotLabelKey specifies the label key
517+
to group PVCs under a VGS.
518+
type: string
515519
volumeSnapshotLocations:
516520
description: VolumeSnapshotLocations is a list containing names
517521
of VolumeSnapshotLocations associated with this backup.

‎charts/velero/crds/datauploads.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ spec:
8989
of the CSI snapshot.
9090
nullable: true
9191
properties:
92+
driver:
93+
description: Driver is the driver used by the VolumeSnapshotContent
94+
type: string
9295
snapshotClass:
9396
description: SnapshotClass is the name of the snapshot class
9497
that the volume snapshot is created with

‎charts/velero/crds/podvolumebackups.yaml‎

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,41 @@ spec:
1717
scope: Namespaced
1818
versions:
1919
- additionalPrinterColumns:
20-
- description: Pod Volume Backup status such as New/InProgress
20+
- description: PodVolumeBackup status such as New/InProgress
2121
jsonPath: .status.phase
2222
name: Status
2323
type: string
24-
- description: Time when this backup was started
24+
- description: Time duration since this PodVolumeBackup was started
2525
jsonPath: .status.startTimestamp
26-
name: Created
26+
name: Started
2727
type: date
28-
- description: Namespace of the pod containing the volume to be backed up
29-
jsonPath: .spec.pod.namespace
30-
name: Namespace
31-
type: string
32-
- description: Name of the pod containing the volume to be backed up
33-
jsonPath: .spec.pod.name
34-
name: Pod
35-
type: string
36-
- description: Name of the volume to be backed up
37-
jsonPath: .spec.volume
38-
name: Volume
39-
type: string
40-
- description: The type of the uploader to handle data transfer
41-
jsonPath: .spec.uploaderType
42-
name: Uploader Type
43-
type: string
28+
- description: Completed bytes
29+
format: int64
30+
jsonPath: .status.progress.bytesDone
31+
name: Bytes Done
32+
type: integer
33+
- description: Total bytes
34+
format: int64
35+
jsonPath: .status.progress.totalBytes
36+
name: Total Bytes
37+
type: integer
4438
- description: Name of the Backup Storage Location where this backup should
4539
be stored
4640
jsonPath: .spec.backupStorageLocation
4741
name: Storage Location
4842
type: string
49-
- jsonPath: .metadata.creationTimestamp
43+
- description: Time duration since this PodVolumeBackup was created
44+
jsonPath: .metadata.creationTimestamp
5045
name: Age
5146
type: date
47+
- description: Name of the node where the PodVolumeBackup is processed
48+
jsonPath: .status.node
49+
name: Node
50+
type: string
51+
- description: The type of the uploader to handle data transfer
52+
jsonPath: .spec.uploaderType
53+
name: Uploader
54+
type: string
5255
name: v1
5356
schema:
5457
openAPIV3Schema:
@@ -78,6 +81,11 @@ spec:
7881
BackupStorageLocation is the name of the backup storage location
7982
where the backup repository is stored.
8083
type: string
84+
cancel:
85+
description: |-
86+
Cancel indicates request to cancel the ongoing PodVolumeBackup. It can be set
87+
when the PodVolumeBackup is in InProgress phase
88+
type: boolean
8189
node:
8290
description: Node is the name of the node that the Pod is running
8391
on.
@@ -167,6 +175,13 @@ spec:
167175
status:
168176
description: PodVolumeBackupStatus is the current status of a PodVolumeBackup.
169177
properties:
178+
acceptedTimestamp:
179+
description: |-
180+
AcceptedTimestamp records the time the pod volume backup is to be prepared.
181+
The server's time is used for AcceptedTimestamp
182+
format: date-time
183+
nullable: true
184+
type: string
170185
completionTimestamp:
171186
description: |-
172187
CompletionTimestamp records the time a backup was completed.
@@ -188,7 +203,11 @@ spec:
188203
description: Phase is the current state of the PodVolumeBackup.
189204
enum:
190205
- New
206+
- Accepted
207+
- Prepared
191208
- InProgress
209+
- Canceling
210+
- Canceled
192211
- Completed
193212
- Failed
194213
type: string

‎charts/velero/crds/podvolumerestores.yaml‎

Lines changed: 46 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,39 +17,41 @@ spec:
1717
scope: Namespaced
1818
versions:
1919
- additionalPrinterColumns:
20-
- description: Namespace of the pod containing the volume to be restored
21-
jsonPath: .spec.pod.namespace
22-
name: Namespace
23-
type: string
24-
- description: Name of the pod containing the volume to be restored
25-
jsonPath: .spec.pod.name
26-
name: Pod
27-
type: string
28-
- description: The type of the uploader to handle data transfer
29-
jsonPath: .spec.uploaderType
30-
name: Uploader Type
31-
type: string
32-
- description: Name of the volume to be restored
33-
jsonPath: .spec.volume
34-
name: Volume
35-
type: string
36-
- description: Pod Volume Restore status such as New/InProgress
20+
- description: PodVolumeRestore status such as New/InProgress
3721
jsonPath: .status.phase
3822
name: Status
3923
type: string
40-
- description: Pod Volume Restore status such as New/InProgress
24+
- description: Time duration since this PodVolumeRestore was started
25+
jsonPath: .status.startTimestamp
26+
name: Started
27+
type: date
28+
- description: Completed bytes
4129
format: int64
42-
jsonPath: .status.progress.totalBytes
43-
name: TotalBytes
30+
jsonPath: .status.progress.bytesDone
31+
name: Bytes Done
4432
type: integer
45-
- description: Pod Volume Restore status such as New/InProgress
33+
- description: Total bytes
4634
format: int64
47-
jsonPath: .status.progress.bytesDone
48-
name: BytesDone
35+
jsonPath: .status.progress.totalBytes
36+
name: Total Bytes
4937
type: integer
50-
- jsonPath: .metadata.creationTimestamp
38+
- description: Name of the Backup Storage Location where the backup data is
39+
stored
40+
jsonPath: .spec.backupStorageLocation
41+
name: Storage Location
42+
type: string
43+
- description: Time duration since this PodVolumeRestore was created
44+
jsonPath: .metadata.creationTimestamp
5145
name: Age
5246
type: date
47+
- description: Name of the node where the PodVolumeRestore is processed
48+
jsonPath: .status.node
49+
name: Node
50+
type: string
51+
- description: The type of the uploader to handle data transfer
52+
jsonPath: .spec.uploaderType
53+
name: Uploader Type
54+
type: string
5355
name: v1
5456
schema:
5557
openAPIV3Schema:
@@ -79,6 +81,11 @@ spec:
7981
BackupStorageLocation is the name of the backup storage location
8082
where the backup repository is stored.
8183
type: string
84+
cancel:
85+
description: |-
86+
Cancel indicates request to cancel the ongoing PodVolumeRestore. It can be set
87+
when the PodVolumeRestore is in InProgress phase
88+
type: boolean
8289
pod:
8390
description: Pod is a reference to the pod containing the volume
8491
to be restored.
@@ -164,6 +171,13 @@ spec:
164171
status:
165172
description: PodVolumeRestoreStatus is the current status of a PodVolumeRestore.
166173
properties:
174+
acceptedTimestamp:
175+
description: |-
176+
AcceptedTimestamp records the time the pod volume restore is to be prepared.
177+
The server's time is used for AcceptedTimestamp
178+
format: date-time
179+
nullable: true
180+
type: string
167181
completionTimestamp:
168182
description: |-
169183
CompletionTimestamp records the time a restore was completed.
@@ -176,11 +190,19 @@ spec:
176190
description: Message is a message about the pod volume restore's
177191
status.
178192
type: string
193+
node:
194+
description: Node is name of the node where the pod volume restore
195+
is processed.
196+
type: string
179197
phase:
180198
description: Phase is the current state of the PodVolumeRestore.
181199
enum:
182200
- New
201+
- Accepted
202+
- Prepared
183203
- InProgress
204+
- Canceling
205+
- Canceled
184206
- Completed
185207
- Failed
186208
type: string

‎charts/velero/crds/schedules.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,10 @@ spec:
553553
parallel uploads to perform when using the uploader.
554554
type: integer
555555
type: object
556+
volumeGroupSnapshotLabelKey:
557+
description: VolumeGroupSnapshotLabelKey specifies the label
558+
key to group PVCs under a VGS.
559+
type: string
556560
volumeSnapshotLocations:
557561
description: VolumeSnapshotLocations is a list containing names
558562
of VolumeSnapshotLocations associated with this backup.

‎charts/velero/templates/NOTES.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,22 @@ More info on the official site: https://velero.io/docs
7575
{{- end }}
7676
{{- end }}
7777

78+
{{- if eq .Values.configuration.uploaderType "restic" }}
79+
{{- $breaking = print $breaking "\n\nERROR: restic uploaderType was removed, please use a different one" }}
80+
{{- end }}
81+
82+
{{- if hasKey .Values.configuration.repositoryMaintenanceJob "requests" }}
83+
{{- $breaking = print $breaking "\n\nREMOVED: configuration.repositoryMaintenanceJob.requests has been removed, please use the configmap" }}
84+
{{- end }}
85+
86+
{{- if hasKey .Values.configuration.repositoryMaintenanceJob "limits" }}
87+
{{- $breaking = print $breaking "\n\nREMOVED: configuration.repositoryMaintenanceJob.limits has been removed, please use the configmap" }}
88+
{{- end }}
89+
90+
{{- if hasKey .Values.configuration.repositoryMaintenanceJob "latestJobsCount" }}
91+
{{- $breaking = print $breaking "\n\nREMOVED: configuration.repositoryMaintenanceJob.latestJobsCount has been removed, please use the configmap" }}
92+
{{- end }}
93+
7894
{{- if $breaking }}
7995
{{- fail (print $breaking_title $breaking) }}
8096
{{- end }}

‎charts/velero/templates/deployment.yaml‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
apiVersion: apps/v1
44
kind: Deployment
55
metadata:
6-
name: {{ include "velero.fullname" . }}
6+
name: velero
77
namespace: {{ .Release.Namespace }}
88
{{- with .Values.annotations }}
99
annotations:
@@ -183,25 +183,6 @@ spec:
183183
{{- if and .repositoryConfigData (or .repositoryConfigData.global .repositoryConfigData.repositories) }}
184184
- --repo-maintenance-job-configmap={{ default "velero-repo-maintenance" .repositoryConfigData.name }}
185185
{{- else }}
186-
{{- with .requests }}
187-
{{- with .cpu }}
188-
- --maintenance-job-cpu-request={{ . }}
189-
{{- end }}
190-
{{- with .memory }}
191-
- --maintenance-job-mem-request={{ . }}
192-
{{- end }}
193-
{{- end }}
194-
{{- with .limits }}
195-
{{- with .cpu }}
196-
- --maintenance-job-cpu-limit={{ . }}
197-
{{- end }}
198-
{{- with .memory }}
199-
- --maintenance-job-mem-limit={{ . }}
200-
{{- end }}
201-
{{- end }}
202-
{{- with .latestJobsCount }}
203-
- --keep-latest-maintenance-jobs={{ . }}
204-
{{- end }}
205186
{{- end }}
206187
{{- end }}
207188
{{- with .extraArgs }}

‎charts/velero/values.yaml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace:
2727
# enabling node-agent). Required.
2828
image:
2929
repository: velero/velero
30-
tag: v1.16.2
30+
tag: v1.17.0
3131
# Digest value example: sha256:d238835e151cec91c6a811fe3a89a66d3231d9f64d09e5f3c49552672d271f38.
3232
# If used, it will take precedence over the image.tag.
3333
# digest:
@@ -130,7 +130,7 @@ dnsPolicy: ClusterFirst
130130
# If the value is a string then it is evaluated as a template.
131131
initContainers:
132132
# - name: velero-plugin-for-aws
133-
# image: velero/velero-plugin-for-aws:v1.12.2
133+
# image: velero/velero-plugin-for-aws:v1.13.0
134134
# imagePullPolicy: IfNotPresent
135135
# volumeMounts:
136136
# - mountPath: /target
@@ -512,14 +512,6 @@ configuration:
512512
# Resource requests/limits to specify for the repository-maintenance job. Optional.
513513
# https://velero.io/docs/v1.14/repository-maintenance/#resource-limitation
514514
repositoryMaintenanceJob:
515-
requests:
516-
# cpu: 500m
517-
# memory: 512Mi
518-
limits:
519-
# cpu: 1000m
520-
# memory: 1024Mi
521-
# Number of latest maintenance jobs to keep for each repository
522-
latestJobsCount: 3
523515
# Per-repository resource settings ConfigMap
524516
# This ConfigMap allows specifying different settings for different repositories
525517
# See: https://velero.io/docs/main/repository-maintenance/
@@ -547,7 +539,8 @@ configuration:
547539
# operator: "In"
548540
# values: ["us-central1-a", "us-central1-b", "us-central1-c"]
549541
# priorityClassName: "low-priority" # Note: priorityClassName is only supported in global configuration
550-
global: {}
542+
global:
543+
keepLatestMaintenanceJobs: 3
551544
# Repository-specific configurations
552545
# Repository keys are formed as: "{namespace}-{storageLocation}-{repositoryType}"
553546
# For example: "default-default-kopia" or "prod-s3-backup-kopia"
@@ -791,7 +784,7 @@ schedules: {}
791784
# velero.io/plugin-config: ""
792785
# velero.io/pod-volume-restore: RestoreItemAction
793786
# data:
794-
# image: velero/velero-restore-helper:v1.10.2
787+
# image: velero/velero:v1.17.0
795788
# cpuRequest: 200m
796789
# memRequest: 128Mi
797790
# cpuLimit: 200m

0 commit comments

Comments
 (0)