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

Merge branch 'release-1.18' into xj014661/1.18/ephemeral_storage_config

Browse Source
This commit is contained in:
Xun Jiang/Bruce Jiang
2026-03-11 18:14:54 +08:00
committed by GitHub
parent b85a8f6784 072dc4c610
commit ea2c4f4e5c
15 changed files with 575 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/e2e/nodeagentconfig/node-agent-config.go
+2 -2
View File
@@ -240,7 +240,7 @@ func (n *NodeAgentConfigTestCase) Backup() error {
Expect(backupPodList.Items[0].Spec.PriorityClassName).To(Equal(n.nodeAgentConfigs.PriorityClassName))
// In backup, only the second element of LoadAffinity array should be used.
expectedAffinity := velerokubeutil.ToSystemAffinity(n.nodeAgentConfigs.LoadAffinity[1:])
expectedAffinity := velerokubeutil.ToSystemAffinity(n.nodeAgentConfigs.LoadAffinity[1], nil)
Expect(backupPodList.Items[0].Spec.Affinity).To(Equal(expectedAffinity))
@@ -317,7 +317,7 @@ func (n *NodeAgentConfigTestCase) Restore() error {
Expect(restorePodList.Items[0].Spec.PriorityClassName).To(Equal(n.nodeAgentConfigs.PriorityClassName))
// In restore, only the first element of LoadAffinity array should be used.
expectedAffinity := velerokubeutil.ToSystemAffinity(n.nodeAgentConfigs.LoadAffinity[:1])
expectedAffinity := velerokubeutil.ToSystemAffinity(n.nodeAgentConfigs.LoadAffinity[0], nil)
Expect(restorePodList.Items[0].Spec.Affinity).To(Equal(expectedAffinity))