Assign default CPU/Memory resource value if not present (#2176)

Install restic with CPU/Memory limits is optional.
If velero cannot parse resource requirements, use default value instead.

After that, the administrator won't get confused that something recovered failed.

Signed-off-by: JenTing Hsiao <jenting.hsiao@suse.com>
This commit is contained in:
JenTing Hsiao
2020-01-09 23:48:35 +08:00
committed by Steve Kriss
parent c6ff6333a9
commit 97b33402a4

View File

@@ -1,5 +1,5 @@
/*
Copyright 2018, 2019 the Velero contributors.
Copyright 2018, 2019, 2020 the Velero contributors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -106,6 +106,18 @@ func (a *ResticRestoreAction) Execute(input *velero.RestoreItemActionExecuteInpu
cpuRequest, memRequest := getResourceRequests(log, config)
cpuLimit, memLimit := getResourceLimits(log, config)
if cpuRequest == "" {
cpuRequest = defaultCPURequestLimit
}
if cpuLimit == "" {
cpuLimit = defaultCPURequestLimit
}
if memRequest == "" {
memRequest = defaultMemRequestLimit
}
if memLimit == "" {
memLimit = defaultMemRequestLimit
}
resourceReqs, err := kube.ParseResourceRequirements(cpuRequest, memRequest, cpuLimit, memLimit)
if err != nil {