Skip to content

Commit 6da7e91

Browse files
committed
chore(packages/system/velero): bump velero to 12.0.3
Re-vendors the velero chart from 11.0.0 to 12.0.3 (app 1.17.0 -> 1.18.1) and moves the backup-plugin initContainers to the matching releases: velero-plugin-for-aws v1.12.1 -> v1.14.1 (the release that bumps to velero 1.18.1) and kubevirt-velero-plugin v0.8.0 -> v0.9.0. The chart-major bump's values-schema changes are backward-compatible (two required fields relaxed, one optional key added), so all cozystack overrides (upgradeCRDs, initContainers, configuration.{features,defaultItemOperationTimeout}, deployNodeAgent) stay valid. The 1.18 "PVC selected-node" deprecation needs no action (velero handles it transparently); the CRD changes are additive. Adds helm-unittest coverage (the package shipped none): pins the server and plugin image tags and the upgradeCRDs=false -> no upgrade-crds Job invariant, which has silently regressed before. Pins the update target's helm pull to an explicit chart version so re-vendoring is reproducible. Note: Helm v3 does not update CRDs on `helm upgrade` (upgradeCRDs is disabled); the 1.18 CRDs must be applied manually on existing clusters. Adaptations: - charts/: re-vendored via make update (helm pull velero --version 12.0.3) - values.yaml: plugin images to velero-1.18-compatible releases - Makefile: pin update target to --version 12.0.3; add test target - tests/velero_test.yaml: new helm-unittest coverage Assisted-By: Claude <[email protected]> Signed-off-by: Aleksei Sviridkin <[email protected]>
1 parent 82b8c46 commit 6da7e91

33 files changed

Lines changed: 361 additions & 240 deletions

‎packages/system/velero/Makefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ export NAMESPACE=cozy-$(NAME)
33

44
include ../../../hack/package.mk
55

6+
test:
7+
helm unittest .
8+
69
update:
710
rm -rf charts
811
# Velero
912
helm repo add tanzu https://vmware-tanzu.github.io/helm-charts
1013
helm repo update tanzu
11-
helm pull tanzu/velero --untar --untardir charts
14+
helm pull tanzu/velero --untar --untardir charts --version 12.0.3

‎packages/system/velero/charts/velero/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: 1.17.0
2+
appVersion: 1.18.1
33
description: A Helm chart for velero
44
home: https://github.com/vmware-tanzu/velero
55
icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
@@ -14,4 +14,4 @@ maintainers:
1414
name: velero
1515
sources:
1616
- https://github.com/vmware-tanzu/velero
17-
version: 11.0.0
17+
version: 12.0.3

‎packages/system/velero/charts/velero/ci/test-values.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ configuration:
1414
- name: backups-secondary
1515
bucket: velero-backups
1616
provider: aws
17+
backupSyncPeriod: "3h"
1718
config:
1819
region: us-west-1
1920
profile: us-west-1-profile

‎packages/system/velero/charts/velero/crds/backuprepositories.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ spec:
116116
nullable: true
117117
type: string
118118
message:
119-
description: Message is a message about the current status
120-
of the repo maintenance.
119+
description: Message is a message about the current status of
120+
the repo maintenance.
121121
type: string
122122
result:
123123
description: Result is the result of the repo maintenance.
@@ -126,8 +126,7 @@ spec:
126126
- Failed
127127
type: string
128128
startTimestamp:
129-
description: StartTimestamp is the start time of the repo
130-
maintenance.
129+
description: StartTimestamp is the start time of the repo maintenance.
131130
format: date-time
132131
nullable: true
133132
type: string

‎packages/system/velero/charts/velero/crds/backups.yaml‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ spec:
124124
nullable: true
125125
type: array
126126
excludedResources:
127-
description: ExcludedResources specifies the resources
128-
to which this hook spec does not apply.
127+
description: ExcludedResources specifies the resources to
128+
which this hook spec does not apply.
129129
items:
130130
type: string
131131
nullable: true
@@ -147,8 +147,8 @@ spec:
147147
nullable: true
148148
type: array
149149
labelSelector:
150-
description: LabelSelector, if specified, filters the
151-
resources to which this hook spec applies.
150+
description: LabelSelector, if specified, filters the resources
151+
to which this hook spec applies.
152152
nullable: true
153153
properties:
154154
matchExpressions:
@@ -202,8 +202,7 @@ spec:
202202
PostHooks is a list of BackupResourceHooks to execute after storing the item in the backup.
203203
These are executed after all "additional items" from item actions are processed.
204204
items:
205-
description: BackupResourceHook defines a hook for a
206-
resource.
205+
description: BackupResourceHook defines a hook for a resource.
207206
properties:
208207
exec:
209208
description: Exec defines an exec hook.
@@ -222,8 +221,8 @@ spec:
222221
type: string
223222
onError:
224223
description: OnError specifies how Velero should
225-
behave if it encounters an error executing
226-
this hook.
224+
behave if it encounters an error executing this
225+
hook.
227226
enum:
228227
- Continue
229228
- Fail
@@ -245,8 +244,7 @@ spec:
245244
PreHooks is a list of BackupResourceHooks to execute prior to storing the item in the backup.
246245
These are executed before any "additional items" from item actions are processed.
247246
items:
248-
description: BackupResourceHook defines a hook for a
249-
resource.
247+
description: BackupResourceHook defines a hook for a resource.
250248
properties:
251249
exec:
252250
description: Exec defines an exec hook.
@@ -265,8 +263,8 @@ spec:
265263
type: string
266264
onError:
267265
description: OnError specifies how Velero should
268-
behave if it encounters an error executing
269-
this hook.
266+
behave if it encounters an error executing this
267+
hook.
270268
enum:
271269
- Continue
272270
- Fail
@@ -407,16 +405,16 @@ spec:
407405
label selector matches no objects.
408406
properties:
409407
matchExpressions:
410-
description: matchExpressions is a list of label selector
411-
requirements. The requirements are ANDed.
408+
description: matchExpressions is a list of label selector requirements.
409+
The requirements are ANDed.
412410
items:
413411
description: |-
414412
A label selector requirement is a selector that contains values, a key, and an operator that
415413
relates the key and values.
416414
properties:
417415
key:
418-
description: key is the label key that the selector
419-
applies to.
416+
description: key is the label key that the selector applies
417+
to.
420418
type: string
421419
operator:
422420
description: |-
@@ -494,17 +492,16 @@ spec:
494492
nullable: true
495493
type: boolean
496494
storageLocation:
497-
description: StorageLocation is a string containing the name of
498-
a BackupStorageLocation where the backup should be stored.
495+
description: StorageLocation is a string containing the name of a
496+
BackupStorageLocation where the backup should be stored.
499497
type: string
500498
ttl:
501499
description: |-
502500
TTL is a time.Duration-parseable string describing how long
503501
the Backup should be retained for.
504502
type: string
505503
uploaderConfig:
506-
description: UploaderConfig specifies the configuration for the
507-
uploader.
504+
description: UploaderConfig specifies the configuration for the uploader.
508505
nullable: true
509506
properties:
510507
parallelFilesUpload:
@@ -513,12 +510,12 @@ spec:
513510
type: integer
514511
type: object
515512
volumeGroupSnapshotLabelKey:
516-
description: VolumeGroupSnapshotLabelKey specifies the label key
517-
to group PVCs under a VGS.
513+
description: VolumeGroupSnapshotLabelKey specifies the label key to
514+
group PVCs under a VGS.
518515
type: string
519516
volumeSnapshotLocations:
520-
description: VolumeSnapshotLocations is a list containing names
521-
of VolumeSnapshotLocations associated with this backup.
517+
description: VolumeSnapshotLocations is a list containing names of
518+
VolumeSnapshotLocations associated with this backup.
522519
items:
523520
type: string
524521
type: array
@@ -580,8 +577,8 @@ spec:
580577
major, minor, and patch version.
581578
type: string
582579
hookStatus:
583-
description: HookStatus contains information about the status of
584-
the hooks.
580+
description: HookStatus contains information about the status of the
581+
hooks.
585582
nullable: true
586583
properties:
587584
hooksAttempted:
@@ -591,14 +588,16 @@ spec:
591588
and the number of hooks that executed successfully.
592589
type: integer
593590
hooksFailed:
594-
description: HooksFailed is the total number of hooks which
595-
ended with an error
591+
description: HooksFailed is the total number of hooks which ended
592+
with an error
596593
type: integer
597594
type: object
598595
phase:
599596
description: Phase is the current state of the Backup.
600597
enum:
601598
- New
599+
- Queued
600+
- ReadyToStart
602601
- FailedValidation
603602
- InProgress
604603
- WaitingForPluginOperations
@@ -630,6 +629,11 @@ spec:
630629
filters that happen as items are processed.
631630
type: integer
632631
type: object
632+
queuePosition:
633+
description: |-
634+
QueuePosition is the position of the backup in the queue.
635+
Only relevant when Phase is "Queued"
636+
type: integer
633637
startTimestamp:
634638
description: |-
635639
StartTimestamp records the time a backup was started.

‎packages/system/velero/charts/velero/crds/backupstoragelocations.yaml‎

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ spec:
2323
jsonPath: .status.phase
2424
name: Phase
2525
type: string
26-
- description: LastValidationTime is the last time the backup store location
27-
was validated
26+
- description: LastValidationTime is the last time the backup store location was
27+
validated
2828
jsonPath: .status.lastValidationTime
2929
name: Last Validated
3030
type: date
@@ -59,8 +59,8 @@ spec:
5959
metadata:
6060
type: object
6161
spec:
62-
description: BackupStorageLocationSpec defines the desired state of
63-
a Velero BackupStorageLocation
62+
description: BackupStorageLocationSpec defines the desired state of a
63+
Velero BackupStorageLocation
6464
properties:
6565
accessMode:
6666
description: AccessMode defines the permissions for the backup storage
@@ -84,8 +84,8 @@ spec:
8484
to be used with this location
8585
properties:
8686
key:
87-
description: The key of the secret to select from. Must be
88-
a valid secret key.
87+
description: The key of the secret to select from. Must be a
88+
valid secret key.
8989
type: string
9090
name:
9191
default: ""
@@ -115,10 +115,38 @@ spec:
115115
description: Bucket is the bucket to use for object storage.
116116
type: string
117117
caCert:
118-
description: CACert defines a CA bundle to use when verifying
119-
TLS connections to the provider.
118+
description: |-
119+
CACert defines a CA bundle to use when verifying TLS connections to the provider.
120+
Deprecated: Use CACertRef instead.
120121
format: byte
121122
type: string
123+
caCertRef:
124+
description: |-
125+
CACertRef is a reference to a Secret containing the CA certificate bundle to use
126+
when verifying TLS connections to the provider. The Secret must be in the same
127+
namespace as the BackupStorageLocation.
128+
properties:
129+
key:
130+
description: The key of the secret to select from. Must be
131+
a valid secret key.
132+
type: string
133+
name:
134+
default: ""
135+
description: |-
136+
Name of the referent.
137+
This field is effectively required, but due to backwards compatibility is
138+
allowed to be empty. Instances of this type with an empty value here are
139+
almost certainly wrong.
140+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
141+
type: string
142+
optional:
143+
description: Specify whether the Secret or its key must be
144+
defined
145+
type: boolean
146+
required:
147+
- key
148+
type: object
149+
x-kubernetes-map-type: atomic
122150
prefix:
123151
description: Prefix is the path inside a bucket to use for Velero
124152
storage. Optional.
@@ -139,8 +167,8 @@ spec:
139167
- provider
140168
type: object
141169
status:
142-
description: BackupStorageLocationStatus defines the observed state
143-
of BackupStorageLocation
170+
description: BackupStorageLocationStatus defines the observed state of
171+
BackupStorageLocation
144172
properties:
145173
accessMode:
146174
description: |-

‎packages/system/velero/charts/velero/crds/datadownloads.yaml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ spec:
3535
jsonPath: .status.progress.totalBytes
3636
name: Total Bytes
3737
type: integer
38-
- description: Name of the Backup Storage Location where the backup data is
39-
stored
38+
- description: Name of the Backup Storage Location where the backup data is stored
4039
jsonPath: .spec.backupStorageLocation
4140
name: Storage Location
4241
type: string
@@ -96,8 +95,7 @@ spec:
9695
If DataMover is "" or "velero", the built-in data mover will be used.
9796
type: string
9897
nodeOS:
99-
description: NodeOS is OS of the node where the DataDownload is
100-
processed.
98+
description: NodeOS is OS of the node where the DataDownload is processed.
10199
enum:
102100
- auto
103101
- linux
@@ -109,9 +107,13 @@ spec:
109107
before returning error as timeout.
110108
type: string
111109
snapshotID:
112-
description: SnapshotID is the ID of the Velero backup snapshot
113-
to be restored from.
110+
description: SnapshotID is the ID of the Velero backup snapshot to
111+
be restored from.
114112
type: string
113+
snapshotSize:
114+
description: SnapshotSize is the logical size in Bytes of the snapshot.
115+
format: int64
116+
type: integer
115117
sourceNamespace:
116118
description: |-
117119
SourceNamespace is the original namespace where the volume is backed up from.
@@ -125,8 +127,8 @@ spec:
125127
description: Namespace is the target namespace
126128
type: string
127129
pv:
128-
description: PV is the name of the target PV that is created
129-
by Velero restore
130+
description: PV is the name of the target PV that is created by
131+
Velero restore
130132
type: string
131133
pvc:
132134
description: PVC is the name of the target PVC that is created
@@ -169,8 +171,7 @@ spec:
169171
description: Message is a message about the DataDownload's status.
170172
type: string
171173
node:
172-
description: Node is name of the node where the DataDownload is
173-
processed.
174+
description: Node is name of the node where the DataDownload is processed.
174175
type: string
175176
phase:
176177
description: Phase is the current state of the DataDownload.

0 commit comments

Comments
 (0)