You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/12/17 12:01:22 UTC
[GitHub] daisy-ycguo closed pull request #391: synchronize with upstream
configuration files
daisy-ycguo closed pull request #391: synchronize with upstream configuration files
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/391
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/helm/openwhisk/templates/_helpers.tpl b/helm/openwhisk/templates/_helpers.tpl
index 6437287..6b26768 100644
--- a/helm/openwhisk/templates/_helpers.tpl
+++ b/helm/openwhisk/templates/_helpers.tpl
@@ -128,6 +128,79 @@ app: {{ template "openwhisk.fullname" . }}
key: db_whisk_auths
{{- end -}}
+{{/* Environment variables for specifying action limits */}}
+{{- define "openwhisk.limitsEnvVars" -}}
+- name: "LIMITS_ACTIONS_INVOKES_PERMINUTE"
+ value: {{ .Values.whisk.limits.actionsInvokesPerminute | quote }}
+- name: "LIMITS_ACTIONS_INVOKES_CONCURRENT"
+ value: {{ .Values.whisk.limits.actionsInvokesConcurrent | quote }}
+- name: "LIMITS_TRIGGERS_FIRES_PERMINUTE"
+ value: {{ .Values.whisk.limits.triggersFiresPerminute | quote }}
+- name: "LIMITS_ACTIONS_SEQUENCE_MAXLENGTH"
+ value: {{ .Values.whisk.limits.actionsSequenceMaxlength | quote }}
+- name: "CONFIG_whisk_timeLimit_min"
+ value: {{ .Values.whisk.limits.actions.time.min | quote }}
+- name: "CONFIG_whisk_timeLimit_max"
+ value: {{ .Values.whisk.limits.actions.time.max | quote }}
+- name: "CONFIG_whisk_timeLimit_std"
+ value: {{ .Values.whisk.limits.actions.time.std | quote }}
+- name: "CONFIG_whisk_memory_min"
+ value: {{ .Values.whisk.limits.actions.memory.min | quote }}
+- name: "CONFIG_whisk_memory_max"
+ value: {{ .Values.whisk.limits.actions.memory.max | quote }}
+- name: "CONFIG_whisk_memory_std"
+ value: {{ .Values.whisk.limits.actions.memory.std | quote }}
+- name: "CONFIG_whisk_concurrencyLimit_min"
+ value: {{ .Values.whisk.limits.actions.concurrency.min | quote }}
+- name: "CONFIG_whisk_concurrencyLimit_max"
+ value: {{ .Values.whisk.limits.actions.concurrency.max | quote }}
+- name: "CONFIG_whisk_concurrencyLimit_std"
+ value: {{ .Values.whisk.limits.actions.concurrency.std | quote }}
+- name: "CONFIG_whisk_logLimit_min"
+ value: {{ .Values.whisk.limits.actions.log.min | quote }}
+- name: "CONFIG_whisk_logLimit_max"
+ value: {{ .Values.whisk.limits.actions.log.max | quote }}
+- name: "CONFIG_whisk_logLimit_std"
+ value: {{ .Values.whisk.limits.actions.log.std | quote }}
+- name: "CONFIG_whisk_activation_payload_max"
+ value: {{ .Values.whisk.limits.activation.payload.max | quote }}
+{{- end -}}
+
+{{/* Environment variables for configuring kafka topics */}}
+{{- define "openwhisk.kafkaConfigEnvVars" -}}
+- name: "CONFIG_whisk_kafka_replicationFactor"
+ value: {{ .Values.whisk.kafka.replicationFactor | quote }}
+- name: "CONFIG_whisk_kafka_topics_cacheInvalidation_retentionBytes"
+ value: {{ .Values.whisk.kafka.topics.cacheInvalidation.retentionBytes | quote }}
+- name: "CONFIG_whisk_kafka_topics_cacheInvalidation_retentionMs"
+ value: {{ .Values.whisk.kafka.topics.cacheInvalidation.retentionMs | quote }}
+- name: "CONFIG_whisk_kafka_topics_cacheInvalidation_segmentBytes"
+ value: {{ .Values.whisk.kafka.topics.cacheInvalidation.segmentBytes | quote }}
+- name: "CONFIG_whisk_kafka_topics_completed_retentionBytes"
+ value: {{ .Values.whisk.kafka.topics.completed.retentionBytes | quote }}
+- name: "CONFIG_whisk_kafka_topics_completed_retentionMs"
+ value: {{ .Values.whisk.kafka.topics.completed.retentionMs | quote }}
+- name: "CONFIG_whisk_kafka_topics_completed_segmentBytes"
+ value: {{ .Values.whisk.kafka.topics.completed.segmentBytes | quote }}
+- name: "CONFIG_whisk_kafka_topics_events_retentionBytes"
+ value: {{ .Values.whisk.kafka.topics.events.retentionBytes | quote }}
+- name: "CONFIG_whisk_kafka_topics_events_retentionMs"
+ value: {{ .Values.whisk.kafka.topics.events.retentionMs | quote }}
+- name: "CONFIG_whisk_kafka_topics_events_segmentBytes"
+ value: {{ .Values.whisk.kafka.topics.events.segmentBytes | quote }}
+- name: "CONFIG_whisk_kafka_topics_health_retentionBytes"
+ value: {{ .Values.whisk.kafka.topics.health.retentionBytes | quote }}
+- name: "CONFIG_whisk_kafka_topics_health_retentionMs"
+ value: {{ .Values.whisk.kafka.topics.health.retentionMs | quote }}
+- name: "CONFIG_whisk_kafka_topics_health_segmentBytes"
+ value: {{ .Values.whisk.kafka.topics.health.segmentBytes | quote }}
+- name: "CONFIG_whisk_kafka_topics_invoker_retentionBytes"
+ value: {{ .Values.whisk.kafka.topics.invoker.retentionBytes | quote }}
+- name: "CONFIG_whisk_kafka_topics_invoker_retentionMs"
+ value: {{ .Values.whisk.kafka.topics.invoker.retentionMs | quote }}
+- name: "CONFIG_whisk_kafka_topics_invoker_segmentBytes"
+ value: {{ .Values.whisk.kafka.topics.invoker.segmentBytes | quote }}
+{{- end -}}
{{/* tlssecretname for ingress */}}
{{- define "openwhisk.tls_secret_name" -}}
diff --git a/helm/openwhisk/templates/controller-pod.yaml b/helm/openwhisk/templates/controller-pod.yaml
index 97802d4..20d4313 100644
--- a/helm/openwhisk/templates/controller-pod.yaml
+++ b/helm/openwhisk/templates/controller-pod.yaml
@@ -59,6 +59,9 @@ spec:
- name: "PORT"
value: {{ .Values.controller.port | quote }}
+ - name: "TZ"
+ value: {{ .Values.docker.timezone | quote }}
+
- name: "CONFIG_whisk_info_date"
valueFrom:
configMapKeyRef:
@@ -82,6 +85,9 @@ spec:
- name: "RUNTIMES_MANIFEST"
value: {{ template "openwhisk.runtimes_manifest" . }}
+ # Action limits
+{{ include "openwhisk.limitsEnvVars" . | indent 8 }}
+
- name: "CONFIG_whisk_loadbalancer_blackboxFraction"
value: {{ .Values.whisk.loadbalancer.blackboxFraction | quote }}
@@ -93,19 +99,11 @@ spec:
value: "{{ include "openwhisk.kafka_host" . }}:{{ .Values.kafka.port }}"
- name: "KAFKA_HOST_PORT"
value: {{ .Values.kafka.port | quote }}
+{{ include "openwhisk.kafkaConfigEnvVars" . | indent 8 }}
# properties for DB connection
{{ include "openwhisk.dbEnvVars" . | indent 8 }}
- - name: "LIMITS_ACTIONS_SEQUENCE_MAXLENGTH"
- value: {{ .Values.controller.limits.actionsSequenceMaxlength | quote }}
- - name: "LIMITS_TRIGGERS_FIRES_PERMINUTE"
- value: {{ .Values.controller.limits.triggersFiresPerminute | quote }}
- - name: "LIMITS_ACTIONS_INVOKES_PERMINUTE"
- value: {{ .Values.controller.limits.actionsInvokesPerminute | quote }}
- - name: "LIMITS_ACTIONS_INVOKES_CONCURRENT"
- value: {{ .Values.controller.limits.actionsInvokesConcurrent | quote }}
-
- name: "CONTROLLER_INSTANCES"
value: {{ .Values.controller.replicaCount | quote }}
{{- if gt (int .Values.controller.replicaCount) 1 }}
diff --git a/helm/openwhisk/templates/invoker-pod.yaml b/helm/openwhisk/templates/invoker-pod.yaml
index 61c4768..fdf8329 100644
--- a/helm/openwhisk/templates/invoker-pod.yaml
+++ b/helm/openwhisk/templates/invoker-pod.yaml
@@ -121,6 +121,9 @@ spec:
- name: "RUNTIMES_MANIFEST"
value: {{ template "openwhisk.runtimes_manifest" . }}
+ # Action limits
+{{ include "openwhisk.limitsEnvVars" . | indent 10 }}
+
# Default to empty logs dir. This is because logs should go to stdout
- name: "WHISK_LOGS_DIR"
value: ""
@@ -138,6 +141,7 @@ spec:
# properties for kafka connection
- name: "KAFKA_HOSTS"
value: "{{ include "openwhisk.kafka_host" . }}:{{ .Values.kafka.port }}"
+{{ include "openwhisk.kafkaConfigEnvVars" . | indent 10 }}
# properties for zookeeper connection
- name: "ZOOKEEPER_HOSTS"
diff --git a/helm/openwhisk/templates/nginx-pod.yaml b/helm/openwhisk/templates/nginx-pod.yaml
index 7b2f079..f8433a7 100644
--- a/helm/openwhisk/templates/nginx-pod.yaml
+++ b/helm/openwhisk/templates/nginx-pod.yaml
@@ -46,8 +46,6 @@ spec:
containerPort: {{ .Values.nginx.httpPort }}
- name: http-api
containerPort: {{ .Values.nginx.httpsPort }}
- - name: https-admin
- containerPort: {{ .Values.nginx.httpsAdminPort }}
volumeMounts:
- name: nginx-conf
mountPath: "/etc/nginx/nginx.conf"
diff --git a/helm/openwhisk/templates/nginx-svc.yaml b/helm/openwhisk/templates/nginx-svc.yaml
index 066b81e..2f8ce0a 100644
--- a/helm/openwhisk/templates/nginx-svc.yaml
+++ b/helm/openwhisk/templates/nginx-svc.yaml
@@ -24,5 +24,3 @@ spec:
nodePort: {{ .Values.nginx.httpsNodePort }}
{{- end }}
name: https-api
- - port: {{ .Values.nginx.httpsAdminPort }}
- name: https-admin
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index d6af394..c7868a7 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -46,16 +46,63 @@ whisk:
secrettype: "type"
crt: "crt"
key: "key"
-
-
# Production deployments _MUST_ override these default auth values
auth:
system: "789c46b1-71f6-4ed5-8c54-816aa4f8c502:abczO3xZCLrMN6v2BKK1dXYFpXlPkccOFqm12CdAsMgRU4VrNZ9lyGVCGuMDGIwP"
guest: "23bc46b1-71f6-4ed5-8c54-816aa4f8c502:123zO3xZCLrMN6v2BKK1dXYFpXlPkccOFqm12CdAsMgRU4VrNZ9lyGVCGuMDGIwP"
systemNameSpace: "/whisk.system"
+ limits:
+ actionsInvokesPerminute: 60
+ actionsInvokesConcurrent: 30
+ triggersFiresPerminute: 60
+ actionsSequenceMaxlength: 50
+ actions:
+ time:
+ min: "100ms"
+ max: "5m"
+ std: "1m"
+ memory:
+ min: "128m"
+ max: "512m"
+ std: "256m"
+ concurrency:
+ min: 1
+ max: 1
+ std: 1
+ log:
+ min: "0m"
+ max: "10m"
+ std: "10m"
+ activation:
+ payload:
+ max: "1048576"
loadbalancer:
blackboxFraction: "10%"
timeoutFactor: 2
+ # Kafka configuration. For all sub-fields a value of "" means use the default from application.conf
+ kafka:
+ replicationFactor: ""
+ topics:
+ cacheInvalidation:
+ segmentBytes: ""
+ retentionBytes: ""
+ retentionMs: ""
+ completed:
+ segmentBytes: ""
+ retentionBytes: ""
+ retentionMs: ""
+ events:
+ segmentBytes: ""
+ retentionBytes: ""
+ retentionMs: ""
+ health:
+ segmentBytes: ""
+ retentionBytes: ""
+ retentionMs: ""
+ invoker:
+ segmentBytes: ""
+ retentionBytes: ""
+ retentionMs: ""
containerPool:
userMemory: "2048m"
runtimes: "runtimes.json"
@@ -98,6 +145,7 @@ docker:
name: ""
username: ""
password: ""
+ timezone: "UTC"
# zookeeper configurations
zookeeper:
@@ -178,7 +226,6 @@ nginx:
restartPolicy: "Always"
httpPort: 80
httpsPort: 443
- httpsAdminPort: 8443
httpsNodePort: 31001
# Controller configurations
@@ -193,11 +240,6 @@ controller:
options: ""
jvmHeapMB: "1024"
jvmOptions: ""
- limits:
- actionsSequenceMaxlength: 50
- triggersFiresPerminute: 60
- actionsInvokesPerminute: 60
- actionsInvokesConcurrent: 30
# Invoker configurations
invoker:
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services