Skip to content

Commit 1e6a5b4

Browse files
[velero]Bump velero version v1.12.0 (#496)
* [velero]Bump velero version v1.12.0 Signed-off-by: Ming <[email protected]> * add label namespace Signed-off-by: Ming Qiu <[email protected]> * Fix Compare manifests github action Signed-off-by: Ming Qiu <[email protected]> * Update charts/velero/templates/label-namespace/labelnamespace.yaml --------- Signed-off-by: Ming <[email protected]> Signed-off-by: Ming Qiu <[email protected]> Co-authored-by: JenTing <[email protected]>
1 parent 7564a60 commit 1e6a5b4

18 files changed

+540
-116
lines changed

.github/workflows/verify-manifest.yml

+11-7
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,22 @@ jobs:
2828
- name: Compare manifests
2929
run: |
3030
cd charts/velero
31-
mkdir diff_workspace
32-
33-
echo "Filter non-required values"
34-
for yaml_file in crds/*.yaml; do
35-
yq -i 'del(.status)' "$yaml_file"
36-
done
31+
mkdir -p diff_workspace
3732
3833
echo "Generate velero manifest file"
3934
velero install --crds-only --dry-run -o yaml | kubectl apply --dry-run=client -f - -o yaml > diff_workspace/velero_manifest.yaml
35+
4036
echo "Generate crds manifest file"
4137
kubectl apply --dry-run=client -f crds/ -o yaml > diff_workspace/crds_manifest.yaml
4238
39+
echo "Filter non-required values"
40+
for yaml_file in diff_workspace/*.yaml; do
41+
yq -i '.items |= sort_by(.metadata.name)' "$yaml_file"
42+
yq -i 'del(.items[].metadata.creationTimestamp)' "$yaml_file"
43+
yq -i 'del(.items[].metadata.annotations."kubectl.kubernetes.io/last-applied-configuration")' "$yaml_file"
44+
yq -i 'del(.status)' "$yaml_file"
45+
done
46+
4347
echo "Compare the two files using diff"
4448
difference=$(diff diff_workspace/velero_manifest.yaml diff_workspace/crds_manifest.yaml) || true
4549
if [ -z "$difference" ]; then
@@ -48,4 +52,4 @@ jobs:
4852
echo "Differences between velero_manifest.yaml and crds_manifest.yaml:"
4953
echo "$difference"
5054
exit 1
51-
fi
55+
fi

charts/velero/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: v2
2-
appVersion: 1.11.1
2+
appVersion: 1.12.0
33
kubeVersion: ">=1.16.0-0"
44
description: A Helm chart for velero
55
name: velero
6-
version: 5.0.2
6+
version: 5.1.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/README.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Velero has two main components: a CLI, and a server-side Kubernetes deployment.
66

77
## Installing the Velero CLI
88

9-
See the different options for installing the [Velero CLI](https://velero.io/docs/v1.11/basic-install/#install-the-cli).
9+
See the different options for installing the [Velero CLI](https://velero.io/docs/v1.12/basic-install/#install-the-cli).
1010

1111
## Installing the Velero server
1212

@@ -16,7 +16,7 @@ Kubernetes v1.16+, because this helm chart uses CustomResourceDefinition `apiext
1616

1717
### Velero version
1818

19-
This helm chart installs Velero version v1.11 https://velero.io/docs/v1.11/. See the [#Upgrading](#upgrading) section for information on how to upgrade from other versions.
19+
This helm chart installs Velero version v1.12 https://velero.io/docs/v1.12/. See the [#Upgrading](#upgrading) section for information on how to upgrade from other versions.
2020

2121
### Provider credentials
2222

@@ -26,7 +26,7 @@ When installing using the Helm chart, the provider's credential information will
2626

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

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

3131
#### Set up Helm
3232

@@ -90,6 +90,10 @@ helm upgrade vmware-tanzu/velero <RELEASE NAME> --reuse-values --set configurati
9090

9191
## Upgrading
9292

93+
### Upgrading to v1.12
94+
95+
The [instructions found here](https://velero.io/docs/v1.12/upgrade-to-1.12/) will assist you in upgrading from version v1.11.x to v1.12.
96+
9397
### Upgrading to v1.11
9498

9599
The [instructions found here](https://velero.io/docs/v1.11/upgrade-to-1.11/) will assist you in upgrading from version v1.10.x to v1.11.

charts/velero/crds/backuprepositories.yaml

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
labels:
76
component: velero
87
annotations:
9-
controller-gen.kubebuilder.io/version: v0.7.0
10-
creationTimestamp: null
8+
controller-gen.kubebuilder.io/version: v0.12.0
119
name: backuprepositories.velero.io
1210
spec:
1311
group: velero.io
@@ -98,9 +96,3 @@ spec:
9896
served: true
9997
storage: true
10098
subresources: {}
101-
status:
102-
acceptedNames:
103-
kind: ""
104-
plural: ""
105-
conditions: []
106-
storedVersions: []

charts/velero/crds/backups.yaml

+15-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
labels:
76
component: velero
87
annotations:
9-
controller-gen.kubebuilder.io/version: v0.7.0
10-
creationTimestamp: null
8+
controller-gen.kubebuilder.io/version: v0.12.0
119
name: backups.velero.io
1210
spec:
1311
group: velero.io
@@ -44,6 +42,11 @@ spec:
4442
CSI VolumeSnapshot status turns to ReadyToUse during creation, before
4543
returning error as timeout. The default value is 10 minute.
4644
type: string
45+
datamover:
46+
description: DataMover specifies the data mover to be used by the
47+
backup. If DataMover is "" or "velero", the built-in data mover
48+
will be used.
49+
type: string
4750
defaultVolumesToFsBackup:
4851
description: DefaultVolumesToFsBackup specifies whether pod volume
4952
file system backup should be used for all volumes by default.
@@ -177,6 +180,7 @@ spec:
177180
contains only "value". The requirements are ANDed.
178181
type: object
179182
type: object
183+
x-kubernetes-map-type: atomic
180184
name:
181185
description: Name is the name of this hook.
182186
type: string
@@ -362,6 +366,7 @@ spec:
362366
are ANDed.
363367
type: object
364368
type: object
369+
x-kubernetes-map-type: atomic
365370
metadata:
366371
properties:
367372
labels:
@@ -422,6 +427,7 @@ spec:
422427
are ANDed.
423428
type: object
424429
type: object
430+
x-kubernetes-map-type: atomic
425431
nullable: true
426432
type: array
427433
orderedResources:
@@ -454,6 +460,12 @@ spec:
454460
- kind
455461
- name
456462
type: object
463+
x-kubernetes-map-type: atomic
464+
snapshotMoveData:
465+
description: SnapshotMoveData specifies whether snapshot data should
466+
be moved
467+
nullable: true
468+
type: boolean
457469
snapshotVolumes:
458470
description: SnapshotVolumes specifies whether to take snapshots of
459471
any PV's referenced in the set of objects included in the Backup.
@@ -593,9 +605,3 @@ spec:
593605
type: object
594606
served: true
595607
storage: true
596-
status:
597-
acceptedNames:
598-
kind: ""
599-
plural: ""
600-
conditions: []
601-
storedVersions: []

charts/velero/crds/backupstoragelocations.yaml

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
labels:
76
component: velero
87
annotations:
9-
controller-gen.kubebuilder.io/version: v0.7.0
10-
creationTimestamp: null
8+
controller-gen.kubebuilder.io/version: v0.12.0
119
name: backupstoragelocations.velero.io
1210
spec:
1311
group: velero.io
@@ -94,6 +92,7 @@ spec:
9492
required:
9593
- key
9694
type: object
95+
x-kubernetes-map-type: atomic
9796
default:
9897
description: Default indicates this location is the default backup
9998
storage location.
@@ -175,9 +174,3 @@ spec:
175174
served: true
176175
storage: true
177176
subresources: {}
178-
status:
179-
acceptedNames:
180-
kind: ""
181-
plural: ""
182-
conditions: []
183-
storedVersions: []

charts/velero/crds/datadownloads.yaml

+178
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
---
2+
apiVersion: apiextensions.k8s.io/v1
3+
kind: CustomResourceDefinition
4+
metadata:
5+
labels:
6+
component: velero
7+
annotations:
8+
controller-gen.kubebuilder.io/version: v0.12.0
9+
name: datadownloads.velero.io
10+
spec:
11+
group: velero.io
12+
names:
13+
kind: DataDownload
14+
listKind: DataDownloadList
15+
plural: datadownloads
16+
singular: datadownload
17+
scope: Namespaced
18+
versions:
19+
- additionalPrinterColumns:
20+
- description: DataDownload status such as New/InProgress
21+
jsonPath: .status.phase
22+
name: Status
23+
type: string
24+
- description: Time duration since this DataDownload was started
25+
jsonPath: .status.startTimestamp
26+
name: Started
27+
type: date
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
38+
- description: Name of the Backup Storage Location where the backup data is stored
39+
jsonPath: .spec.backupStorageLocation
40+
name: Storage Location
41+
type: string
42+
- description: Time duration since this DataDownload was created
43+
jsonPath: .metadata.creationTimestamp
44+
name: Age
45+
type: date
46+
- description: Name of the node where the DataDownload is processed
47+
jsonPath: .status.node
48+
name: Node
49+
type: string
50+
name: v2alpha1
51+
schema:
52+
openAPIV3Schema:
53+
properties:
54+
apiVersion:
55+
description: 'APIVersion defines the versioned schema of this representation
56+
of an object. Servers should convert recognized schemas to the latest
57+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
58+
type: string
59+
kind:
60+
description: 'Kind is a string value representing the REST resource this
61+
object represents. Servers may infer this from the endpoint the client
62+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
63+
type: string
64+
metadata:
65+
type: object
66+
spec:
67+
description: DataDownloadSpec is the specification for a DataDownload.
68+
properties:
69+
backupStorageLocation:
70+
description: BackupStorageLocation is the name of the backup storage
71+
location where the backup repository is stored.
72+
type: string
73+
cancel:
74+
description: Cancel indicates request to cancel the ongoing DataDownload.
75+
It can be set when the DataDownload is in InProgress phase
76+
type: boolean
77+
dataMoverConfig:
78+
additionalProperties:
79+
type: string
80+
description: DataMoverConfig is for data-mover-specific configuration
81+
fields.
82+
type: object
83+
datamover:
84+
description: DataMover specifies the data mover to be used by the
85+
backup. If DataMover is "" or "velero", the built-in data mover
86+
will be used.
87+
type: string
88+
operationTimeout:
89+
description: OperationTimeout specifies the time used to wait internal
90+
operations, before returning error as timeout.
91+
type: string
92+
snapshotID:
93+
description: SnapshotID is the ID of the Velero backup snapshot to
94+
be restored from.
95+
type: string
96+
sourceNamespace:
97+
description: SourceNamespace is the original namespace where the volume
98+
is backed up from. It may be different from SourcePVC's namespace
99+
if namespace is remapped during restore.
100+
type: string
101+
targetVolume:
102+
description: TargetVolume is the information of the target PVC and
103+
PV.
104+
properties:
105+
namespace:
106+
description: Namespace is the target namespace
107+
type: string
108+
pv:
109+
description: PV is the name of the target PV that is created by
110+
Velero restore
111+
type: string
112+
pvc:
113+
description: PVC is the name of the target PVC that is created
114+
by Velero restore
115+
type: string
116+
required:
117+
- namespace
118+
- pv
119+
- pvc
120+
type: object
121+
required:
122+
- backupStorageLocation
123+
- operationTimeout
124+
- snapshotID
125+
- sourceNamespace
126+
- targetVolume
127+
type: object
128+
status:
129+
description: DataDownloadStatus is the current status of a DataDownload.
130+
properties:
131+
completionTimestamp:
132+
description: CompletionTimestamp records the time a restore was completed.
133+
Completion time is recorded even on failed restores. The server's
134+
time is used for CompletionTimestamps
135+
format: date-time
136+
nullable: true
137+
type: string
138+
message:
139+
description: Message is a message about the DataDownload's status.
140+
type: string
141+
node:
142+
description: Node is name of the node where the DataDownload is processed.
143+
type: string
144+
phase:
145+
description: Phase is the current state of the DataDownload.
146+
enum:
147+
- New
148+
- Accepted
149+
- Prepared
150+
- InProgress
151+
- Canceling
152+
- Canceled
153+
- Completed
154+
- Failed
155+
type: string
156+
progress:
157+
description: Progress holds the total number of bytes of the snapshot
158+
and the current number of restored bytes. This can be used to display
159+
progress information about the restore operation.
160+
properties:
161+
bytesDone:
162+
format: int64
163+
type: integer
164+
totalBytes:
165+
format: int64
166+
type: integer
167+
type: object
168+
startTimestamp:
169+
description: StartTimestamp records the time a restore was started.
170+
The server's time is used for StartTimestamps
171+
format: date-time
172+
nullable: true
173+
type: string
174+
type: object
175+
type: object
176+
served: true
177+
storage: true
178+
subresources: {}

0 commit comments

Comments
 (0)