From fe9f0c516981da3e476998c6d9b1202b6cc93de9 Mon Sep 17 00:00:00 2001 From: Ming Qiu Date: Fri, 12 Jan 2024 11:34:45 +0800 Subject: [PATCH] [velero]Bump velero version v1.13.0 Signed-off-by: Ming Qiu --- charts/velero/Chart.yaml | 4 +-- charts/velero/README.md | 10 ++++--- charts/velero/ci/test-values.yaml | 2 +- charts/velero/crds/backups.yaml | 25 ++++++++++++++++++ charts/velero/crds/datadownloads.yaml | 2 ++ charts/velero/crds/datauploads.yaml | 2 ++ charts/velero/crds/downloadrequests.yaml | 1 + charts/velero/crds/podvolumebackups.yaml | 11 +++++--- charts/velero/crds/podvolumerestores.yaml | 7 +++++ charts/velero/crds/restores.yaml | 32 +++++++++++++++++++++++ charts/velero/crds/schedules.yaml | 25 ++++++++++++++++++ charts/velero/values.yaml | 6 ++--- 12 files changed, 114 insertions(+), 13 deletions(-) diff --git a/charts/velero/Chart.yaml b/charts/velero/Chart.yaml index afcd6ad8..e1ed7dfe 100644 --- a/charts/velero/Chart.yaml +++ b/charts/velero/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 1.12.3 +appVersion: 1.13.0 kubeVersion: ">=1.16.0-0" description: A Helm chart for velero name: velero -version: 5.2.2 +version: 5.3.0 home: https://github.com/vmware-tanzu/velero icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png sources: diff --git a/charts/velero/README.md b/charts/velero/README.md index 1ed1022e..d1bc1175 100644 --- a/charts/velero/README.md +++ b/charts/velero/README.md @@ -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.12/basic-install/#install-the-cli). +See the different options for installing the [Velero CLI](https://velero.io/docs/v1.13/basic-install/#install-the-cli). ## Installing the Velero server @@ -16,7 +16,7 @@ Kubernetes v1.16+, because this helm chart uses CustomResourceDefinition `apiext ### Velero version -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. +This helm chart installs Velero version v1.13 https://velero.io/docs/v1.13/. See the [#Upgrading](#upgrading) section for information on how to upgrade from other versions. ### Provider credentials @@ -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.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. +See Velero's full [official documentation](https://velero.io/docs/v1.13/basic-install/). More specifically, find your provider in the Velero list of [supported providers](https://velero.io/docs/v1.13/supported-providers/) for specific configuration information and examples. #### Set up Helm @@ -90,6 +90,10 @@ helm upgrade vmware-tanzu/velero --reuse-values --set configurati ## Upgrading +### Upgrading to v1.13 + +The [instructions found here](https://velero.io/docs/v1.13/upgrade-to-1.13/) will assist you in upgrading from version v1.12.x to v1.13. + ### 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. diff --git a/charts/velero/ci/test-values.yaml b/charts/velero/ci/test-values.yaml index 38278fb9..80d1fbfc 100644 --- a/charts/velero/ci/test-values.yaml +++ b/charts/velero/ci/test-values.yaml @@ -1,7 +1,7 @@ # Set provider name and backup storage location bucket name configuration: backupStorageLocation: - - name: backups-primary + - name: default bucket: velero-backups default: true provider: aws diff --git a/charts/velero/crds/backups.yaml b/charts/velero/crds/backups.yaml index b11a5703..d66826b0 100644 --- a/charts/velero/crds/backups.yaml +++ b/charts/velero/crds/backups.yaml @@ -479,6 +479,15 @@ spec: description: TTL is a time.Duration-parseable string describing how long the Backup should be retained for. type: string + uploaderConfig: + description: UploaderConfig specifies the configuration for the uploader. + nullable: true + properties: + parallelFilesUpload: + description: ParallelFilesUpload is the number of files parallel + uploads to perform when using the uploader. + type: integer + type: object volumeSnapshotLocations: description: VolumeSnapshotLocations is a list containing names of VolumeSnapshotLocations associated with this backup. @@ -537,6 +546,22 @@ spec: description: FormatVersion is the backup format version, including major, minor, and patch version. type: string + hookStatus: + description: HookStatus contains information about the status of the + hooks. + nullable: true + properties: + hooksAttempted: + description: HooksAttempted is the total number of attempted hooks + Specifically, HooksAttempted represents the number of hooks + that failed to execute and the number of hooks that executed + successfully. + type: integer + hooksFailed: + description: HooksFailed is the total number of hooks which ended + with an error + type: integer + type: object phase: description: Phase is the current state of the Backup. enum: diff --git a/charts/velero/crds/datadownloads.yaml b/charts/velero/crds/datadownloads.yaml index 610ee429..cc157aa3 100644 --- a/charts/velero/crds/datadownloads.yaml +++ b/charts/velero/crds/datadownloads.yaml @@ -50,6 +50,8 @@ spec: name: v2alpha1 schema: openAPIV3Schema: + description: DataDownload acts as the protocol between data mover plugins + and data mover controller for the datamover restore operation properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation diff --git a/charts/velero/crds/datauploads.yaml b/charts/velero/crds/datauploads.yaml index 62b33a2d..2226d62b 100644 --- a/charts/velero/crds/datauploads.yaml +++ b/charts/velero/crds/datauploads.yaml @@ -51,6 +51,8 @@ spec: name: v2alpha1 schema: openAPIV3Schema: + description: DataUpload acts as the protocol between data mover plugins and + data mover controller for the datamover backup operation properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation diff --git a/charts/velero/crds/downloadrequests.yaml b/charts/velero/crds/downloadrequests.yaml index 45d89943..51809b98 100644 --- a/charts/velero/crds/downloadrequests.yaml +++ b/charts/velero/crds/downloadrequests.yaml @@ -55,6 +55,7 @@ spec: - RestoreItemOperations - CSIBackupVolumeSnapshots - CSIBackupVolumeSnapshotContents + - BackupVolumeInfos type: string name: description: Name is the name of the Kubernetes resource with diff --git a/charts/velero/crds/podvolumebackups.yaml b/charts/velero/crds/podvolumebackups.yaml index be454da0..2830c5a4 100644 --- a/charts/velero/crds/podvolumebackups.yaml +++ b/charts/velero/crds/podvolumebackups.yaml @@ -37,10 +37,6 @@ spec: jsonPath: .spec.volume name: Volume type: string - - description: Backup repository identifier for this backup - jsonPath: .spec.repoIdentifier - name: Repository ID - type: string - description: The type of the uploader to handle data transfer jsonPath: .spec.uploaderType name: Uploader Type @@ -127,6 +123,13 @@ spec: description: Tags are a map of key-value pairs that should be applied to the volume backup as tags. type: object + uploaderSettings: + additionalProperties: + type: string + description: UploaderSettings are a map of key-value pairs that should + be applied to the uploader configuration. + nullable: true + type: object uploaderType: description: UploaderType is the type of the uploader to handle the data transfer. diff --git a/charts/velero/crds/podvolumerestores.yaml b/charts/velero/crds/podvolumerestores.yaml index 812a806e..4b74e72e 100644 --- a/charts/velero/crds/podvolumerestores.yaml +++ b/charts/velero/crds/podvolumerestores.yaml @@ -121,6 +121,13 @@ spec: description: SourceNamespace is the original namespace for namaspace mapping. type: string + uploaderSettings: + additionalProperties: + type: string + description: UploaderSettings are a map of key-value pairs that should + be applied to the uploader configuration. + nullable: true + type: object uploaderType: description: UploaderType is the type of the uploader to handle the data transfer. diff --git a/charts/velero/crds/restores.yaml b/charts/velero/crds/restores.yaml index 19c8b8f5..beb3f4c1 100644 --- a/charts/velero/crds/restores.yaml +++ b/charts/velero/crds/restores.yaml @@ -188,6 +188,12 @@ spec: - Continue - Fail type: string + waitForReady: + description: WaitForReady ensures command will + be launched when container is Ready instead + of Running. + nullable: true + type: boolean waitTimeout: description: WaitTimeout defines the maximum amount of time Velero should wait for the container @@ -414,6 +420,16 @@ spec: restore from the most recent successful backup created from this schedule. type: string + uploaderConfig: + description: UploaderConfig specifies the configuration for the restore. + nullable: true + properties: + writeSparseFiles: + description: WriteSparseFiles is a flag to indicate whether write + files sparsely or not. + nullable: true + type: boolean + type: object required: - backupName type: object @@ -436,6 +452,22 @@ spec: description: FailureReason is an error that caused the entire restore to fail. type: string + hookStatus: + description: HookStatus contains information about the status of the + hooks. + nullable: true + properties: + hooksAttempted: + description: HooksAttempted is the total number of attempted hooks + Specifically, HooksAttempted represents the number of hooks + that failed to execute and the number of hooks that executed + successfully. + type: integer + hooksFailed: + description: HooksFailed is the total number of hooks which ended + with an error + type: integer + type: object phase: description: Phase is the current state of the Restore enum: diff --git a/charts/velero/crds/schedules.yaml b/charts/velero/crds/schedules.yaml index d5083da8..5bfa8a65 100644 --- a/charts/velero/crds/schedules.yaml +++ b/charts/velero/crds/schedules.yaml @@ -63,6 +63,16 @@ spec: description: Schedule is a Cron expression defining when to run the Backup. type: string + skipImmediately: + description: 'SkipImmediately specifies whether to skip backup if + schedule is due immediately from `schedule.status.lastBackup` timestamp + when schedule is unpaused or if schedule is new. If true, backup + will be skipped immediately when schedule is unpaused if it is due + based on .Status.LastBackupTimestamp or schedule is new, and will + run at next schedule time. If false, backup will not be skipped + immediately when schedule is unpaused, but will run at next schedule + time. If empty, will follow server configuration (default: false).' + type: boolean template: description: Template is the definition of the Backup to be run on the provided schedule @@ -516,6 +526,16 @@ spec: description: TTL is a time.Duration-parseable string describing how long the Backup should be retained for. type: string + uploaderConfig: + description: UploaderConfig specifies the configuration for the + uploader. + nullable: true + properties: + parallelFilesUpload: + description: ParallelFilesUpload is the number of files parallel + uploads to perform when using the uploader. + type: integer + type: object volumeSnapshotLocations: description: VolumeSnapshotLocations is a list containing names of VolumeSnapshotLocations associated with this backup. @@ -541,6 +561,11 @@ spec: format: date-time nullable: true type: string + lastSkipped: + description: LastSkipped is the last time a Schedule was skipped + format: date-time + nullable: true + type: string phase: description: Phase is the current phase of the Schedule enum: diff --git a/charts/velero/values.yaml b/charts/velero/values.yaml index 791aa99e..b77dac59 100644 --- a/charts/velero/values.yaml +++ b/charts/velero/values.yaml @@ -33,7 +33,7 @@ namespace: # enabling node-agent). Required. image: repository: velero/velero - tag: v1.12.3 + tag: v1.13.0 # Digest value example: sha256:d238835e151cec91c6a811fe3a89a66d3231d9f64d09e5f3c49552672d271f38. # If used, it will take precedence over the image.tag. # digest: @@ -106,13 +106,13 @@ dnsPolicy: ClusterFirst # If the value is a string then it is evaluated as a template. initContainers: # - name: velero-plugin-for-csi - # image: velero/velero-plugin-for-csi:v0.6.0 + # image: velero/velero-plugin-for-csi:v0.7.0 # imagePullPolicy: IfNotPresent # volumeMounts: # - mountPath: /target # name: plugins # - name: velero-plugin-for-aws - # image: velero/velero-plugin-for-aws:v1.8.0 + # image: velero/velero-plugin-for-aws:v1.9.0 # imagePullPolicy: IfNotPresent # volumeMounts: # - mountPath: /target