mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-26 18:04:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into fix-issue-10429

Browse Source
This commit is contained in:
Lyndon-Li
2026-09-15 17:39:47 +08:00
parent a93e4769bc 96d46c5e8f
commit 4acad69133
45 changed files with 986 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/exposer/csi_snapshot.go
+2 -2
View File
@@ -785,7 +785,7 @@ func (e *csiSnapshotExposer) createBackupPod(
Operator: metav1.LabelSelectorOpIn,
})
toleration = append(toleration, []corev1api.Toleration{
toleration = kube.DeduplicateTolerations(append(toleration, []corev1api.Toleration{
{
Key: "os",
Operator: "Equal",
@@ -798,7 +798,7 @@ func (e *csiSnapshotExposer) createBackupPod(
Effect: "NoExecute",
Value: "windows",
},
}...)
}...))
} else {
userID := int64(0)
securityCtx = &corev1api.PodSecurityContext{
pkg/exposer/generic_restore.go
+2 -2
View File
@@ -842,7 +842,7 @@ func (e *genericRestoreExposer) createRestorePod(
Operator: metav1.LabelSelectorOpIn,
})
toleration = append(toleration, []corev1api.Toleration{
toleration = kube.DeduplicateTolerations(append(toleration, []corev1api.Toleration{
{
Key: "os",
Operator: "Equal",
@@ -855,7 +855,7 @@ func (e *genericRestoreExposer) createRestorePod(
Effect: "NoExecute",
Value: "windows",
},
}...)
}...))
} else {
userID := int64(0)
securityCtx = &corev1api.PodSecurityContext{
pkg/exposer/pod_volume.go
+2 -2
View File
@@ -456,7 +456,7 @@ func (e *podVolumeExposer) createHostingPod(
Operator: metav1.LabelSelectorOpIn,
})
toleration = append(toleration, []corev1api.Toleration{
toleration = kube.DeduplicateTolerations(append(toleration, []corev1api.Toleration{
{
Key: "os",
Operator: "Equal",
@@ -469,7 +469,7 @@ func (e *podVolumeExposer) createHostingPod(
Effect: "NoExecute",
Value: "windows",
},
}...)
}...))
} else {
userID := int64(0)
securityCtx = &corev1api.PodSecurityContext{