From 579c2ceeec617185cc85ab2e5be9451b56c12ae9 Mon Sep 17 00:00:00 2001
From: kevinrizza <krizza@redhat.com>
Date: Thu, 15 Apr 2021 09:27:34 -0400
Subject: [PATCH] Add resource requests for bundle unpacker

---
 pkg/controller/bundle/bundle_unpacker.go      | 19 +++++++
 pkg/controller/bundle/bundle_unpacker_test.go | 55 +++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/pkg/controller/bundle/bundle_unpacker.go b/pkg/controller/bundle/bundle_unpacker.go
index 6cbfc47ccd..e620dd0eec 100644
--- a/pkg/controller/bundle/bundle_unpacker.go
+++ b/pkg/controller/bundle/bundle_unpacker.go
@@ -12,6 +12,7 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	listersbatchv1 "k8s.io/client-go/listers/batch/v1"
@@ -92,6 +93,12 @@ func (c *ConfigMapUnpacker) job(cmRef *corev1.ObjectReference, bundlePath string
 									MountPath: "/bundle",
 								},
 							},
+							Resources: corev1.ResourceRequirements{
+								Requests: corev1.ResourceList{
+									corev1.ResourceCPU:    resource.MustParse("10m"),
+									corev1.ResourceMemory: resource.MustParse("50Mi"),
+								},
+							},
 						},
 					},
 					InitContainers: []corev1.Container{
@@ -105,6 +112,12 @@ func (c *ConfigMapUnpacker) job(cmRef *corev1.ObjectReference, bundlePath string
 									MountPath: "/util",
 								},
 							},
+							Resources: corev1.ResourceRequirements{
+								Requests: corev1.ResourceList{
+									corev1.ResourceCPU:    resource.MustParse("10m"),
+									corev1.ResourceMemory: resource.MustParse("50Mi"),
+								},
+							},
 						},
 						{
 							Name:            "pull",
@@ -121,6 +134,12 @@ func (c *ConfigMapUnpacker) job(cmRef *corev1.ObjectReference, bundlePath string
 									MountPath: "/util",
 								},
 							},
+							Resources: corev1.ResourceRequirements{
+								Requests: corev1.ResourceList{
+									corev1.ResourceCPU:    resource.MustParse("10m"),
+									corev1.ResourceMemory: resource.MustParse("50Mi"),
+								},
+							},
 						},
 					},
 					Volumes: []corev1.Volume{
diff --git a/pkg/controller/bundle/bundle_unpacker_test.go b/pkg/controller/bundle/bundle_unpacker_test.go
index a92659cd05..8cb524f930 100644
--- a/pkg/controller/bundle/bundle_unpacker_test.go
+++ b/pkg/controller/bundle/bundle_unpacker_test.go
@@ -11,6 +11,7 @@ import (
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/informers"
@@ -211,6 +212,12 @@ func TestConfigMapUnpacker(t *testing.T) {
 													MountPath: "/bundle",
 												},
 											},
+											Resources: corev1.ResourceRequirements{
+												Requests: corev1.ResourceList{
+													corev1.ResourceCPU:    resource.MustParse("10m"),
+													corev1.ResourceMemory: resource.MustParse("50Mi"),
+												},
+											},
 										},
 									},
 									InitContainers: []corev1.Container{
@@ -224,6 +231,12 @@ func TestConfigMapUnpacker(t *testing.T) {
 													MountPath: "/util",
 												},
 											},
+											Resources: corev1.ResourceRequirements{
+												Requests: corev1.ResourceList{
+													corev1.ResourceCPU:    resource.MustParse("10m"),
+													corev1.ResourceMemory: resource.MustParse("50Mi"),
+												},
+											},
 										},
 										{
 											Name:            "pull",
@@ -240,6 +253,12 @@ func TestConfigMapUnpacker(t *testing.T) {
 													MountPath: "/util",
 												},
 											},
+											Resources: corev1.ResourceRequirements{
+												Requests: corev1.ResourceList{
+													corev1.ResourceCPU:    resource.MustParse("10m"),
+													corev1.ResourceMemory: resource.MustParse("50Mi"),
+												},
+											},
 										},
 									},
 									Volumes: []corev1.Volume{
@@ -368,6 +387,12 @@ func TestConfigMapUnpacker(t *testing.T) {
 													MountPath: "/bundle",
 												},
 											},
+											Resources: corev1.ResourceRequirements{
+												Requests: corev1.ResourceList{
+													corev1.ResourceCPU:    resource.MustParse("10m"),
+													corev1.ResourceMemory: resource.MustParse("50Mi"),
+												},
+											},
 										},
 									},
 									InitContainers: []corev1.Container{
@@ -381,6 +406,12 @@ func TestConfigMapUnpacker(t *testing.T) {
 													MountPath: "/util",
 												},
 											},
+											Resources: corev1.ResourceRequirements{
+												Requests: corev1.ResourceList{
+													corev1.ResourceCPU:    resource.MustParse("10m"),
+													corev1.ResourceMemory: resource.MustParse("50Mi"),
+												},
+											},
 										},
 										{
 											Name:            "pull",
@@ -397,6 +428,12 @@ func TestConfigMapUnpacker(t *testing.T) {
 													MountPath: "/util",
 												},
 											},
+											Resources: corev1.ResourceRequirements{
+												Requests: corev1.ResourceList{
+													corev1.ResourceCPU:    resource.MustParse("10m"),
+													corev1.ResourceMemory: resource.MustParse("50Mi"),
+												},
+											},
 										},
 									},
 									Volumes: []corev1.Volume{
@@ -564,6 +601,12 @@ func TestConfigMapUnpacker(t *testing.T) {
 													MountPath: "/bundle",
 												},
 											},
+											Resources: corev1.ResourceRequirements{
+												Requests: corev1.ResourceList{
+													corev1.ResourceCPU:    resource.MustParse("10m"),
+													corev1.ResourceMemory: resource.MustParse("50Mi"),
+												},
+											},
 										},
 									},
 									InitContainers: []corev1.Container{
@@ -577,6 +620,12 @@ func TestConfigMapUnpacker(t *testing.T) {
 													MountPath: "/util",
 												},
 											},
+											Resources: corev1.ResourceRequirements{
+												Requests: corev1.ResourceList{
+													corev1.ResourceCPU:    resource.MustParse("10m"),
+													corev1.ResourceMemory: resource.MustParse("50Mi"),
+												},
+											},
 										},
 										{
 											Name:            "pull",
@@ -593,6 +642,12 @@ func TestConfigMapUnpacker(t *testing.T) {
 													MountPath: "/util",
 												},
 											},
+											Resources: corev1.ResourceRequirements{
+												Requests: corev1.ResourceList{
+													corev1.ResourceCPU:    resource.MustParse("10m"),
+													corev1.ResourceMemory: resource.MustParse("50Mi"),
+												},
+											},
 										},
 									},
 									Volumes: []corev1.Volume{