Skip to content

Commit

Permalink
repo init
Browse files Browse the repository at this point in the history
Signed-off-by: Lyndon-Li <[email protected]>

Clean backups after each test and fix exlude label test issue

1. Clean backups after each test to avoid exceeding limitation of storage capability during E2E test;
2. Fix exlude label test issue that namespace should not be included and excluded at the same time no matter by which way to config.

Signed-off-by: danfengl <[email protected]>

Remove reference to non-existent doc

fixes vmware-tanzu#4923

Signed-off-by: Daniel Jiang <[email protected]>

Uploader Implementation: Kopia backup and restore

Signed-off-by: Ming <[email protected]>

update upstream codes

Signed-off-by: Ming <[email protected]>

refactor gc controller with kubebuilder

Signed-off-by: allenxu404 <[email protected]>

add OADP to adopters list

Signed-off-by: Shubham Pampattiwar <[email protected]>

fix typo

Signed-off-by: Shubham Pampattiwar <[email protected]>

check vsc null pointer

Signed-off-by: 李龙峰 <[email protected]>

kopia lib

Signed-off-by: Lyndon-Li <[email protected]>

Move the code in pkg/restic/common.go to the proper package

Move the code in pkg/restic/common.go to the proper package

Fixes vmware-tanzu#5243

Signed-off-by: Wenkai Yin(尹文开) <[email protected]>

Don't panic when storageClassName is not set in stateful sets

Signed-off-by: divolgin <[email protected]>

Controller refactor code modifications.

1. Add some refactored controllers initiation code into enabledRuntimeControllers.
2. Add reconciler struct initiation function for DownloadRequest and ServerStatusRequest controllers.

Signed-off-by: Xun Jiang <[email protected]>

equip gc controller with configurable frequency

Signed-off-by: allenxu404 <[email protected]>

Update the website of velero to refelct the change of PM (vmware-tanzu#5260)

Signed-off-by: Daniel Jiang <[email protected]>

Signed-off-by: Daniel Jiang <[email protected]>

Migrate backup sync controller from code-generator to kubebuilder (vmware-tanzu#5218)

* Migrate backup sync controller from code-generator to kubebuilder

1. use kubebuilder's reconcile logic to replace controller's old logic.
2. use ginkgo and gomega to replace testing.
3. modify BSL reconciler registration method.

Signed-off-by: Xun Jiang <[email protected]>

* Add Option for PeriodicalEnqueueSource.

Signed-off-by: Xun Jiang <[email protected]>

Signed-off-by: Xun Jiang <[email protected]>
Co-authored-by: Xun Jiang <[email protected]>

Refactor BackupItemAction to backupitemaction/v1

Signed-off-by: Hoang, Phuong <[email protected]>

Add changelog

Signed-off-by: Hoang, Phuong <[email protected]>

Add missing file

Signed-off-by: Hoang, Phuong <[email protected]>

renamed update files so that protoc is run before CRD update.

If generating protoc go files from scratch, `make update` fails if
CRD generation happens first, since the protoc-generated
files are imported by the api go files.
protoc generation needs to happen earlier.

Signed-off-by: Scott Seago <[email protected]>

updated to newer protoc/protoc-gen-go

Signed-off-by: Scott Seago <[email protected]>

Updated plugin/framework server files to cope with protoc changes

Signed-off-by: Scott Seago <[email protected]>

some additional debug logs

Signed-off-by: Scott Seago <[email protected]>

fix edge cases for already exists resources

Signed-off-by: Shubham Pampattiwar <[email protected]>

add changelog file

Signed-off-by: Shubham Pampattiwar <[email protected]>

update changelog filename

Signed-off-by: Shubham Pampattiwar <[email protected]>

change log level and error type

Signed-off-by: Shubham Pampattiwar <[email protected]>

Uploader Implementation: Restic backup and restore

Signed-off-by: Ming <[email protected]>

merge upstream code

Signed-off-by: Ming <[email protected]>

Add enable API group on k8s resources E2E test upon issue vmware-tanzu#5146

Signed-off-by: danfengl <[email protected]>

Check for empty ns list before checking nslist[0]

In determining whether a backup includes all namespaces, item_collector
checks for an empty string in the first element of the ns list. If processing
includes+excludes results in an empty list, treat this as another case
of a not-all-namespaces backup rather than crashing velero.

Signed-off-by: Scott Seago <[email protected]>

Kopia Pod Volume Backup/Restore (vmware-tanzu#5259)

* kopia pvbr

Signed-off-by: Lyndon-Li <[email protected]>

chore: remove duplicate word in comments

Signed-off-by: Abirdcfly <[email protected]>

add CSISnapshotTimeout for describe backup

Signed-off-by: cleverhu <[email protected]>

kopia pvbr smoking test changes

Signed-off-by: Lyndon-Li <[email protected]>

trim isAlreadyExistsError for restore

Signed-off-by: cleverhu <[email protected]>

refactor repo ensurer

Signed-off-by: Lyndon-Li <[email protected]>

Add credentials to volume snapshot locations.

This is analogous to the BSL creds work that was done previously, but for VSLs instead.

Signed-off-by: Scott Seago <[email protected]>

fix issue 4874

Signed-off-by: Lyndon-Li <[email protected]>

issue fix 4874 update

Signed-off-by: Lyndon-Li <[email protected]>

add shorthand for labels columns

Signed-off-by: cleverhu <[email protected]>

Fix PVB finds wrong parent snapshot

Signed-off-by: Ming <[email protected]>

Fix restore cmd extraflag overwrite bug

Signed-off-by: Ming <[email protected]>

Don't move velero v1 plugins to new proto dir

To preserve backwards compatibility, don't move velero
v1 plugins to new proto dir.

Signed-off-by: Scott Seago <[email protected]>

Change the status of restore to completed from partially failed when restore empty backup

Signed-off-by: allenxu404 <[email protected]>

plugin/clientmgmt refactoring for BackupItemAction v1

Refactors the clientmgmt package to implement the plugin versioning changes
needed for BIA v1 and overall package refactoring to support plugin versions
in different packages. This should be all that's needed to move on to
v2 for BackupItemAction. The remaining plugin types still need similar
refactoring to what's being done here for BIA before attempting a
v2 implementation.

Signed-off-by: Scott Seago <[email protected]>

plugin/framework refactoring for BackupItemAction v1

Refactors the framework  package to implement the plugin versioning changes
needed for BIA v1 and overall package refactoring to support plugin versions
in different packages. This should be all that's needed to move on to
v2 for BackupItemAction. The remaining plugin types still need similar
refactoring to what's being done here for BIA before attempting a
v2 implementation.

Signed-off-by: Scott Seago <[email protected]>

Remove github.com/apex/log logger.

Signed-off-by: Xun Jiang <[email protected]>

cancel downloadRequest checkFunc if timeout passed

Signed-off-by: Tiger Kaovilai <[email protected]>

fix issue 5352

Signed-off-by: Lyndon-Li <[email protected]>

fix issue 5358

Signed-off-by: Lyndon-Li <[email protected]>

Clarify the help message for the default value of parameter --snapshot-volumes, when it's not set.

Signed-off-by: Xun Jiang <[email protected]>

Support pause/unpause schedules

Support pause/unpause schedule

Fixes vmware-tanzu#2363

Signed-off-by: Wenkai Yin(尹文开) <[email protected]>

RestoreItemAction v1 refactoring for plugin api versioning

Signed-off-by: Scott Seago <[email protected]>

add useOwnerReferencesInBackup field doc

Signed-off-by: cleverhu <[email protected]>

Fix issue of fail to get command output for test verification

When running velero backup/restore command, if the command result is "PartiallyFailed", it won't reture error as design, but we do need to know the debug information to figure out the reason, so the command output is needed to get the command result, then further action will be taken.

Signed-off-by: danfengl <[email protected]>

rename pvbr param (vmware-tanzu#5370)

Signed-off-by: Lyndon-Li <[email protected]>

plugin versioning v1 refactor for VolumeSnapshotter

Signed-off-by: Scott Seago <[email protected]>

Remove snapshot related lister, informer and client from backup controller. (vmware-tanzu#5299)

Signed-off-by: Xun Jiang <[email protected]>

 Add schedule backup timing E2E test

Signed-off-by: danfengl <[email protected]>

fix issue 5386

Signed-off-by: Lyndon-Li <[email protected]>

Added backupController's UT to test the prepareBackupRequest() method BackupStorageLocation processing logic

Signed-off-by: Niu Lechuan <[email protected]>

add change log

Signed-off-by: Niu Lechuan <[email protected]>

Add Kopia support for Velero installation in E2E test

Signed-off-by: danfengl <[email protected]>

Add backup opt-in/opt-out E2E test

Signed-off-by: danfengl <[email protected]>

Fix Test_prepareBackupRequest_BackupStorageLocation UT failure.

Signed-off-by: Xun Jiang <[email protected]>

Fix restore error with flag namespace-mappings (vmware-tanzu#5377)

Signed-off-by: Ming <[email protected]>

A little note about TTL expiration

I think is necessary this little comment about TTL expiration, because it can be confusing when the expiration time has passed and the data allocated and the snapshots are not erased at that time.

Signed-off-by: Aaron Arias <[email protected]>

Add backup status checking schedule controller. (vmware-tanzu#5283)

Signed-off-by: Xun Jiang <[email protected]>

Signed-off-by: Xun Jiang <[email protected]>
Signed-off-by: Xun Jiang/Bruce Jiang <[email protected]>
Co-authored-by: Xun Jiang <[email protected]>

Exclude "csinodes.storage.k8s.io" and "volumeattachments.storage.k8s.io" from backup and restore by default. (vmware-tanzu#5064)

Signed-off-by: Xun Jiang <[email protected]>

Signed-off-by: Xun Jiang <[email protected]>
Signed-off-by: Xun Jiang/Bruce Jiang <[email protected]>

Fix issues of E2E test for API group, migration and pv opt-out backup

1. One of API group test failed due to other PR with fix for treat PartiallyFailed as failure to collect debugbundle without wrap the origin error;
2. Fix migration test issue of wrong velero cli for backup commmand;
3. Fix wrong pararmeter name issue for pv opt-out backup test.

Signed-off-by: danfengl <[email protected]>

update velero using klog to version v2.9.0 (vmware-tanzu#5396)

Signed-off-by: Xun Jiang <[email protected]>

Signed-off-by: Xun Jiang <[email protected]>
Co-authored-by: Xun Jiang <[email protected]>

Change B/R describe cli to support kopia

Signed-off-by: allenxu404 <[email protected]>

Update Maintainers with the new PM pradeepkchaturvedi

Signed-off-by: OrlinVasilev <[email protected]>

Update Maintainers with the new PM pradeepkchaturvedi

Signed-off-by: OrlinVasilev <[email protected]>

rename daemonset (vmware-tanzu#5390)

Signed-off-by: Lyndon-Li <[email protected]>

Signed-off-by: Lyndon-Li <[email protected]>

Skip the exclusion check for additional resources returned by BIA

This commit provides a simple contract that if the BackupItemAction
plugin sets an annotation in a resource it has handled, the additional
items will considered "must include" i.e. each of them will skip the
"include-exclude" filter, such that the plugin developer can make sure
they are included in the backup disregarding the filter setting in the
bakcup CR.

Signed-off-by: Daniel Jiang <[email protected]>

moved RIA execute input/output structs back to velero package

The RIA refactoring moved velero.RestoreItemAction into a separate
(restoreitemaction) v1 package. Unfortunately, this change would require
plugins to make code changes to locate the RestoreItemActionExecuteInput
and RestoreItemActionExecuteOutput structs.

This commit restores those structs to the original velero package, leaving
just the RestoreItemAction interface in the new v1 package.

Signed-off-by: Scott Seago <[email protected]>

fix-ctx-issue

1. Fix issue of kubectl client and server mismatch version in GitAction E2E job, refer to elastic/cloud-on-k8s#4737;
2. Adapt to the changing of keyword for involing Kpoia as fs backupper, new installtion breaked upgrade and migration tests;
3. Accept multi-labels of Ginkgo focus as input of E2E make command;
4. Distinguish workload namespace from each tests;
5. Fix issues of not using Velero util to perform Velero commands;
6. Add snapshot test case for NamespaceMapping E2E test;
7. Collect debug bundle after catching error of Velero backup or restore command;
Signed-off-by: danfengl <[email protected]>

Pod Volume Backup/Restore Refactor: Rename Init Helper (vmware-tanzu#5432)

* restore helper refactor

Signed-off-by: Lyndon-Li <[email protected]>

* resolve codespell

Signed-off-by: Lyndon-Li <[email protected]>

Signed-off-by: Lyndon-Li <[email protected]>

remove restic from code

Signed-off-by: Lyndon-Li <[email protected]>

Change subcommand restic to repo

Signed-off-by: allenxu404 <[email protected]>

Bump Go to 1.18

Signed-off-by: Gábor Lipták <[email protected]>

upgrade velero docker image

Signed-off-by: Lyndon-Li <[email protected]>

fix lint errors

Signed-off-by: Lyndon-Li <[email protected]>

fix lint loop iterator problem

Signed-off-by: Lyndon-Li <[email protected]>

Add CSI VolumeSnapshot client back. (vmware-tanzu#5449)

Signed-off-by: Xun Jiang <[email protected]>

Add nil check before execution of csi snapshot delete

Signed-off-by: Shubham Pampattiwar <[email protected]>

add changelog

Signed-off-by: Shubham Pampattiwar <[email protected]>

change CSISnapshotTimeout from point to normal var

Signed-off-by: cleverhu <[email protected]>

Fix CVE-2022-27191

https://nvd.nist.gov/vuln/detail/CVE-2022-27191
updates to:
  * golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
adds:
  * golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2

Signed-off-by: Wesley Hayutin <[email protected]>

Resolve gopkg.in/yaml.v3 vulnerabilities

as shown from https://security.snyk.io/package/golang/gopkg.in%2Fyaml.v3

Signed-off-by: Tiger Kaovilai <[email protected]>

increase ensure restic repository timeout (vmware-tanzu#5335)

Signed-off-by: Shubham Pampattiwar <[email protected]>

Fix label naming  issue for restore helper (vmware-tanzu#5469)

Signed-off-by: danfengl <[email protected]>

Add more nil pointer check for CSI related code in backup controller. (vmware-tanzu#5388)

Add some corner cases checking for CSI snapshot in backup controller.

Signed-off-by: Xun Jiang <[email protected]>

update k8s.io dependencies to 0.24.0
* This also required an update to use github.com/bombsimon/logrusr/v3
* 'WithClusterName' removed as per the k8s doc reasoning:
* https://github.com/kubernetes/apimachinery/blob/release-1.24/pkg/apis/meta/v1/types.go\#L257-L259
* ('ClusterName was a legacy field that was always cleared by the system and never used')
* Test was updated accordingly

Signed-off-by: Kira Boyle <[email protected]>

Change name of changelog file

Signed-off-by: Wenkai Yin(尹文开) <[email protected]>

Trivial correction to 1.7 upgrade instructions

The container name for the aws plugin is `velero-plugin-for-aws`. There was an extra `velero-` prefix in the doc.

Signed-off-by: Dave Pedu <[email protected]>

Remove redundancy code block left by vmware-tanzu#5388. (vmware-tanzu#5483)

Signed-off-by: Xun Jiang <[email protected]>

refactor pvbr doc

Signed-off-by: Lyndon-Li <[email protected]>

Add credential file store in the backup deletion controller.

Signed-off-by: Xun Jiang <[email protected]>

fix backup failure with self-signed certification

Signed-off-by: Ming <[email protected]>

remove restic in docs (vmware-tanzu#5499)

Signed-off-by: Lyndon-Li <[email protected]>

repo config for s3 compatible store

Signed-off-by: Lyndon-Li <[email protected]>

issue fix 5505

Signed-off-by: Lyndon-Li <[email protected]>

fix restic backup progress error

Signed-off-by: Ming <[email protected]>

Fix GCP StorageClass used for E2E testing's YAML syntax error. (vmware-tanzu#5536)

Signed-off-by: Xun Jiang <[email protected]>

Signed-off-by: Xun Jiang <[email protected]>
Co-authored-by: Xun Jiang <[email protected]>

Enhance the restore priorities list to support specifying the low prioritized resources that need to be restored in the last

Enhance the restore priorities list to support specifying the low prioritized resources that need to be r
estored in the last

Signed-off-by: Wenkai Yin(尹文开) <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

feat: dependabot workflow automation for updating dependency

Signed-off-by: Pratik Raj <[email protected]>

Fix pointer deference to string in error message

Signed-off-by: Faizan Ahmad <[email protected]>

add VSL credentials documentation.

Signed-off-by: Scott Seago <[email protected]>

Add v1.10 velero upgrade doc

Signed-off-by: Ming <[email protected]>

fix main TOC for 1.10

Signed-off-by: OrlinVasilev <[email protected]>

add note for left over resources

Signed-off-by: Ming <[email protected]>

Modify dependabot rules by only fix security issues

Signed-off-by: Ming <[email protected]>

remove gofrs uuid

Signed-off-by: Lyndon-Li <[email protected]>

Upload Velero build package saved from build image to Google cloud storage

Signed-off-by: danfengl <[email protected]>

Fix controller problematic log output

Signed-off-by: Ming <[email protected]>

Add compile restic binary for CVE fix

Signed-off-by: Ming <[email protected]>

Rename secret for Google cloud storage

Signed-off-by: danfengl <[email protected]>

Fix restic cross platform compile

Signed-off-by: Ming <[email protected]>

debug opt in out

Signed-off-by: danfengl <[email protected]>

Update upgrade test for 1.10

Signed-off-by: danfengl <[email protected]>

Save vvelero image tarball only for velero namespace in docker registry (vmware-tanzu#5581)

Signed-off-by: danfengl <[email protected]>

1.10 changelog and doc (vmware-tanzu#5583)

Signed-off-by: Lyndon-Li <[email protected]>

update 1.10 readme

Signed-off-by: Lyndon-Li <[email protected]>

Add Velero behind proxy document.

Signed-off-by: Xun Jiang <[email protected]>

Add Velero File System Backup Performance Guide

Signed-off-by: Ming <[email protected]>

update 1.10 release notes

Signed-off-by: Lyndon-Li <[email protected]>

Update the Valero channel hash-name for Kubernetes Slack.

Signed-off-by: Nikhil Maheshwari <[email protected]>

[Main Cherry-Pick]Enhance upgrade velero bash script

Signed-off-by: Ming <[email protected]>

Add pause/unpause schedule e2e test (vmware-tanzu#5609)

Signed-off-by: danfengl <[email protected]>

Restore ClusterBootstrap before Cluster

Restore ClusterBootstrap before Cluster otherwise a new default ClusterBootstrap object is create for the cluster

Signed-off-by: Wenkai Yin(尹文开) <[email protected]>

remove versions from kind matrix

Signed-off-by: Lyndon-Li <[email protected]>

Bump goreleaser to v1.12.3

Signed-off-by: JenTing Hsiao <[email protected]>

Fix git action issue for setup-gcloud

Signed-off-by: danfengl <[email protected]>

Add verification for CRD installation

Signed-off-by: danfengl <[email protected]>

Update the api-types doc

This commit makes update to the update api-types docs to add missing
fields.
It also includes misc changes to the inline comment, and a change to
Dockerfile to make sure the build-image works on mac

Signed-off-by: Daniel Jiang <[email protected]>

cut v1.10 docs on main

Signed-off-by: Lyndon-Li <[email protected]>

Add sleep before backing up new born CRD

Signed-off-by: danfengl <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

correct plugin name

Signed-off-by: wenterjoy <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

correct plugin name

Signed-off-by: wenterjoy <[email protected]>

try to fix link check error

Signed-off-by: wenterjoy <[email protected]>

reversed the order of name and kind

Signed-off-by: wenterjoy <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

correct plugin name

Signed-off-by: wenterjoy <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

correct plugin name

Signed-off-by: wenterjoy <[email protected]>

try to fix link check error

Signed-off-by: wenterjoy <[email protected]>

Fix CVEs scanned by trivy

Signed-off-by: Ming <[email protected]>

Fix links to compatibility matrix

Signed-off-by: Lukas Hass <[email protected]>

Update Velero and k8s version compatibility matrix.

Due to CSIDriver is checked for Restic volume mounting path, and CSIDriver is GA and moved to storage v1 group in k8s v1.18, so update Velero v1.8, v1.9 and v1.10 compatible k8s version to 1.18-latest.

Signed-off-by: Xun Jiang <[email protected]>

Item action progress monitoring design

This design combines the requirements for the previously-merged
Upload Progress Monitoring design with the requirements for the
(not submitted but discussed in meetings and slack) proposed asynchronous
item action plugins into one integrated proposal.

Signed-off-by: Scott Seago <[email protected]>

BackupItemAction v2 design

This includes necessary changes to support async item action monitoring.

Signed-off-by: Scott Seago <[email protected]>

reversethe order of name and kind

Signed-off-by: wenterjoy <[email protected]>

RestoreItemAction v2 design

Signed-off-by: Scott Seago <[email protected]>

VolumeSnapshotter v2 API design

Signed-off-by: Scott Seago <[email protected]>

Prevent nil panic on exec restore hooks (vmware-tanzu#5675)

* Prevent nil panic on exec restore hooks

Signed-off-by: Dylan Murray <[email protected]>

refactor pvbr doc

Signed-off-by: Lyndon-Li <[email protected]>

Add credential file store in the backup deletion controller.

Signed-off-by: Xun Jiang <[email protected]>

fix backup failure with self-signed certification

Signed-off-by: Ming <[email protected]>

remove restic in docs (vmware-tanzu#5499)

Signed-off-by: Lyndon-Li <[email protected]>

repo config for s3 compatible store

Signed-off-by: Lyndon-Li <[email protected]>

issue fix 5505

Signed-off-by: Lyndon-Li <[email protected]>

fix restic backup progress error

Signed-off-by: Ming <[email protected]>

Fix GCP StorageClass used for E2E testing's YAML syntax error. (vmware-tanzu#5536)

Signed-off-by: Xun Jiang <[email protected]>

Signed-off-by: Xun Jiang <[email protected]>
Co-authored-by: Xun Jiang <[email protected]>

Enhance the restore priorities list to support specifying the low prioritized resources that need to be restored in the last

Enhance the restore priorities list to support specifying the low prioritized resources that need to be r
estored in the last

Signed-off-by: Wenkai Yin(尹文开) <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

Update Community meetings times

vmware-tanzu#5091

Signed-off-by: OrlinVasilev <[email protected]>

feat: dependabot workflow automation for updating dependency

Signed-off-by: Pratik Raj <[email protected]>

Fix pointer deference to string in error message

Signed-off-by: Faizan Ahmad <[email protected]>

add VSL credentials documentation.

Signed-off-by: Scott Seago <[email protected]>

Add v1.10 velero upgrade doc

Signed-off-by: Ming <[email protected]>

fix main TOC for 1.10

Signed-off-by: OrlinVasilev <[email protected]>

add note for left over resources

Signed-off-by: Ming <[email protected]>

Modify dependabot rules by only fix security issues

Signed-off-by: Ming <[email protected]>

remove gofrs uuid

Signed-off-by: Lyndon-Li <[email protected]>

Upload Velero build package saved from build image to Google cloud storage

Signed-off-by: danfengl <[email protected]>

Fix controller problematic log output

Signed-off-by: Ming <[email protected]>

Add compile restic binary for CVE fix

Signed-off-by: Ming <[email protected]>

Rename secret for Google cloud storage

Signed-off-by: danfengl <[email protected]>

Fix restic cross platform compile

Signed-off-by: Ming <[email protected]>

debug opt in out

Signed-off-by: danfengl <[email protected]>

Update upgrade test for 1.10

Signed-off-by: danfengl <[email protected]>

Save vvelero image tarball only for velero namespace in docker registry (vmware-tanzu#5581)

Signed-off-by: danfengl <[email protected]>

1.10 changelog and doc (vmware-tanzu#5583)

Signed-off-by: Lyndon-Li <[email protected]>

update 1.10 readme

Signed-off-by: Lyndon-Li <[email protected]>

Add Velero behind proxy document.

Signed-off-by: Xun Jiang <[email protected]>

Add Velero File System Backup Performance Guide

Signed-off-by: Ming <[email protected]>

update 1.10 release notes

Signed-off-by: Lyndon-Li <[email protected]>

Update the Valero channel hash-name for Kubernetes Slack.

Signed-off-by: Nikhil Maheshwari <[email protected]>

[Main Cherry-Pick]Enhance upgrade velero bash script

Signed-off-by: Ming <[email protected]>

Add pause/unpause schedule e2e test (vmware-tanzu#5609)

Signed-off-by: danfengl <[email protected]>

Restore ClusterBootstrap before Cluster

Restore ClusterBootstrap before Cluster otherwise a new default ClusterBootstrap object is create for the cluster

Signed-off-by: Wenkai Yin(尹文开) <[email protected]>

remove versions from kind matrix

Signed-off-by: Lyndon-Li <[email protected]>

Bump goreleaser to v1.12.3

Signed-off-by: JenTing Hsiao <[email protected]>

Fix git action issue for setup-gcloud

Signed-off-by: danfengl <[email protected]>

Add verification for CRD installation

Signed-off-by: danfengl <[email protected]>

Update the api-types doc

This commit makes update to the update api-types docs to add missing
fields.
It also includes misc changes to the inline comment, and a change to
Dockerfile to make sure the build-image works on mac

Signed-off-by: Daniel Jiang <[email protected]>

cut v1.10 docs on main

Signed-off-by: Lyndon-Li <[email protected]>

Add sleep before backing up new born CRD

Signed-off-by: danfengl <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

correct plugin name

Signed-off-by: wenterjoy <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

correct plugin name

Signed-off-by: wenterjoy <[email protected]>

try to fix link check error

Signed-off-by: wenterjoy <[email protected]>

reversed the order of name and kind

Signed-off-by: wenterjoy <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

correct plugin name

Signed-off-by: wenterjoy <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

change image repository by configmap

Signed-off-by: wenterjoy <[email protected]>

correct changelog name

Signed-off-by: wenterjoy <[email protected]>

modified according review comments

Signed-off-by: wenterjoy <[email protected]>

change image replace rule to match all the cases

Signed-off-by: wenterjoy <[email protected]>

use single bit "," as the delimiter

Signed-off-by: wenterjoy <[email protected]>

removed  section of juding DELIMITER_KEY

Signed-off-by: wenterjoy <[email protected]>

corrected code spell error

Signed-off-by: wenterjoy <[email protected]>

 remove "Job" from the conditional

Signed-off-by: wenterjoy <[email protected]>

correct plugin name

Signed-off-by: wenterjoy <[email protected]>

try to fix link check error

Signed-off-by: wenterjoy <[email protected]>

Fix CVEs scanned by trivy

Signed-off-by: Ming <[email protected]>

Fix links to compatibility matrix

Signed-off-by: Lukas Hass <[email protected]>

Update Velero and k8s version compatibility matrix.

Due to CSIDriver is checked for Restic volume mounting path, and CSIDriver is GA and moved to storage v1 group in k8s v1.18, so update Velero v1.8, v1.9 and v1.10 compatible k8s version to 1.18-latest.

Signed-off-by: Xun Jiang <[email protected]>

Item action progress monitoring design

This design combines the requirements for the previously-merged
Upload Progress Monitoring design with the requirements for the
(not submitted but discussed in meetings and slack) proposed asynchronous
item action plugins into one integrated proposal.

Signed-off-by: Scott Seago <[email protected]>

BackupItemAction v2 design

This includes necessary changes to support async item action monitoring.

Signed-off-by: Scott Seago <[email protected]>

reversethe order of name and kind

Signed-off-by: wenterjoy <[email protected]>

RestoreItemAction v2 design

Signed-off-by: Scott Seago <[email protected]>

VolumeSnapshotter v2 API design

Signed-off-by: Scott Seago <[email protected]>

Prevent nil panic on exec restore hooks (vmware-tanzu#5675)

* Prevent nil panic on exec restore hooks

Signed-off-by: Dylan Murray <[email protected]>

[Cherry-Pick]Fix error with Restic backup empty volumes

Signed-off-by: Ming <[email protected]>
  • Loading branch information
Lyndon-Li authored and wenterjoy committed Dec 21, 2022
1 parent 775943c commit e1fda94
Show file tree
Hide file tree
Showing 526 changed files with 30,128 additions and 7,933 deletions.
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 2
updates:
# Dependencies listed in go.mod
- package-ecosystem: "gomod"
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
labels:
- "kind/changelog-not-required"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
8 changes: 3 additions & 5 deletions .github/workflows/crds-verify-kind.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
id: go
# Look for a CLI that's made for this PR
- name: Fetch built CLI
Expand Down Expand Up @@ -57,15 +57,13 @@ jobs:
matrix:
# Latest k8s versions. There's no series-based tag, nor is there a latest tag.
k8s:
- 1.16.15
- 1.17.17
- 1.18.15
- 1.19.7
- 1.20.2
- 1.21.1
- 1.22.0
- 1.23.6
- 1.24.2
- 1.25.3
# All steps run in parallel unless otherwise specified.
# See https://docs.github.com/en/actions/learn-github-actions/managing-complex-workflows#creating-dependent-jobs
steps:
Expand All @@ -83,7 +81,7 @@ jobs:
velero-${{ github.event.pull_request.number }}-
- uses: engineerd/[email protected]
with:
version: "v0.14.0"
version: "v0.17.0"
image: "kindest/node:v${{ matrix.k8s }}"
- name: Install CRDs
run: |
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/e2e-test-kind.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
id: go
# Look for a CLI that's made for this PR
- name: Fetch built CLI
Expand Down Expand Up @@ -60,23 +60,19 @@ jobs:
strategy:
matrix:
k8s:
# doesn't cover 1.15 as 1.15 doesn't support "apiextensions.k8s.io/v1" that is needed for the case
#- 1.15.12
- 1.16.15
- 1.17.17
- 1.18.20
- 1.19.16
- 1.20.15
- 1.21.12
- 1.22.9
- 1.23.6
- 1.24.0
- 1.25.3
fail-fast: false
steps:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
id: go
- name: Check out the code
uses: actions/checkout@v2
Expand All @@ -85,7 +81,7 @@ jobs:
docker run -d --rm -p 9000:9000 -e "MINIO_ACCESS_KEY=minio" -e "MINIO_SECRET_KEY=minio123" -e "MINIO_DEFAULT_BUCKETS=bucket,additional-bucket" bitnami/minio:2021.6.17-debian-10-r7
- uses: engineerd/[email protected]
with:
version: "v0.14.0"
version: "v0.17.0"
image: "kindest/node:v${{ matrix.k8s }}"
- name: Fetch built CLI
id: cli-cache
Expand Down Expand Up @@ -117,12 +113,17 @@ jobs:
aws_access_key_id=minio
aws_secret_access_key=minio123
EOF
# Match kubectl version to k8s server version
curl -LO https://dl.k8s.io/release/v${{ matrix.k8s }}/bin/linux/amd64/kubectl
sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
GOPATH=~/go CLOUD_PROVIDER=kind \
OBJECT_STORE_PROVIDER=aws BSL_CONFIG=region=minio,s3ForcePathStyle="true",s3Url=http://$(hostname -i):9000 \
CREDS_FILE=/tmp/credential BSL_BUCKET=bucket \
ADDITIONAL_OBJECT_STORE_PROVIDER=aws ADDITIONAL_BSL_CONFIG=region=minio,s3ForcePathStyle="true",s3Url=http://$(hostname -i):9000 \
ADDITIONAL_CREDS_FILE=/tmp/credential ADDITIONAL_BSL_BUCKET=additional-bucket \
GINKGO_FOCUS='Basic\].+\[ClusterResource' VELERO_IMAGE=velero:pr-test \
GINKGO_FOCUS='Basic\]\[ClusterResource' VELERO_IMAGE=velero:pr-test \
make -C test/e2e run
timeout-minutes: 30
- name: Upload debug bundle
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-ci-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
id: go
- name: Check out the code
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-codespell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
with:
# ignore the config/.../crd.go file as it's generated binary data that is edited elswhere.
skip: .git,*.png,*.jpg,*.woff,*.ttf,*.gif,*.ico,./config/crd/v1beta1/crds/crds.go,./config/crd/v1/crds/crds.go,./go.sum,./LICENSE
ignore_words_list: iam,aks,ist,bridget,ue
ignore_words_list: iam,aks,ist,bridget,ue,shouldnot
check_filenames: true
check_hidden: true
40 changes: 36 additions & 4 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
id: go

- name: Check out code into the Go module directory
uses: actions/checkout@v2
- uses: actions/checkout@v3

# Fix issue of setup-gcloud
- run: |
sudo apt-get install python2.7
export CLOUDSDK_PYTHON="/usr/bin/python2"
- uses: google-github-actions/setup-gcloud@v0
with:
version: '285.0.0'
service_account_key: ${{ secrets.GCS_SA_KEY }}
export_default_credentials: true
- run: gcloud info

- name: Set up QEMU
id: qemu
Expand Down Expand Up @@ -53,8 +64,29 @@ jobs:
- name: Publish container image
if: github.repository == 'vmware-tanzu/velero'
run: |
# Build and push Velero image to docker registry
docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}
./hack/docker-push.sh
VERSION=$(./hack/docker-push.sh | grep 'VERSION:' | awk -F: '{print $2}' | xargs)
# Upload Velero image package to GCS
source hack/ci/build_util.sh
BIN=velero
RESTORE_HELPER_BIN=velero-restore-helper
GCS_BUCKET=velero-builds
VELERO_IMAGE=${BIN}-${VERSION}
VELERO_RESTORE_HELPER_IMAGE=${RESTORE_HELPER_BIN}-${VERSION}
VELERO_IMAGE_FILE=${VELERO_IMAGE}.tar.gz
VELERO_RESTORE_HELPER_IMAGE_FILE=${VELERO_RESTORE_HELPER_IMAGE}.tar.gz
VELERO_IMAGE_BACKUP_FILE=${VELERO_IMAGE}-'build.'${GITHUB_RUN_NUMBER}.tar.gz
VELERO_RESTORE_HELPER_IMAGE_BACKUP_FILE=${VELERO_RESTORE_HELPER_IMAGE}-'build.'${GITHUB_RUN_NUMBER}.tar.gz
cp ${VELERO_IMAGE_FILE} ${VELERO_IMAGE_BACKUP_FILE}
cp ${VELERO_RESTORE_HELPER_IMAGE_FILE} ${VELERO_RESTORE_HELPER_IMAGE_BACKUP_FILE}
uploader ${VELERO_IMAGE_FILE} ${GCS_BUCKET}
uploader ${VELERO_RESTORE_HELPER_IMAGE_FILE} ${GCS_BUCKET}
uploader ${VELERO_IMAGE_BACKUP_FILE} ${GCS_BUCKET}
uploader ${VELERO_RESTORE_HELPER_IMAGE_BACKUP_FILE} ${GCS_BUCKET}
# Use the JSON key in secret to login gcr.io
- uses: 'docker/login-action@v1'
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ _tiltbuild
tilt-resources/tilt-settings.json
tilt-resources/velero_v1_backupstoragelocation.yaml
tilt-resources/deployment.yaml
tilt-resources/restic.yaml
tilt-resources/node-agent.yaml
tilt-resources/cloud

test/e2e/report.xml
5 changes: 4 additions & 1 deletion ADOPTERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ We have integrated our [solution with Velero][11] to provide our customers with
Kyma [integrates with Velero][41] to effortlessly back up and restore Kyma clusters with all its resources. Velero capabilities allow Kyma users to define and run manual and scheduled backups in order to successfully handle a disaster-recovery scenario.

**[Red Hat][50]**
Red Hat has developed the [Cluster Application Migration Tool][51] which uses [Velero and Restic][52] to drive the migration of applications between OpenShift clusters.
Red Hat has developed 2 operators for the OpenShift platform:
- [Migration Toolkit for Containers][51] (Crane): This operator uses [Velero and Restic][52] to drive the migration of applications between OpenShift clusters.
- [OADP (OpenShift API for Data Protection) Operator][53]: This operator sets up and installs Velero on the OpenShift platform, allowing users to backup and restore applications.

**[Dell EMC][70]**
For Kubernetes environments, [PowerProtect Data Manager][71] leverages the Container Storage Interface (CSI) framework to take snapshots to back up the persistent data or the data that the application creates e.g. databases. [Dell EMC leverages Velero][72] to backup the namespace configuration files (also known as Namespace meta data) for enterprise grade data protection.
Expand Down Expand Up @@ -89,6 +91,7 @@ If you would like to add your logo to a future `Adopters of Velero` section on [
[50]: https://redhat.com
[51]: https://github.com/fusor/mig-operator
[52]: https://github.com/fusor/mig-operator/blob/master/docs/usage/2.md
[53]: https://github.com/openshift/oadp-operator

[60]: https://banzaicloud.com
[61]: https://banzaicloud.com/products/pipeline/
Expand Down
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM --platform=$BUILDPLATFORM golang:1.17 as builder-env
FROM --platform=$BUILDPLATFORM golang:1.18 as builder-env

ARG GOPROXY
ARG PKG
Expand All @@ -29,8 +29,6 @@ WORKDIR /go/src/github.com/vmware-tanzu/velero

COPY . /go/src/github.com/vmware-tanzu/velero

RUN apt-get update && apt-get install -y bzip2

FROM --platform=$BUILDPLATFORM builder-env as builder

ARG TARGETOS
Expand All @@ -45,8 +43,8 @@ ENV GOOS=${TARGETOS} \
GOARM=${TARGETVARIANT}

RUN mkdir -p /output/usr/bin && \
bash ./hack/download-restic.sh && \
export GOARM=$( echo "${GOARM}" | cut -c2-) && \
bash ./hack/build-restic.sh && \
go build -o /output/${BIN} \
-ldflags "${LDFLAGS}" ${PKG}/cmd/${BIN}

Expand Down
9 changes: 5 additions & 4 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@

| Feature Area | Lead |
| ----------------------------- | :---------------------: |
| Architect | Dave Smith-Uchida (dsu-igeek) |
| Technical Lead | Daniel Jiang (reasonerjt) |
| Architect | Dave Smith-Uchida [dsu-igeek](https://github.com/dsu-igeek) |
| Technical Lead | Daniel Jiang [reasonerjt](https://github.com/reasonerjt) |
| Kubernetes CSI Liaison | |
| Deployment | |
| Community Management | Orlin Vasilev (OrlinVasilev) |
| Product Management | Eleanor Millman (eleanor-millman) |
| Community Management | Orlin Vasilev [OrlinVasilev](https://github.com/OrlinVasilev) |
| Product Management | Pradeep Kumar Chaturvedi [pradeepkchaturvedi](https://github.com/pradeepkchaturvedi) |

14 changes: 10 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ see: https://velero.io/docs/main/build-from-source/#making-images-and-updating-v
endef

# The version of restic binary to be downloaded
RESTIC_VERSION ?= 0.13.1
RESTIC_VERSION ?= 0.14.0

CLI_PLATFORMS ?= linux-amd64 linux-arm linux-arm64 darwin-amd64 darwin-arm64 windows-amd64 linux-ppc64le
BUILDX_PLATFORMS ?= $(subst -,/,$(ARCH))
Expand Down Expand Up @@ -112,17 +112,17 @@ GOPROXY ?= https://proxy.golang.org
# If you want to build all containers, see the 'all-containers' rule.
all:
@$(MAKE) build
@$(MAKE) build BIN=velero-restic-restore-helper
@$(MAKE) build BIN=velero-restore-helper

build-%:
@$(MAKE) --no-print-directory ARCH=$* build
@$(MAKE) --no-print-directory ARCH=$* build BIN=velero-restic-restore-helper
@$(MAKE) --no-print-directory ARCH=$* build BIN=velero-restore-helper

all-build: $(addprefix build-, $(CLI_PLATFORMS))

all-containers: container-builder-env
@$(MAKE) --no-print-directory container
@$(MAKE) --no-print-directory container BIN=velero-restic-restore-helper
@$(MAKE) --no-print-directory container BIN=velero-restore-helper

local: build-dirs
# Add DEBUG=1 to enable debug locally
Expand Down Expand Up @@ -209,6 +209,12 @@ endif
--build-arg=RESTIC_VERSION=$(RESTIC_VERSION) \
-f $(VELERO_DOCKERFILE) .
@echo "container: $(IMAGE):$(VERSION)"
ifeq ($(BUILDX_OUTPUT_TYPE)_$(REGISTRY), registry_velero)
docker pull $(IMAGE):$(VERSION)
rm -f $(BIN)-$(VERSION).tar
docker save $(IMAGE):$(VERSION) -o $(BIN)-$(VERSION).tar
gzip -f $(BIN)-$(VERSION).tar
endif

SKIP_TESTS ?=
test: build-dirs
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ The following is a list of the supported Kubernetes versions for each Velero ver

| Velero version | Expected Kubernetes version compatibility| Tested on Kubernetes version|
|----------------|--------------------|--------------------|
| 1.9 | 1.16-latest | 1.20.5, 1.21.2, 1.22.5, 1.23, and 1.24 |
| 1.8 | 1.16-latest | |
| 1.10 | 1.18-latest | 1.22.5, 1.23.8, 1.24.6 and 1.25.1 |
| 1.9 | 1.18-latest | 1.20.5, 1.21.2, 1.22.5, 1.23, and 1.24 |
| 1.8 | 1.18-latest | |
| 1.6.3-1.7.1 | 1.12-latest ||
| 1.60-1.6.2 | 1.12-1.21 ||
| 1.5 | 1.12-1.21 ||
Expand Down
10 changes: 5 additions & 5 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ k8s_yaml([
# default values
settings = {
"default_registry": "docker.io/velero",
"enable_restic": False,
"use_node_agent": False,
"enable_debug": False,
"debug_continue_on_start": True, # Continue the velero process by default when in debug mode
"create_backup_locations": False,
Expand All @@ -34,9 +34,9 @@ k8s_yaml(kustomize('tilt-resources'))
k8s_yaml('tilt-resources/deployment.yaml')
if settings.get("enable_debug"):
k8s_resource('velero', port_forwards = '2345')
# TODO: Need to figure out how to apply port forwards for all restic pods
if settings.get("enable_restic"):
k8s_yaml('tilt-resources/restic.yaml')
# TODO: Need to figure out how to apply port forwards for all node-agent pods
if settings.get("use_node_agent"):
k8s_yaml('tilt-resources/node-agent.yaml')
if settings.get("create_backup_locations"):
k8s_yaml('tilt-resources/velero_v1_backupstoragelocation.yaml')
if settings.get("setup-minio"):
Expand All @@ -50,7 +50,7 @@ git_sha = str(local("git rev-parse HEAD", quiet = True, echo_off = True)).strip(

tilt_helper_dockerfile_header = """
# Tilt image
FROM golang:1.17 as tilt-helper
FROM golang:1.18 as tilt-helper
# Support live reloading with Tilt
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \
Expand Down
Loading

0 comments on commit e1fda94

Please sign in to comment.