Skip to content

Commit

Permalink
[velero]Bump velero version v1.12.0 (#496)
Browse files Browse the repository at this point in the history
* [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]>
  • Loading branch information
qiuming-best and jenting authored Oct 6, 2023
1 parent 7564a60 commit 1e6a5b4
Show file tree
Hide file tree
Showing 18 changed files with 540 additions and 116 deletions.
18 changes: 11 additions & 7 deletions .github/workflows/verify-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,22 @@ jobs:
- name: Compare manifests
run: |
cd charts/velero
mkdir diff_workspace
echo "Filter non-required values"
for yaml_file in crds/*.yaml; do
yq -i 'del(.status)' "$yaml_file"
done
mkdir -p diff_workspace
echo "Generate velero manifest file"
velero install --crds-only --dry-run -o yaml | kubectl apply --dry-run=client -f - -o yaml > diff_workspace/velero_manifest.yaml
echo "Generate crds manifest file"
kubectl apply --dry-run=client -f crds/ -o yaml > diff_workspace/crds_manifest.yaml
echo "Filter non-required values"
for yaml_file in diff_workspace/*.yaml; do
yq -i '.items |= sort_by(.metadata.name)' "$yaml_file"
yq -i 'del(.items[].metadata.creationTimestamp)' "$yaml_file"
yq -i 'del(.items[].metadata.annotations."kubectl.kubernetes.io/last-applied-configuration")' "$yaml_file"
yq -i 'del(.status)' "$yaml_file"
done
echo "Compare the two files using diff"
difference=$(diff diff_workspace/velero_manifest.yaml diff_workspace/crds_manifest.yaml) || true
if [ -z "$difference" ]; then
Expand All @@ -48,4 +52,4 @@ jobs:
echo "Differences between velero_manifest.yaml and crds_manifest.yaml:"
echo "$difference"
exit 1
fi
fi
4 changes: 2 additions & 2 deletions charts/velero/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v2
appVersion: 1.11.1
appVersion: 1.12.0
kubeVersion: ">=1.16.0-0"
description: A Helm chart for velero
name: velero
version: 5.0.2
version: 5.1.0
home: https://github.com/vmware-tanzu/velero
icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
sources:
Expand Down
10 changes: 7 additions & 3 deletions charts/velero/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Velero has two main components: a CLI, and a server-side Kubernetes deployment.

## Installing the Velero CLI

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

## Installing the Velero server

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

### Velero version

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.
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.

### Provider credentials

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

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

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.
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.

#### Set up Helm

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

## Upgrading

### Upgrading to v1.12

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.

### Upgrading to v1.11

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.
Expand Down
10 changes: 1 addition & 9 deletions charts/velero/crds/backuprepositories.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
component: velero
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.0
name: backuprepositories.velero.io
spec:
group: velero.io
Expand Down Expand Up @@ -98,9 +96,3 @@ spec:
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
24 changes: 15 additions & 9 deletions charts/velero/crds/backups.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
component: velero
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.0
name: backups.velero.io
spec:
group: velero.io
Expand Down Expand Up @@ -44,6 +42,11 @@ spec:
CSI VolumeSnapshot status turns to ReadyToUse during creation, before
returning error as timeout. The default value is 10 minute.
type: string
datamover:
description: DataMover specifies the data mover to be used by the
backup. If DataMover is "" or "velero", the built-in data mover
will be used.
type: string
defaultVolumesToFsBackup:
description: DefaultVolumesToFsBackup specifies whether pod volume
file system backup should be used for all volumes by default.
Expand Down Expand Up @@ -177,6 +180,7 @@ spec:
contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
name:
description: Name is the name of this hook.
type: string
Expand Down Expand Up @@ -362,6 +366,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
metadata:
properties:
labels:
Expand Down Expand Up @@ -422,6 +427,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
nullable: true
type: array
orderedResources:
Expand Down Expand Up @@ -454,6 +460,12 @@ spec:
- kind
- name
type: object
x-kubernetes-map-type: atomic
snapshotMoveData:
description: SnapshotMoveData specifies whether snapshot data should
be moved
nullable: true
type: boolean
snapshotVolumes:
description: SnapshotVolumes specifies whether to take snapshots of
any PV's referenced in the set of objects included in the Backup.
Expand Down Expand Up @@ -593,9 +605,3 @@ spec:
type: object
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
11 changes: 2 additions & 9 deletions charts/velero/crds/backupstoragelocations.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
component: velero
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.0
name: backupstoragelocations.velero.io
spec:
group: velero.io
Expand Down Expand Up @@ -94,6 +92,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
default:
description: Default indicates this location is the default backup
storage location.
Expand Down Expand Up @@ -175,9 +174,3 @@ spec:
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
178 changes: 178 additions & 0 deletions charts/velero/crds/datadownloads.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
component: velero
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: datadownloads.velero.io
spec:
group: velero.io
names:
kind: DataDownload
listKind: DataDownloadList
plural: datadownloads
singular: datadownload
scope: Namespaced
versions:
- additionalPrinterColumns:
- description: DataDownload status such as New/InProgress
jsonPath: .status.phase
name: Status
type: string
- description: Time duration since this DataDownload was started
jsonPath: .status.startTimestamp
name: Started
type: date
- description: Completed bytes
format: int64
jsonPath: .status.progress.bytesDone
name: Bytes Done
type: integer
- description: Total bytes
format: int64
jsonPath: .status.progress.totalBytes
name: Total Bytes
type: integer
- description: Name of the Backup Storage Location where the backup data is stored
jsonPath: .spec.backupStorageLocation
name: Storage Location
type: string
- description: Time duration since this DataDownload was created
jsonPath: .metadata.creationTimestamp
name: Age
type: date
- description: Name of the node where the DataDownload is processed
jsonPath: .status.node
name: Node
type: string
name: v2alpha1
schema:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: DataDownloadSpec is the specification for a DataDownload.
properties:
backupStorageLocation:
description: BackupStorageLocation is the name of the backup storage
location where the backup repository is stored.
type: string
cancel:
description: Cancel indicates request to cancel the ongoing DataDownload.
It can be set when the DataDownload is in InProgress phase
type: boolean
dataMoverConfig:
additionalProperties:
type: string
description: DataMoverConfig is for data-mover-specific configuration
fields.
type: object
datamover:
description: DataMover specifies the data mover to be used by the
backup. If DataMover is "" or "velero", the built-in data mover
will be used.
type: string
operationTimeout:
description: OperationTimeout specifies the time used to wait internal
operations, before returning error as timeout.
type: string
snapshotID:
description: SnapshotID is the ID of the Velero backup snapshot to
be restored from.
type: string
sourceNamespace:
description: SourceNamespace is the original namespace where the volume
is backed up from. It may be different from SourcePVC's namespace
if namespace is remapped during restore.
type: string
targetVolume:
description: TargetVolume is the information of the target PVC and
PV.
properties:
namespace:
description: Namespace is the target namespace
type: string
pv:
description: PV is the name of the target PV that is created by
Velero restore
type: string
pvc:
description: PVC is the name of the target PVC that is created
by Velero restore
type: string
required:
- namespace
- pv
- pvc
type: object
required:
- backupStorageLocation
- operationTimeout
- snapshotID
- sourceNamespace
- targetVolume
type: object
status:
description: DataDownloadStatus is the current status of a DataDownload.
properties:
completionTimestamp:
description: CompletionTimestamp records the time a restore was completed.
Completion time is recorded even on failed restores. The server's
time is used for CompletionTimestamps
format: date-time
nullable: true
type: string
message:
description: Message is a message about the DataDownload's status.
type: string
node:
description: Node is name of the node where the DataDownload is processed.
type: string
phase:
description: Phase is the current state of the DataDownload.
enum:
- New
- Accepted
- Prepared
- InProgress
- Canceling
- Canceled
- Completed
- Failed
type: string
progress:
description: Progress holds the total number of bytes of the snapshot
and the current number of restored bytes. This can be used to display
progress information about the restore operation.
properties:
bytesDone:
format: int64
type: integer
totalBytes:
format: int64
type: integer
type: object
startTimestamp:
description: StartTimestamp records the time a restore was started.
The server's time is used for StartTimestamps
format: date-time
nullable: true
type: string
type: object
type: object
served: true
storage: true
subresources: {}
Loading

0 comments on commit 1e6a5b4

Please sign in to comment.