Skip to content

Commit

Permalink
Merge pull request #2109 from openshift-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history 
…2099-to-release-4.7

[release-4.7] Bug 1952851: Add resource requests for bundle unpacker
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot committed Apr 29, 2021
2 parents f3454f5 + 70dda4c commit be64b97
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 0 deletions.
19 changes: 19 additions & 0 deletions pkg/controller/bundle/bundle_unpacker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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{
Expand All @@ -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",
Expand All @@ -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{
Expand Down
55 changes: 55 additions & 0 deletions pkg/controller/bundle/bundle_unpacker_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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{
Expand All @@ -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",
Expand All @@ -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{
Expand Down Expand Up @@ -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{
Expand All @@ -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",
Expand All @@ -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{
Expand Down Expand Up @@ -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{
Expand All @@ -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",
Expand All @@ -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{
Expand Down

0 comments on commit be64b97

Please sign in to comment.