Skip to content

Commit ace9808

Browse files
Merge pull request #1142 from Denton24646/bug-1760608-resource-limits
Bug 1760608: add resource limits to all OLM pods and the 0.13.0 release for OCP
2 parents ba10413 + 1a3654c commit ace9808

File tree

5 files changed

+22
-0
lines changed

5 files changed

+22
-0
lines changed

deploy/ocp/values.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ olm:
3232
tlsCertPath: /var/run/secrets/serving-cert/tls.crt
3333
tlsKeyPath: /var/run/secrets/serving-cert/tls.key
3434
resources:
35+
limits:
36+
cpu: 400m
37+
memory: 400Mi
3538
requests:
3639
cpu: 10m
3740
memory: 160Mi
@@ -58,6 +61,9 @@ catalog:
5861
effect: NoExecute
5962
tolerationSeconds: 120
6063
resources:
64+
limits:
65+
cpu: 200m
66+
memory: 300Mi
6167
requests:
6268
cpu: 10m
6369
memory: 80Mi
@@ -84,6 +90,9 @@ package:
8490
effect: NoExecute
8591
tolerationSeconds: 120
8692
resources:
93+
limits:
94+
cpu: 400m
95+
memory: 400Mi
8796
requests:
8897
cpu: 10m
8998
memory: 50Mi

manifests/0000_50_olm_07-olm-operator.deployment.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ spec:
6262
- name: OPERATOR_NAME
6363
value: olm-operator
6464
resources:
65+
limits:
66+
cpu: 400m
67+
memory: 400Mi
6568
requests:
6669
cpu: 10m
6770
memory: 160Mi

manifests/0000_50_olm_08-catalog-operator.deployment.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ spec:
5555
value: "0.0.1-snapshot"
5656

5757
resources:
58+
limits:
59+
cpu: 200m
60+
memory: 300Mi
5861
requests:
5962
cpu: 10m
6063
memory: 80Mi

manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@ spec:
122122
port: 5443
123123
terminationMessagePolicy: FallbackToLogsOnError
124124
resources:
125+
limits:
126+
cpu: 400m
127+
memory: 400Mi
125128
requests:
126129
cpu: 10m
127130
memory: 50Mi

pkg/controller/registry/reconciler/reconciler.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@ func Pod(source *v1alpha1.CatalogSource, name string, image string, labels map[s
121121
InitialDelaySeconds: livenessDelay,
122122
},
123123
Resources: v1.ResourceRequirements{
124+
Limits: v1.ResourceList{
125+
v1.ResourceCPU: resource.MustParse("100m"),
126+
v1.ResourceMemory: resource.MustParse("100Mi"),
127+
},
124128
Requests: v1.ResourceList{
125129
v1.ResourceCPU: resource.MustParse("10m"),
126130
v1.ResourceMemory: resource.MustParse("50Mi"),

0 commit comments

Comments
 (0)