Commit Graph

4159 Commits

Author SHA1 Message Date
Xun Jiang/Bruce Jiang ee7b60f723 Merge pull request #7202 from blackpiglet/7163_fix_release_1.12
Fix csiVolumeSnapshotsAttempted/Completed metrics issue on release-1.12
2023-12-18 20:43:46 +08:00
Xun Jiang ecb8e80f30 Fix issue #7163.
Update CSIVolumeSnapshotsCompleted in backup's status and the metric
during backup finalize stage according to async operations content.

Signed-off-by: Xun Jiang <jxun@vmware.com>
2023-12-18 15:59:40 +08:00
lyndon-li a80981524b Merge pull request #7203 from Lyndon-Li/release-1.12
[1.12] Issue 7189: generic restore - don't assume the first volume as the restore volume
2023-12-13 09:58:55 +08:00
Lyndon-Li 5e71b38993 issue 7189: generic restore - don't assume the first volume as the restore volume
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
2023-12-12 19:19:06 +08:00
Anshul Ahuja 06d12dec40 RM support for Escaped bool, float, null (#7118) (#7131)
* RM support for Escaped bool, float, null



* fix ci



---------

Signed-off-by: Anshul Ahuja <anshul.ahu@gmail.com>
v1.12.2-rc.2 v1.12.2
2023-11-23 10:59:49 +05:30
Xun Jiang/Bruce Jiang b68486221d Merge pull request #7126 from allenxu404/release-1.12
Add v1.12.2 changelog
v1.12.2-rc.1
2023-11-20 16:49:22 +08:00
allenxu404 5abd318b2c Add v1.12.2 changelog
Signed-off-by: allenxu404 <qix2@vmware.com>
2023-11-20 16:35:06 +08:00
danfengliu 7c051514fd Merge pull request #7111 from kaovilai/backup-patch-status-unittest-release-1.12
release-1.12: Update Backup.Status.CSIVolumeSnapshotsCompleted during finalize
2023-11-17 14:19:13 +08:00
Tiger Kaovilai c8fd9d4d62 revert test changes
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
2023-11-17 10:45:35 +08:00
Tiger Kaovilai ccfbcc5455 make update
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
2023-11-17 10:45:35 +08:00
Tiger Kaovilai ea25b8a793 update changelog to reflect removed waits
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
2023-11-17 10:45:35 +08:00
Tiger Kaovilai 2d6578635d CSIFeatureFlag enable check
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
2023-11-17 10:45:35 +08:00
Tiger Kaovilai fc44f3b8f0 remove waiting during finalize
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
2023-11-17 10:45:35 +08:00
Tiger Kaovilai df72745909 skip this if SnapshotMoveData
https://github.com/vmware-tanzu/velero/pull/7046/files#r1380708644
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
2023-11-17 10:45:35 +08:00
Tiger Kaovilai 453bd93c90 refactor backup snapshot status updates into UpdateBackupSnapshotsStatus() and run in backup_finalizer_controller
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
2023-11-17 10:45:35 +08:00
Tiger Kaovilai 65939c920e Add PatchResource unit test for backup status
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
2023-11-17 10:45:35 +08:00
lyndon-li c042d477ab Merge pull request #7049 from 27149chen/cherry-pick-6917
Cherry-pick #6917 to release 1.12
2023-11-17 09:33:37 +08:00
Guang Jiong Lou 5c44ed49a5 Merge branch 'release-1.12' into cherry-pick-6917 2023-11-17 09:21:40 +08:00
lyndon-li 3325a0cd1b Merge pull request #7114 from Lyndon-Li/release-1.12
Issue 7068: add a finalizer to protect retained VSC
2023-11-17 09:20:33 +08:00
Guang Jiong Lou b2d3fa0bec Merge branch 'release-1.12' into cherry-pick-6917 2023-11-17 09:17:19 +08:00
Lyndon-Li 25fc2f4d6e Issue 7068: add a finalizer to protect retained VSC
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
2023-11-16 18:53:34 +08:00
Wenkai Yin(尹文开) a036e8d463 Merge pull request #7110 from allenxu404/release-1.12
Bump up Velero base image to latest patch release
2023-11-16 16:00:29 +08:00
allenxu404 f92cdb1f76 Bump up Velero base image to latest patch release
Signed-off-by: allenxu404 <qix2@vmware.com>
2023-11-16 15:03:52 +08:00
Guang Jiong Lou 0531dbb1a2 Merge branch 'release-1.12' into cherry-pick-6917 2023-11-16 10:38:11 +08:00
lou de55794381 update changelog
Signed-off-by: lou <alex1988@outlook.com>
2023-11-15 17:24:02 +08:00
Wenkai Yin(尹文开) d7b4b0a770 Merge pull request #6917 from 27149chen/rm-improvement
support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers

Signed-off-by: lou <alex1988@outlook.com>
2023-11-15 17:20:15 +08:00
qiuming f1c93bd6c4 Merge pull request #7098 from allenxu404/release-1.12
[Cherry-pick][release-1.12]Fix node-agent metrics missing
2023-11-14 17:50:45 +08:00
yanggang 06e3773b22 Fix node-agent missing metrics-addr parms to define the server start.
Signed-off-by: yanggang <gang.yang@daocloud.io>
2023-11-14 16:27:43 +08:00
Wenkai Yin(尹文开) 32a8bbb9ac Merge pull request #7097 from Lyndon-Li/release-1.12
[1.12] Issue 7094: fallback to full backup if previous snapshot is not found
2023-11-14 13:20:11 +08:00
Lyndon-Li 84d8bbda24 issue 7094: fallback to full backup if previous snapshot is not found
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
2023-11-14 11:48:44 +08:00
qiuming 86e34eec28 Merge pull request #7087 from blackpiglet/cherry_pick_7061_to_1.12
[Cherry-pick][release-1.12]Add DataUpload Result and CSI VolumeSnapshot check for restore PV.
2023-11-13 10:51:05 +08:00
Xun Jiang 5923046471 Add DataUpload Result and CSI VolumeSnapshot check for restore PV.
Signed-off-by: Xun Jiang <jxun@vmware.com>
2023-11-11 11:44:01 +08:00
qiuming d1399225da Merge pull request #7058 from ywk253100/231106_file
Truncate the credential file to avoid the change of secret content messing it up
2023-11-08 09:21:01 +08:00
Wenkai Yin(尹文开) 6438fc9a69 Truncate the credential file to avoid the change of secret content messing it up
Truncate the credential file to avoid the change of secret content messing it up

Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com>
2023-11-06 17:18:00 +08:00
qiuming a674a1eaff Merge pull request #7060 from Lyndon-Li/release-1.12
[1.12] Issue 7027: backup exposer -- don't assume first volume as the backup volume
2023-11-06 17:16:18 +08:00
Lyndon-Li bb4f9094fd issue 7027: backup exposer -- don't assume first volume as the backup volume
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
2023-11-06 16:59:34 +08:00
lyndon 1264c438c1 Merge pull request #7054 from kaovilai/warnOnCreateAlreadyExistsGetError-release-1.12
release-1.12: restore: Use warning when Create IsAlreadyExist and Get error (#7004)
2023-11-06 14:23:13 +08:00
Tiger Kaovilai 7e35fd3261 restore: Use warning when Create IsAlreadyExist and Get error (#7004)
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
2023-11-02 16:05:50 -04:00
lyndon 482ec13d38 Merge pull request #7033 from ywk253100/231030_azure
Read information from the credential specified by BSL
2023-10-31 11:59:31 +08:00
Wenkai Yin(尹文开) dd825ef8bb Read information from the credential specified by BSL
Read information from the credential specified by BSL

Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com>
2023-10-30 17:29:43 +08:00
lyndon dc525aa045 Merge pull request #7025 from shubham-pampattiwar/cp-fix-ducr-cancel
[cherry-pick release-1.12] Fix issue 6913
2023-10-27 11:07:25 +08:00
lyndon 36ad5dafa9 Merge branch 'release-1.12' into cp-fix-ducr-cancel
Signed-off-by: lyndon <98304688+Lyndon-Li@users.noreply.github.com>
2023-10-27 10:47:38 +08:00
Anshul Ahuja 7b76047596 Make configmapref check case insensitive (#6804) (#7023)
* Make configmapref check case insensitive



* update resourcemodfier test case to validate case



---------

Signed-off-by: Anshul Ahuja <anshul.ahu@gmail.com>
Signed-off-by: Anshul Ahuja <anshulahuja@microsoft.com>
Co-authored-by: Anshul Ahuja <anshulahuja@microsoft.com>
2023-10-26 16:40:43 -04:00
Shubham Pampattiwar f1fcec3514 Fix issue 6913
Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

add changelog file

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

keep canceling phase const

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

fix data download as well

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

address PR feedback

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

minor fixes

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
(cherry picked from commit ee271b7b69)

update changelog filename

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
2023-10-26 07:50:58 -07:00
Xun Jiang/Bruce Jiang 17ad487803 Merge pull request #7020 from kaovilai/CVE-2023-44487-gRPC-Go-release-1.12
release-1.12: CVE-2023-44487 gRPC-Go HTTP/2 Rapid Reset vulnerability
2023-10-26 17:19:31 +08:00
Tiger Kaovilai bb6c1f60ea CVE-2023-44487 gRPC-Go HTTP/2 Rapid Reset vulnerability
`go get google.golang.org/grpc@v1.56.3 && go mod tidy`

https://github.com/grpc/grpc-go/security/advisories/GHSA-m425-mq94-257g
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
2023-10-26 02:23:15 -04:00
qiuming 0be6ad3a06 Merge pull request #7019 from danfengliu/update-testbed-matrix-1.12.1
Update testbed matrix for v1.12.1
2023-10-26 14:21:18 +08:00
danfengl 1c462d5f6d Update testbed matrix for v1.12.1
Signed-off-by: danfengl <danfengl@vmware.com>
2023-10-26 02:51:26 +00:00
Shubham Pampattiwar 32deef7ae3 Merge pull request #6997 from kaovilai/kopias3profilecred-1.12
release-1.12: kopia/repository/config/aws.go: Set session.Options profile from config
2023-10-25 04:44:35 -07:00
Tiger Kaovilai 72b5e7aad6 kopia/repository/config/aws.go: Set session.Options profile from config
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
2023-10-24 21:51:07 -04:00