support resources definitions on most pods

Author: Mike Ludwig

helm/openwhisk/templates/apigateway-pod.yaml

@@ -56,6 +56,10 @@ spec:
             containerPort: {{ .Values.apigw.mgmtPort }}
           - name: api
             containerPort: {{ .Values.apigw.apiPort }}
+{{- if .Values.apigw.resources }}
+          resources:
+{{ toYaml .Values.apigw.resources | indent 12 }}
+{{- end }}
           env:
           - name: "REDIS_HOST"
             value: "{{ include "openwhisk.redis_host" . }}"

helm/openwhisk/templates/controller-pod.yaml

@@ -107,6 +107,10 @@ spec:
           initialDelaySeconds: {{ .Values.probes.controller.readinessProbe.initialDelaySeconds }}
           periodSeconds: {{ .Values.probes.controller.readinessProbe.periodSeconds }}
           timeoutSeconds: {{ .Values.probes.controller.readinessProbe.timeoutSeconds }}
+{{- if .Values.controller.resources }}
+        resources:
+{{ toYaml .Values.controller.resources | indent 10 }}
+{{- end }}
         env:
         - name: "PORT"
           value: {{ .Values.controller.port | quote }}

helm/openwhisk/templates/invoker-pod.yaml

@@ -94,6 +94,10 @@ spec:
             . /invoker-scripts/configureDNS.sh &&
 {{- end }}
             /init.sh --uniqueName $INVOKER_NAME
+{{- if .Values.invoker.resources }}
+        resources:
+{{ toYaml .Values.invoker.resources | indent 10 }}
+{{- end }}
         env:
           - name: "PORT"
             value: {{ .Values.invoker.port | quote }}

helm/openwhisk/templates/kafka-pod.yaml

@@ -73,6 +73,10 @@ spec:
         ports:
         - containerPort: {{ .Values.kafka.port }}
           name: kafka
+{{- if .Values.kafka.resources }}
+        resources:
+{{ toYaml .Values.kafka.resources | indent 10 }}
+{{- end }}
         env:
         - name: "HOSTNAME_COMMAND"
           value: "hostname -f"

helm/openwhisk/templates/nginx-pod.yaml

@@ -75,6 +75,10 @@ spec:
           containerPort: {{ .Values.nginx.httpPort }}
         - name: http-api
           containerPort: {{ .Values.nginx.httpsPort }}
+{{- if .Values.nginx.resources }}
+        resources:
+{{ toYaml .Values.nginx.resources | indent 10 }}
+{{- end }}
         volumeMounts:
         - name: nginx-conf
           mountPath: "/etc/nginx/nginx.conf"

helm/openwhisk/templates/redis-pod.yaml

@@ -83,4 +83,8 @@ spec:
           ports:
           - name: redis
             containerPort: {{ .Values.redis.port }}
+{{- if .Values.redis.resources }}
+          resources:
+{{ toYaml .Values.redis.resources | indent 12 }}
+{{- end }}
 {{ end }}

helm/openwhisk/templates/zookeeper-pod.yaml

@@ -75,7 +75,10 @@ spec:
           containerPort: {{ .Values.zookeeper.serverPort }}
         - name: leader-election
           containerPort: {{ .Values.zookeeper.leaderElectionPort }}
-
+{{- if .Values.zookeeper.resources }}
+        resources:
+{{ toYaml .Values.zookeeper.resources | indent 10 }}
+{{- end }}
         livenessProbe:
           tcpSocket:
             port: {{ .Values.zookeeper.port }}

helm/openwhisk/values.yaml

@@ -186,6 +186,7 @@ zookeeper:
     syncLimit: 2
     dataDir: "/data"
     dataLogDir: "/datalog"
+  resources: ~
 
 # kafka configurations
 kafka:
@@ -199,6 +200,7 @@ kafka:
   port: 9092
   persistence:
     size: 512Mi
+  resources: ~
 
 # Database configuration
 db:
@@ -245,6 +247,7 @@ nginx:
     cert_file: ""
     key_file: ""
     sslPassword: ""
+  resources: ~
 
 # Controller configurations
 controller:
@@ -258,6 +261,7 @@ controller:
   jvmHeapMB: "1024"
   jvmOptions: ""
   loglevel: "INFO"
+  resources: ~
 
 # Invoker configurations
 invoker:
@@ -288,6 +292,7 @@ invoker:
     kubernetes:
       isolateUserActions: true
       replicaCount: 1
+  resources: ~
 
 # API Gateway configurations
 apigw:
@@ -299,6 +304,7 @@ apigw:
   restartPolicy: "Always"
   apiPort: 9000
   mgmtPort: 8080
+  resources: ~
 
 # Redis (used by apigateway)
 redis:
@@ -313,6 +319,7 @@ redis:
   port: 6379
   persistence:
     size: 256Mi
+  resources: ~
 
 # User-events configuration
 user_events: