Skip to content

Commit c726141

Browse files
author
Jeff Peeler
committed
feat(deploy): add resource requests to all pods
CPU has been set to 10m for all pods. The following are the memory requests: olm-operator 160Mi catalog-operator 80Mi packageserver 50Mi catalog sources 50Mi
1 parent 4b7a384 commit c726141

File tree

8 files changed

+57
-0
lines changed

8 files changed

+57
-0
lines changed

deploy/chart/templates/_packageserver.deployment-spec.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,8 @@ spec:
5757
path: /healthz
5858
port: {{ .Values.package.service.internalPort }}
5959
terminationMessagePolicy: FallbackToLogsOnError
60+
{{- if .Values.package.resources }}
61+
resources:
62+
{{ toYaml .Values.package.resources | indent 10 }}
63+
{{- end}}
6064
{{- end -}}

deploy/chart/values.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ olm:
1717
internalPort: 8080
1818
nodeSelector:
1919
beta.kubernetes.io/os: linux
20+
resources:
21+
requests:
22+
cpu: 10m
23+
memory: 160Mi
2024

2125
catalog:
2226
replicaCount: 1
@@ -28,6 +32,10 @@ catalog:
2832
internalPort: 8080
2933
nodeSelector:
3034
beta.kubernetes.io/os: linux
35+
resources:
36+
requests:
37+
cpu: 10m
38+
memory: 80Mi
3139

3240
package:
3341
replicaCount: 2
@@ -38,3 +46,7 @@ package:
3846
internalPort: 5443
3947
nodeSelector:
4048
beta.kubernetes.io/os: linux
49+
resources:
50+
requests:
51+
cpu: 10m
52+
memory: 50Mi

deploy/ocp/values.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ olm:
3131
tolerationSeconds: 120
3232
tlsCertPath: /var/run/secrets/serving-cert/tls.crt
3333
tlsKeyPath: /var/run/secrets/serving-cert/tls.key
34+
resources:
35+
requests:
36+
cpu: 10m
37+
memory: 160Mi
3438
catalog:
3539
replicaCount: 1
3640
image:
@@ -53,6 +57,10 @@ catalog:
5357
operator: Exists
5458
effect: NoExecute
5559
tolerationSeconds: 120
60+
resources:
61+
requests:
62+
cpu: 10m
63+
memory: 80Mi
5664
package:
5765
replicaCount: 2
5866
image:
@@ -75,3 +83,7 @@ package:
7583
operator: Exists
7684
effect: NoExecute
7785
tolerationSeconds: 120
86+
resources:
87+
requests:
88+
cpu: 10m
89+
memory: 50Mi

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ spec:
6161
fieldPath: metadata.namespace
6262
- name: OPERATOR_NAME
6363
value: olm-operator
64+
resources:
65+
requests:
66+
cpu: 10m
67+
memory: 160Mi
68+
6469

6570
volumeMounts:
6671
- mountPath: /var/run/secrets/serving-cert

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ spec:
5454
- name: RELEASE_VERSION
5555
value: "0.0.1-snapshot"
5656

57+
resources:
58+
requests:
59+
cpu: 10m
60+
memory: 80Mi
61+
5762

5863
volumeMounts:
5964
- mountPath: /var/run/secrets/serving-cert

manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ spec:
121121
path: /healthz
122122
port: 5443
123123
terminationMessagePolicy: FallbackToLogsOnError
124+
resources:
125+
requests:
126+
cpu: 10m
127+
memory: 50Mi
128+
124129
maturity: alpha
125130
version: 0.10.1
126131
apiservicedefinitions:

pkg/controller/registry/reconciler/configmap.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/sirupsen/logrus"
99
v1 "k8s.io/api/core/v1"
1010
rbacv1 "k8s.io/api/rbac/v1"
11+
"k8s.io/apimachinery/pkg/api/resource"
1112
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1213
"k8s.io/apimachinery/pkg/labels"
1314
"k8s.io/apimachinery/pkg/util/intstr"
@@ -123,6 +124,12 @@ func (s *configMapCatalogSourceDecorator) Pod(image string) *v1.Pod {
123124
},
124125
InitialDelaySeconds: 2,
125126
},
127+
Resources: v1.ResourceRequirements{
128+
Requests: v1.ResourceList{
129+
v1.ResourceCPU: resource.MustParse("10m"),
130+
v1.ResourceMemory: resource.MustParse("50Mi"),
131+
},
132+
},
126133
},
127134
},
128135
Tolerations: []v1.Toleration{

pkg/controller/registry/reconciler/grpc.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/pkg/errors"
77
"github.com/sirupsen/logrus"
88
v1 "k8s.io/api/core/v1"
9+
"k8s.io/apimachinery/pkg/api/resource"
910
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1011
"k8s.io/apimachinery/pkg/labels"
1112
"k8s.io/apimachinery/pkg/util/intstr"
@@ -88,6 +89,12 @@ func (s *grpcCatalogSourceDecorator) Pod() *v1.Pod {
8889
},
8990
InitialDelaySeconds: 10,
9091
},
92+
Resources: v1.ResourceRequirements{
93+
Requests: v1.ResourceList{
94+
v1.ResourceCPU: resource.MustParse("10m"),
95+
v1.ResourceMemory: resource.MustParse("50Mi"),
96+
},
97+
},
9198
},
9299
},
93100
Tolerations: []v1.Toleration{

0 commit comments

Comments
 (0)