[GitHub] houshengbo closed pull request #286: Update for upstream memory-based loadbalancing PR.

[GitBox <gi...@apache.org>]

houshengbo closed pull request #286: Update for upstream memory-based loadbalancing PR.
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/286
 
 
   

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/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


 

----------------------------------------------------------------
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