Merge pull request #2099 from kevinrizza/unpacker-resource-requests

Add resource requests for bundle unpacker

Author: openshift-merge-robot

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"
@@ -93,6 +94,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{
@@ -106,6 +113,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",
@@ -122,6 +135,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{

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"
@@ -215,6 +216,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{
@@ -228,6 +235,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",
@@ -244,6 +257,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{
@@ -372,6 +391,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{
@@ -385,6 +410,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",
@@ -401,6 +432,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{
@@ -568,6 +605,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{
@@ -581,6 +624,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",
@@ -597,6 +646,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{