[openwhisk-deploy-kube] branch master updated: Add timeout configuration (#653)

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jiangpengcheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-deploy-kube.git


The following commit(s) were added to refs/heads/master by this push:
     new 1e7cd45  Add timeout configuration (#653)
1e7cd45 is described below

commit 1e7cd4520c53f2490e1b6acf383d7d7131bd4908
Author: ningyougang <41...@qq.com>
AuthorDate: Fri Nov 20 13:36:31 2020 +0800

    Add timeout configuration (#653)
    
    - actorSystem terminate timeout
    - runtime pods delete timeout configuration
    
    Co-authored-by: ning.yougang <ni...@navercorp.com>
---
 helm/openwhisk/templates/invoker-pod.yaml | 4 ++++
 helm/openwhisk/values.yaml                | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/helm/openwhisk/templates/invoker-pod.yaml b/helm/openwhisk/templates/invoker-pod.yaml
index a7674d5..04180fd 100644
--- a/helm/openwhisk/templates/invoker-pod.yaml
+++ b/helm/openwhisk/templates/invoker-pod.yaml
@@ -207,6 +207,10 @@ spec:
 {{- end }}
           - name: "CONFIG_whisk_helm_release"
             value: "{{ .Release.Name }}"
+          - name: "CONFIG_akka_coordinatedShutdown_phases_actorSystemTerminate_timeout"
+            value: "{{ .Values.akka.actorSystemTerminateTimeout }}"
+          - name: "CONFIG_whisk_runtime_delete_timeout"
+            value: "{{ .Values.invoker.runtimeDeleteTimeout }}"
         ports:
         - name: invoker
           containerPort: {{ .Values.invoker.port }}
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index f709994..f89b8a0 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -265,6 +265,7 @@ invoker:
   imageTag: "ed3f76e"
   imagePullPolicy: "IfNotPresent"
   restartPolicy: "Always"
+  runtimeDeleteTimeout: "30 seconds"
   port: 8080
   options: ""
   jvmHeapMB: "512"
@@ -664,3 +665,6 @@ elasticsearch:
   indexPattern: "openwhisk-%s"
   username: "admin"
   password: "admin"
+
+akka:
+  actorSystemTerminateTimeout: "30 s"