Skip to content

Commit a2a0e74

Browse files
sseagosseago
authored
crd changes for velero konveyor-dev update pre-1.9 (#696)
1 parent 56ef24c commit a2a0e74

18 files changed

+837
-155
lines changed

‎bundle/manifests/velero.io_backups.yaml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,61 @@ spec:
312312
type: string
313313
type: object
314314
type: object
315+
orLabelSelectors:
316+
description: OrLabelSelectors is list of metav1.LabelSelector to filter
317+
with when adding individual objects to the backup. If multiple provided
318+
they will be joined by the OR operator. LabelSelector as well as
319+
OrLabelSelectors cannot co-exist in backup request, only one of
320+
them can be used.
321+
items:
322+
description: A label selector is a label query over a set of resources.
323+
The result of matchLabels and matchExpressions are ANDed. An empty
324+
label selector matches all objects. A null label selector matches
325+
no objects.
326+
properties:
327+
matchExpressions:
328+
description: matchExpressions is a list of label selector requirements.
329+
The requirements are ANDed.
330+
items:
331+
description: A label selector requirement is a selector that
332+
contains values, a key, and an operator that relates the
333+
key and values.
334+
properties:
335+
key:
336+
description: key is the label key that the selector applies
337+
to.
338+
type: string
339+
operator:
340+
description: operator represents a key's relationship
341+
to a set of values. Valid operators are In, NotIn, Exists
342+
and DoesNotExist.
343+
type: string
344+
values:
345+
description: values is an array of string values. If the
346+
operator is In or NotIn, the values array must be non-empty.
347+
If the operator is Exists or DoesNotExist, the values
348+
array must be empty. This array is replaced during a
349+
strategic merge patch.
350+
items:
351+
type: string
352+
type: array
353+
required:
354+
- key
355+
- operator
356+
type: object
357+
type: array
358+
matchLabels:
359+
additionalProperties:
360+
type: string
361+
description: matchLabels is a map of {key,value} pairs. A single
362+
{key,value} in the matchLabels map is equivalent to an element
363+
of matchExpressions, whose key field is "key", the operator
364+
is "In", and the values array contains only "value". The requirements
365+
are ANDed.
366+
type: object
367+
type: object
368+
nullable: true
369+
type: array
315370
orderedResources:
316371
additionalProperties:
317372
type: string
@@ -352,6 +407,14 @@ spec:
352407
format: date-time
353408
nullable: true
354409
type: string
410+
csiVolumeSnapshotsAttempted:
411+
description: CSIVolumeSnapshotsAttempted is the total number of attempted
412+
CSI VolumeSnapshots for this backup.
413+
type: integer
414+
csiVolumeSnapshotsCompleted:
415+
description: CSIVolumeSnapshotsCompleted is the total number of successfully
416+
completed CSI VolumeSnapshots for this backup.
417+
type: integer
355418
errors:
356419
description: Errors is a count of all error messages that were generated
357420
during execution of the backup. The actual errors are in the backup's
@@ -362,6 +425,10 @@ spec:
362425
format: date-time
363426
nullable: true
364427
type: string
428+
failureReason:
429+
description: FailureReason is an error that caused the entire backup
430+
to fail.
431+
type: string
365432
formatVersion:
366433
description: FormatVersion is the backup format version, including
367434
major, minor, and patch version.

‎bundle/manifests/velero.io_deletebackuprequests.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,16 @@ spec:
1414
singular: deletebackuprequest
1515
scope: Namespaced
1616
versions:
17-
- name: v1
17+
- additionalPrinterColumns:
18+
- description: The name of the backup to be deleted
19+
jsonPath: .spec.backupName
20+
name: BackupName
21+
type: string
22+
- description: The status of the deletion request
23+
jsonPath: .status.phase
24+
name: Status
25+
type: string
26+
name: v1
1827
schema:
1928
openAPIV3Schema:
2029
description: DeleteBackupRequest is a request to delete one or more backups.
@@ -61,6 +70,8 @@ spec:
6170
type: object
6271
served: true
6372
storage: true
73+
subresources:
74+
status: {}
6475
status:
6576
acceptedNames:
6677
kind: ""

‎bundle/manifests/velero.io_podvolumebackups.yaml

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,40 @@ spec:
1414
singular: podvolumebackup
1515
scope: Namespaced
1616
versions:
17-
- name: v1
17+
- additionalPrinterColumns:
18+
- description: Pod Volume Backup status such as New/InProgress
19+
jsonPath: .status.phase
20+
name: Status
21+
type: string
22+
- description: Time when this backup was started
23+
jsonPath: .status.startTimestamp
24+
name: Created
25+
type: date
26+
- description: Namespace of the pod containing the volume to be backed up
27+
jsonPath: .spec.pod.namespace
28+
name: Namespace
29+
type: string
30+
- description: Name of the pod containing the volume to be backed up
31+
jsonPath: .spec.pod.name
32+
name: Pod
33+
type: string
34+
- description: Name of the volume to be backed up
35+
jsonPath: .spec.volume
36+
name: Volume
37+
type: string
38+
- description: Restic repository identifier for this backup
39+
jsonPath: .spec.repoIdentifier
40+
name: Restic Repo
41+
type: string
42+
- description: Name of the Backup Storage Location where this backup should be
43+
stored
44+
jsonPath: .spec.backupStorageLocation
45+
name: Storage Location
46+
type: string
47+
- jsonPath: .metadata.creationTimestamp
48+
name: Age
49+
type: date
50+
name: v1
1851
schema:
1952
openAPIV3Schema:
2053
properties:
@@ -151,6 +184,8 @@ spec:
151184
type: object
152185
served: true
153186
storage: true
187+
subresources:
188+
status: {}
154189
status:
155190
acceptedNames:
156191
kind: ""

‎bundle/manifests/velero.io_podvolumerestores.yaml

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,37 @@ spec:
1414
singular: podvolumerestore
1515
scope: Namespaced
1616
versions:
17-
- name: v1
17+
- additionalPrinterColumns:
18+
- description: Namespace of the pod containing the volume to be restored
19+
jsonPath: .spec.pod.namespace
20+
name: Namespace
21+
type: string
22+
- description: Name of the pod containing the volume to be restored
23+
jsonPath: .spec.pod.name
24+
name: Pod
25+
type: string
26+
- description: Name of the volume to be restored
27+
jsonPath: .spec.volume
28+
name: Volume
29+
type: string
30+
- description: Pod Volume Restore status such as New/InProgress
31+
jsonPath: .status.phase
32+
name: Status
33+
type: string
34+
- description: Pod Volume Restore status such as New/InProgress
35+
format: int64
36+
jsonPath: .status.progress.totalBytes
37+
name: TotalBytes
38+
type: integer
39+
- description: Pod Volume Restore status such as New/InProgress
40+
format: int64
41+
jsonPath: .status.progress.bytesDone
42+
name: BytesDone
43+
type: integer
44+
- jsonPath: .metadata.creationTimestamp
45+
name: Age
46+
type: date
47+
name: v1
1848
schema:
1949
openAPIV3Schema:
2050
properties:
@@ -134,6 +164,8 @@ spec:
134164
type: object
135165
served: true
136166
storage: true
167+
subresources:
168+
status: {}
137169
status:
138170
acceptedNames:
139171
kind: ""

‎bundle/manifests/velero.io_resticrepositories.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ spec:
1414
singular: resticrepository
1515
scope: Namespaced
1616
versions:
17-
- name: v1
17+
- additionalPrinterColumns:
18+
- jsonPath: .metadata.creationTimestamp
19+
name: Age
20+
type: date
21+
name: v1
1822
schema:
1923
openAPIV3Schema:
2024
properties:
@@ -79,6 +83,8 @@ spec:
7983
type: object
8084
served: true
8185
storage: true
86+
subresources:
87+
status: {}
8288
status:
8389
acceptedNames:
8490
kind: ""

‎bundle/manifests/velero.io_restores.yaml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ spec:
5353
type: string
5454
nullable: true
5555
type: array
56+
existingResourcePolicy:
57+
description: ExistingResourcePolicy specifies the restore behaviour
58+
for the kubernetes resource to be restored
59+
nullable: true
60+
type: string
5661
hooks:
5762
description: Hooks represent custom behaviors that should be executed
5863
during or post restore.
@@ -1703,6 +1708,61 @@ spec:
17031708
included in the map will be restored into namespaces of the same
17041709
name.
17051710
type: object
1711+
orLabelSelectors:
1712+
description: OrLabelSelectors is list of metav1.LabelSelector to filter
1713+
with when restoring individual objects from the backup. If multiple
1714+
provided they will be joined by the OR operator. LabelSelector as
1715+
well as OrLabelSelectors cannot co-exist in restore request, only
1716+
one of them can be used
1717+
items:
1718+
description: A label selector is a label query over a set of resources.
1719+
The result of matchLabels and matchExpressions are ANDed. An empty
1720+
label selector matches all objects. A null label selector matches
1721+
no objects.
1722+
properties:
1723+
matchExpressions:
1724+
description: matchExpressions is a list of label selector requirements.
1725+
The requirements are ANDed.
1726+
items:
1727+
description: A label selector requirement is a selector that
1728+
contains values, a key, and an operator that relates the
1729+
key and values.
1730+
properties:
1731+
key:
1732+
description: key is the label key that the selector applies
1733+
to.
1734+
type: string
1735+
operator:
1736+
description: operator represents a key's relationship
1737+
to a set of values. Valid operators are In, NotIn, Exists
1738+
and DoesNotExist.
1739+
type: string
1740+
values:
1741+
description: values is an array of string values. If the
1742+
operator is In or NotIn, the values array must be non-empty.
1743+
If the operator is Exists or DoesNotExist, the values
1744+
array must be empty. This array is replaced during a
1745+
strategic merge patch.
1746+
items:
1747+
type: string
1748+
type: array
1749+
required:
1750+
- key
1751+
- operator
1752+
type: object
1753+
type: array
1754+
matchLabels:
1755+
additionalProperties:
1756+
type: string
1757+
description: matchLabels is a map of {key,value} pairs. A single
1758+
{key,value} in the matchLabels map is equivalent to an element
1759+
of matchExpressions, whose key field is "key", the operator
1760+
is "In", and the values array contains only "value". The requirements
1761+
are ANDed.
1762+
type: object
1763+
type: object
1764+
nullable: true
1765+
type: array
17061766
preserveNodePorts:
17071767
description: PreserveNodePorts specifies whether to restore old nodePorts
17081768
from backup.
@@ -1713,6 +1773,26 @@ spec:
17131773
PVs from snapshot (via the cloudprovider).
17141774
nullable: true
17151775
type: boolean
1776+
restoreStatus:
1777+
description: RestoreStatus specifies which resources we should restore
1778+
the status field. If nil, no objects are included. Optional.
1779+
nullable: true
1780+
properties:
1781+
excludedResources:
1782+
description: ExcludedResources specifies the resources to which
1783+
will not restore the status.
1784+
items:
1785+
type: string
1786+
nullable: true
1787+
type: array
1788+
includedResources:
1789+
description: IncludedResources specifies the resources to which
1790+
will restore the status. If empty, it applies to all resources.
1791+
items:
1792+
type: string
1793+
nullable: true
1794+
type: array
1795+
type: object
17161796
scheduleName:
17171797
description: ScheduleName is the unique name of the Velero schedule
17181798
to restore from. If specified, and BackupName is empty, Velero will

0 commit comments

Comments
 (0)