mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-05 13:05:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into restore-pvc-ignore-wait-for-first-consumer

Browse Source
This commit is contained in:
Lyndon-Li
2025-01-03 14:14:37 +08:00
parent a56b06bab1 6860dabb85
commit cfad06b701
37 changed files with 1181 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/data_download_controller.go
View File

@@ -185,7 +185,7 @@ func (r *DataDownloadReconciler) Reconcile(ctx context.Context, req ctrl.Request
hostingPodLabels := map[string]string{velerov1api.DataDownloadLabel: dd.Name}
for _, k := range util.ThirdPartyLabels {
if v, err := nodeagent.GetLabelValue(ctx, r.kubeClient, dd.Namespace, k); err != nil {
if v, err := nodeagent.GetLabelValue(ctx, r.kubeClient, dd.Namespace, k, kube.NodeOSLinux); err != nil {
if err != nodeagent.ErrNodeAgentLabelNotFound {
log.WithError(err).Warnf("Failed to check node-agent label, skip adding host pod label %s", k)
}