Fix case of empty resource quantity

stackrox · Aug 4, 2022 · 1ce4040 · 1ce4040
1 parent c9d0f74
commit 1ce4040
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/internal/dinosaur/pkg/converters/resourceutil.go b/internal/dinosaur/pkg/converters/resourceutil.go
@@ -78,21 +78,29 @@ func ConvertPrivateResourceRequirementsToCoreV1(res *private.ResourceRequirement
 	var limitsCPU, limitsMemory, requestsCPU, requestsMemory resource.Quantity
 	var err error
 
-	limitsCPU, err = resource.ParseQuantity(res.Limits.Cpu)
-	if err != nil {
-		return corev1.ResourceRequirements{}, fmt.Errorf("parsing CPU limit %q: %v", res.Limits.Cpu, err)
+	if res.Limits.Cpu != "" {
+		limitsCPU, err = resource.ParseQuantity(res.Limits.Cpu)
+		if err != nil {
+			return corev1.ResourceRequirements{}, fmt.Errorf("parsing CPU limit %q: %v", res.Limits.Cpu, err)
+		}
 	}
-	limitsMemory, err = resource.ParseQuantity(res.Limits.Memory)
-	if err != nil {
-		return corev1.ResourceRequirements{}, fmt.Errorf("parsing memory limit %q: %v", res.Limits.Memory, err)
+	if res.Limits.Memory != "" {
+		limitsMemory, err = resource.ParseQuantity(res.Limits.Memory)
+		if err != nil {
+			return corev1.ResourceRequirements{}, fmt.Errorf("parsing memory limit %q: %v", res.Limits.Memory, err)
+		}
 	}
-	requestsCPU, err = resource.ParseQuantity(res.Requests.Cpu)
-	if err != nil {
-		return corev1.ResourceRequirements{}, fmt.Errorf("parsing CPU request %q: %v", res.Requests.Cpu, err)
+	if res.Requests.Cpu != "" {
+		requestsCPU, err = resource.ParseQuantity(res.Requests.Cpu)
+		if err != nil {
+			return corev1.ResourceRequirements{}, fmt.Errorf("parsing CPU request %q: %v", res.Requests.Cpu, err)
+		}
 	}
-	requestsMemory, err = resource.ParseQuantity(res.Requests.Memory)
-	if err != nil {
-		return corev1.ResourceRequirements{}, fmt.Errorf("parsing memory requst %q: %v", res.Limits.Memory, err)
+	if res.Requests.Memory != "" {
+		requestsMemory, err = resource.ParseQuantity(res.Requests.Memory)
+		if err != nil {
+			return corev1.ResourceRequirements{}, fmt.Errorf("parsing memory requst %q: %v", res.Limits.Memory, err)
+		}
 	}
 
 	return corev1.ResourceRequirements{