[incubator-openwhisk-deploy-kube] branch master updated: Update for upstream memory-based loadbalancing PR. (#286)

[ho...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 6d893ea  Update for upstream memory-based loadbalancing PR. (#286)
6d893ea is described below

commit 6d893ea77422f45e017c199b11c822c6603796e2
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Thu Aug 23 17:12:21 2018 -0400

    Update for upstream memory-based loadbalancing PR. (#286)
---
 docs/configurationChoices.md             | 4 ++++
 helm/openwhisk/templates/controller.yaml | 4 ++--
 helm/openwhisk/templates/invoker.yaml    | 6 ++----
 helm/openwhisk/values.yaml               | 6 ++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/configurationChoices.md b/docs/configurationChoices.md
index bbe944a..9419d68 100644
--- a/docs/configurationChoices.md
+++ b/docs/configurationChoices.md
@@ -200,3 +200,7 @@ to your `mycluster.yaml`
 
 For scalability, you will probably want to use `replicaCount` to
 deploy more than one Invoker when using the KubernetesContainerFactory.
+You will also need to override the value of `whisk.loadbalancer.invokerUserMemory`
+to a significantly larger value when using the KubernetesContainerFactory
+to better match the overall memory available on invoker worker nodes divided by
+the number of Invokers you are creating.
diff --git a/helm/openwhisk/templates/controller.yaml b/helm/openwhisk/templates/controller.yaml
index 306f72c..125d139 100644
--- a/helm/openwhisk/templates/controller.yaml
+++ b/helm/openwhisk/templates/controller.yaml
@@ -93,8 +93,8 @@ spec:
         - name: "RUNTIMES_MANIFEST"
           value: {{ template "runtimes_manifest" . }}
 
-        - name: "CONFIG_whisk_loadbalancer_invokerBusyThreshold"
-          value: {{ .Values.invoker.busyThreshold | quote }}
+        - name: "CONFIG_whisk_loadbalancer_invokerUserMemory"
+          value: {{ .Values.whisk.loadbalancer.invokerUserMemory | quote }}
 
         # Kafka properties
         - name: "KAFKA_HOSTS"
diff --git a/helm/openwhisk/templates/invoker.yaml b/helm/openwhisk/templates/invoker.yaml
index 812df79..4dee803 100644
--- a/helm/openwhisk/templates/invoker.yaml
+++ b/helm/openwhisk/templates/invoker.yaml
@@ -89,10 +89,8 @@ spec:
           - name: "DOCKER_REGISTRY"
             value: {{ .Values.docker.registry.name | quote }}
 
-          - name: "CONFIG_whisk_containerPool_numCore"
-            value: {{ .Values.invoker.containerPool.numCore | quote }}
-          - name: "CONFIG_whisk_containerPool_coreShare"
-            value: {{ .Values.invoker.containerPool.coreShare | quote }}
+          - name: "CONFIG_whisk_loadbalancer_invokerUserMemory"
+            value: {{ .Values.whisk.loadbalancer.invokerUserMemory | quote }}
 
           # DNS Server passed to action containers
 {{- if not (eq .Values.invoker.kube_dns "nil") }}
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index 05420ef..4daad53 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -36,6 +36,8 @@ whisk:
     cli: "latest"
   systemNameSpace: "/whisk.system"
   runtimes: "runtimes.json"
+  loadbalancer:
+    invokerUserMemory: "2048m"
 
 # Docker registry
 docker:
@@ -170,10 +172,6 @@ invoker:
         enabled: false
         port: 3233
   containerNetwork: "bridge"
-  containerPool:
-    numcore: 2
-    coreshare: 4
-  busyThreshold: 8
   kube_dns: nil
 
 # API Gateway configurations