Skip to content

Commit e1ffcb0

Browse files
Mike LudwigMike Ludwig
authored andcommitted
support resources definitions on most pods
1 parent cd5320c commit e1ffcb0

File tree

8 files changed

+35
-1
lines changed

8 files changed

+35
-1
lines changed

helm/openwhisk/templates/apigateway-pod.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ spec:
5656
containerPort: {{ .Values.apigw.mgmtPort }}
5757
- name: api
5858
containerPort: {{ .Values.apigw.apiPort }}
59+
{{- if .Values.apigw.resources }}
60+
resources:
61+
{{ toYaml .Values.apigw.resources | indent 12 }}
62+
{{- end }}
5963
env:
6064
- name: "REDIS_HOST"
6165
value: "{{ include "openwhisk.redis_host" . }}"

helm/openwhisk/templates/controller-pod.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ spec:
107107
initialDelaySeconds: {{ .Values.probes.controller.readinessProbe.initialDelaySeconds }}
108108
periodSeconds: {{ .Values.probes.controller.readinessProbe.periodSeconds }}
109109
timeoutSeconds: {{ .Values.probes.controller.readinessProbe.timeoutSeconds }}
110+
{{- if .Values.controller.resources }}
111+
resources:
112+
{{ toYaml .Values.controller.resources | indent 10 }}
113+
{{- end }}
110114
env:
111115
- name: "PORT"
112116
value: {{ .Values.controller.port | quote }}

helm/openwhisk/templates/invoker-pod.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ spec:
9494
. /invoker-scripts/configureDNS.sh &&
9595
{{- end }}
9696
/init.sh --uniqueName $INVOKER_NAME
97+
{{- if .Values.invoker.resources }}
98+
resources:
99+
{{ toYaml .Values.invoker.resources | indent 10 }}
100+
{{- end }}
97101
env:
98102
- name: "PORT"
99103
value: {{ .Values.invoker.port | quote }}

helm/openwhisk/templates/kafka-pod.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ spec:
7373
ports:
7474
- containerPort: {{ .Values.kafka.port }}
7575
name: kafka
76+
{{- if .Values.kafka.resources }}
77+
resources:
78+
{{ toYaml .Values.kafka.resources | indent 10 }}
79+
{{- end }}
7680
env:
7781
- name: "HOSTNAME_COMMAND"
7882
value: "hostname -f"

helm/openwhisk/templates/nginx-pod.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ spec:
7575
containerPort: {{ .Values.nginx.httpPort }}
7676
- name: http-api
7777
containerPort: {{ .Values.nginx.httpsPort }}
78+
{{- if .Values.nginx.resources }}
79+
resources:
80+
{{ toYaml .Values.nginx.resources | indent 10 }}
81+
{{- end }}
7882
volumeMounts:
7983
- name: nginx-conf
8084
mountPath: "/etc/nginx/nginx.conf"

helm/openwhisk/templates/redis-pod.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,8 @@ spec:
8383
ports:
8484
- name: redis
8585
containerPort: {{ .Values.redis.port }}
86+
{{- if .Values.redis.resources }}
87+
resources:
88+
{{ toYaml .Values.redis.resources | indent 12 }}
89+
{{- end }}
8690
{{ end }}

helm/openwhisk/templates/zookeeper-pod.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@ spec:
7575
containerPort: {{ .Values.zookeeper.serverPort }}
7676
- name: leader-election
7777
containerPort: {{ .Values.zookeeper.leaderElectionPort }}
78-
78+
{{- if .Values.zookeeper.resources }}
79+
resources:
80+
{{ toYaml .Values.zookeeper.resources | indent 10 }}
81+
{{- end }}
7982
livenessProbe:
8083
tcpSocket:
8184
port: {{ .Values.zookeeper.port }}

helm/openwhisk/values.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ zookeeper:
186186
syncLimit: 2
187187
dataDir: "/data"
188188
dataLogDir: "/datalog"
189+
resources: ~
189190

190191
# kafka configurations
191192
kafka:
@@ -199,6 +200,7 @@ kafka:
199200
port: 9092
200201
persistence:
201202
size: 512Mi
203+
resources: ~
202204

203205
# Database configuration
204206
db:
@@ -246,6 +248,7 @@ nginx:
246248
cert_file: ""
247249
key_file: ""
248250
sslPassword: ""
251+
resources: ~
249252

250253
# Controller configurations
251254
controller:
@@ -259,6 +262,7 @@ controller:
259262
jvmHeapMB: "1024"
260263
jvmOptions: ""
261264
loglevel: "INFO"
265+
resources: ~
262266

263267
# Invoker configurations
264268
invoker:
@@ -289,6 +293,7 @@ invoker:
289293
kubernetes:
290294
isolateUserActions: true
291295
replicaCount: 1
296+
resources: ~
292297

293298
# API Gateway configurations
294299
apigw:
@@ -300,6 +305,7 @@ apigw:
300305
restartPolicy: "Always"
301306
apiPort: 9000
302307
mgmtPort: 8080
308+
resources: ~
303309

304310
# Redis (used by apigateway)
305311
redis:
@@ -314,6 +320,7 @@ redis:
314320
port: 6379
315321
persistence:
316322
size: 256Mi
323+
resources: ~
317324

318325
# User-events configuration
319326
user_events:

0 commit comments

Comments
 (0)