Skip to content

Commit e0bfa6d

Browse files
spnnglspnngl
committed
chore(velero-crds): upgrade to v10.0.4
1 parent a99f659 commit e0bfa6d

15 files changed

+275
-165
lines changed

‎charts/velero-crds/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ apiVersion: v2
22
name: velero-crds
33
description: A Helm chart to manage velero CRDs
44
# Set it velero's Chart version.
5-
appVersion: 1.15.0
5+
appVersion: 1.16.0
66
kubeVersion: ">=1.16.0-0"
7-
version: 8.0.0
7+
version: 10.0.4
88
maintainers:
99
- name: Wiremind
1010
url: https://github.com/wiremind/wiremind-helm-charts

‎charts/velero-crds/README.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,19 @@ The Chart has the same version as the `velero` Chart's, try to keep them equal e
77
The CRDs are retrieved/adjustec from [here](https://github.com/vmware-tanzu/helm-charts/tree/main/charts/velero/crds), Checkout the right tag and see if there are any changes. Comment out `creationTimestamp` due to kubeconform + <https://github.com/kubernetes/kubernetes/issues/109427>.
88

99
If the version of the CRDs changes, aka breaking changes (this doesn't happen every day) more actions will be required!
10+
11+
```
12+
cd charts/velero-crds
13+
repo="vmware-tanzu/helm-charts"
14+
branch="velero-10.0.4"
15+
folder="charts/velero/crds"
16+
files=$(curl -s "https://api.github.com/repos/$repo/contents/$folder?ref=$branch" | jq -r '.[].download_url')
17+
for file in $files
18+
do
19+
filename=$(basename "$file")
20+
curl -o "templates/$filename" -L "$file"
21+
done
22+
23+
rm -f templates/kustomization.yaml
24+
cd -
25+
```

‎charts/velero-crds/templates/backuprepositories.yaml

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
5+
annotations:
6+
controller-gen.kubebuilder.io/version: v0.16.5
57
labels:
68
component: velero
7-
annotations:
8-
controller-gen.kubebuilder.io/version: v0.14.0
99
name: backuprepositories.velero.io
1010
spec:
1111
group: velero.io
@@ -90,8 +90,8 @@ spec:
9090
description: BackupRepositoryStatus is the current status of a BackupRepository.
9191
properties:
9292
lastMaintenanceTime:
93-
description: LastMaintenanceTime is the last time maintenance was
94-
run.
93+
description: LastMaintenanceTime is the last time repo maintenance
94+
succeeded.
9595
format: date-time
9696
nullable: true
9797
type: string
@@ -106,8 +106,36 @@ spec:
106106
- Ready
107107
- NotReady
108108
type: string
109+
recentMaintenance:
110+
description: RecentMaintenance is status of the recent repo maintenance.
111+
items:
112+
properties:
113+
completeTimestamp:
114+
description: CompleteTimestamp is the completion time of the
115+
repo maintenance.
116+
format: date-time
117+
nullable: true
118+
type: string
119+
message:
120+
description: Message is a message about the current status
121+
of the repo maintenance.
122+
type: string
123+
result:
124+
description: Result is the result of the repo maintenance.
125+
enum:
126+
- Succeeded
127+
- Failed
128+
type: string
129+
startTimestamp:
130+
description: StartTimestamp is the start time of the repo
131+
maintenance.
132+
format: date-time
133+
nullable: true
134+
type: string
135+
type: object
136+
type: array
109137
type: object
110138
type: object
111139
served: true
112140
storage: true
113-
subresources: {}
141+
subresources: {}

‎charts/velero-crds/templates/backups.yaml

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
5+
annotations:
6+
controller-gen.kubebuilder.io/version: v0.16.5
57
labels:
68
component: velero
7-
annotations:
8-
controller-gen.kubebuilder.io/version: v0.14.0
99
name: backups.velero.io
1010
spec:
1111
group: velero.io
@@ -65,7 +65,6 @@ spec:
6565
DefaultVolumesToRestic specifies whether restic should be used to take a
6666
backup of all pod volumes by default.
6767
68-
6968
Deprecated: this field is no longer used and will be removed entirely in future. Use DefaultVolumesToFsBackup instead.
7069
nullable: true
7170
type: boolean
@@ -125,8 +124,8 @@ spec:
125124
nullable: true
126125
type: array
127126
excludedResources:
128-
description: ExcludedResources specifies the resources to
129-
which this hook spec does not apply.
127+
description: ExcludedResources specifies the resources
128+
to which this hook spec does not apply.
130129
items:
131130
type: string
132131
nullable: true
@@ -148,8 +147,8 @@ spec:
148147
nullable: true
149148
type: array
150149
labelSelector:
151-
description: LabelSelector, if specified, filters the resources
152-
to which this hook spec applies.
150+
description: LabelSelector, if specified, filters the
151+
resources to which this hook spec applies.
153152
nullable: true
154153
properties:
155154
matchExpressions:
@@ -178,11 +177,13 @@ spec:
178177
items:
179178
type: string
180179
type: array
180+
x-kubernetes-list-type: atomic
181181
required:
182182
- key
183183
- operator
184184
type: object
185185
type: array
186+
x-kubernetes-list-type: atomic
186187
matchLabels:
187188
additionalProperties:
188189
type: string
@@ -201,7 +202,8 @@ spec:
201202
PostHooks is a list of BackupResourceHooks to execute after storing the item in the backup.
202203
These are executed after all "additional items" from item actions are processed.
203204
items:
204-
description: BackupResourceHook defines a hook for a resource.
205+
description: BackupResourceHook defines a hook for a
206+
resource.
205207
properties:
206208
exec:
207209
description: Exec defines an exec hook.
@@ -220,8 +222,8 @@ spec:
220222
type: string
221223
onError:
222224
description: OnError specifies how Velero should
223-
behave if it encounters an error executing this
224-
hook.
225+
behave if it encounters an error executing
226+
this hook.
225227
enum:
226228
- Continue
227229
- Fail
@@ -243,7 +245,8 @@ spec:
243245
PreHooks is a list of BackupResourceHooks to execute prior to storing the item in the backup.
244246
These are executed before any "additional items" from item actions are processed.
245247
items:
246-
description: BackupResourceHook defines a hook for a resource.
248+
description: BackupResourceHook defines a hook for a
249+
resource.
247250
properties:
248251
exec:
249252
description: Exec defines an exec hook.
@@ -262,8 +265,8 @@ spec:
262265
type: string
263266
onError:
264267
description: OnError specifies how Velero should
265-
behave if it encounters an error executing this
266-
hook.
268+
behave if it encounters an error executing
269+
this hook.
267270
enum:
268271
- Continue
269272
- Fail
@@ -366,11 +369,13 @@ spec:
366369
items:
367370
type: string
368371
type: array
372+
x-kubernetes-list-type: atomic
369373
required:
370374
- key
371375
- operator
372376
type: object
373377
type: array
378+
x-kubernetes-list-type: atomic
374379
matchLabels:
375380
additionalProperties:
376381
type: string
@@ -402,16 +407,16 @@ spec:
402407
label selector matches no objects.
403408
properties:
404409
matchExpressions:
405-
description: matchExpressions is a list of label selector requirements.
406-
The requirements are ANDed.
410+
description: matchExpressions is a list of label selector
411+
requirements. The requirements are ANDed.
407412
items:
408413
description: |-
409414
A label selector requirement is a selector that contains values, a key, and an operator that
410415
relates the key and values.
411416
properties:
412417
key:
413-
description: key is the label key that the selector applies
414-
to.
418+
description: key is the label key that the selector
419+
applies to.
415420
type: string
416421
operator:
417422
description: |-
@@ -427,11 +432,13 @@ spec:
427432
items:
428433
type: string
429434
type: array
435+
x-kubernetes-list-type: atomic
430436
required:
431437
- key
432438
- operator
433439
type: object
434440
type: array
441+
x-kubernetes-list-type: atomic
435442
matchLabels:
436443
additionalProperties:
437444
type: string
@@ -487,16 +494,17 @@ spec:
487494
nullable: true
488495
type: boolean
489496
storageLocation:
490-
description: StorageLocation is a string containing the name of a
491-
BackupStorageLocation where the backup should be stored.
497+
description: StorageLocation is a string containing the name of
498+
a BackupStorageLocation where the backup should be stored.
492499
type: string
493500
ttl:
494501
description: |-
495502
TTL is a time.Duration-parseable string describing how long
496503
the Backup should be retained for.
497504
type: string
498505
uploaderConfig:
499-
description: UploaderConfig specifies the configuration for the uploader.
506+
description: UploaderConfig specifies the configuration for the
507+
uploader.
500508
nullable: true
501509
properties:
502510
parallelFilesUpload:
@@ -505,8 +513,8 @@ spec:
505513
type: integer
506514
type: object
507515
volumeSnapshotLocations:
508-
description: VolumeSnapshotLocations is a list containing names of
509-
VolumeSnapshotLocations associated with this backup.
516+
description: VolumeSnapshotLocations is a list containing names
517+
of VolumeSnapshotLocations associated with this backup.
510518
items:
511519
type: string
512520
type: array
@@ -568,8 +576,8 @@ spec:
568576
major, minor, and patch version.
569577
type: string
570578
hookStatus:
571-
description: HookStatus contains information about the status of the
572-
hooks.
579+
description: HookStatus contains information about the status of
580+
the hooks.
573581
nullable: true
574582
properties:
575583
hooksAttempted:
@@ -579,8 +587,8 @@ spec:
579587
and the number of hooks that executed successfully.
580588
type: integer
581589
hooksFailed:
582-
description: HooksFailed is the total number of hooks which ended
583-
with an error
590+
description: HooksFailed is the total number of hooks which
591+
ended with an error
584592
type: integer
585593
type: object
586594
phase:
@@ -659,4 +667,4 @@ spec:
659667
type: object
660668
type: object
661669
served: true
662-
storage: true
670+
storage: true

‎charts/velero-crds/templates/backupstoragelocations.yaml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
5+
annotations:
6+
controller-gen.kubebuilder.io/version: v0.16.5
57
labels:
68
component: velero
7-
annotations:
8-
controller-gen.kubebuilder.io/version: v0.14.0
99
name: backupstoragelocations.velero.io
1010
spec:
1111
group: velero.io
@@ -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 was
27-
validated
26+
- description: LastValidationTime is the last time the backup store location
27+
was 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 a
63-
Velero BackupStorageLocation
62+
description: BackupStorageLocationSpec defines the desired state of
63+
a Velero BackupStorageLocation
6464
properties:
6565
accessMode:
6666
description: AccessMode defines the permissions for the backup storage
@@ -84,14 +84,17 @@ spec:
8484
to be used with this location
8585
properties:
8686
key:
87-
description: The key of the secret to select from. Must be a
88-
valid secret key.
87+
description: The key of the secret to select from. Must be
88+
a valid secret key.
8989
type: string
9090
name:
91+
default: ""
9192
description: |-
9293
Name of the referent.
94+
This field is effectively required, but due to backwards compatibility is
95+
allowed to be empty. Instances of this type with an empty value here are
96+
almost certainly wrong.
9397
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
94-
TODO: Add other useful fields. apiVersion, kind, uid?
9598
type: string
9699
optional:
97100
description: Specify whether the Secret or its key must be defined
@@ -136,14 +139,13 @@ spec:
136139
- provider
137140
type: object
138141
status:
139-
description: BackupStorageLocationStatus defines the observed state of
140-
BackupStorageLocation
142+
description: BackupStorageLocationStatus defines the observed state
143+
of BackupStorageLocation
141144
properties:
142145
accessMode:
143146
description: |-
144147
AccessMode is an unused field.
145148
146-
147149
Deprecated: there is now an AccessMode field on the Spec and this field
148150
will be removed entirely as of v2.0.
149151
enum:
@@ -155,7 +157,6 @@ spec:
155157
LastSyncedRevision is the value of the `metadata/revision` file in the backup
156158
storage location the last time the BSL's contents were synced into the cluster.
157159
158-
159160
Deprecated: this field is no longer updated or used for detecting changes to
160161
the location's contents and will be removed entirely in v2.0.
161162
type: string
@@ -187,4 +188,4 @@ spec:
187188
type: object
188189
served: true
189190
storage: true
190-
subresources: {}
191+
subresources: {}

0 commit comments

Comments
 (0)