Skip to content

Commit c8d4cbb

Browse files
Merge pull request #1562 from openshift-cherrypick-robot/cherry-pick-1561-to-18.0-fr3
[18.0-fr3] Bump operator deployment memory request/limit defaults
2 parents 5dd5c92 + 558b075 commit c8d4cbb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

apis/operator/v1beta1/openstack_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ var (
5959
// DefaultManagerCPURequests - Default controller manager container CPU requests
6060
DefaultManagerCPURequests resource.Quantity = resource.MustParse("10m")
6161
// DefaultManagerMemoryLimit - Default controller manager container memory limit
62-
DefaultManagerMemoryLimit resource.Quantity = resource.MustParse("256Mi")
62+
DefaultManagerMemoryLimit resource.Quantity = resource.MustParse("512Mi")
6363
// DefaultManagerMemoryRequests - Default controller manager container memory requests
64-
DefaultManagerMemoryRequests resource.Quantity = resource.MustParse("128Mi")
64+
DefaultManagerMemoryRequests resource.Quantity = resource.MustParse("256Mi")
6565
// DefaultRbacProxyCPULimit - Default kube rbac proxy container CPU limit
6666
DefaultRbacProxyCPULimit resource.Quantity = resource.MustParse("500m")
6767
// DefaultRbacProxyCPURequests - Default kube rbac proxy container CPU requests

pkg/operator/override_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ func TestApplyOperatorOverrides(t *testing.T) {
210210
},
211211
expectedRequests: &ResourceList{
212212
CPU: "1",
213-
Memory: "128Mi", // the default must not be overridden if we just change the cpu
213+
Memory: "256Mi", // the default must not be overridden if we just change the cpu
214214
},
215215
},
216216
{

0 commit comments

Comments
 (0)