[GitHub] csantanapr closed pull request #348: Update for upstream changes in loadbalancer/invoker memory config

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

csantanapr closed pull request #348: Update for upstream changes in loadbalancer/invoker memory config
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/348
 
 
   

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 9419d68..1ef8204 100644
--- a/docs/configurationChoices.md
+++ b/docs/configurationChoices.md
@@ -200,7 +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`
+You will also need to override the value of `whisk.containerPool.userMemory`
 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-pod.yaml b/helm/openwhisk/templates/controller-pod.yaml
index 3590c80..6dc0fc0 100644
--- a/helm/openwhisk/templates/controller-pod.yaml
+++ b/helm/openwhisk/templates/controller-pod.yaml
@@ -83,8 +83,11 @@ spec:
         - name: "RUNTIMES_MANIFEST"
           value: {{ template "openwhisk.runtimes_manifest" . }}
 
-        - name: "CONFIG_whisk_loadbalancer_invokerUserMemory"
-          value: {{ .Values.whisk.loadbalancer.invokerUserMemory | quote }}
+        - name: "CONFIG_whisk_loadbalancer_blackboxFraction"
+          value: {{ .Values.whisk.loadbalancer.blackboxFraction | quote }}
+
+        - name: "CONFIG_whisk_loadbalancer_timeoutFactor"
+          value: {{ .Values.whisk.loadbalancer.timeoutFactor | quote }}
 
         # Kafka properties
         - name: "KAFKA_HOSTS"
diff --git a/helm/openwhisk/templates/invoker-pod.yaml b/helm/openwhisk/templates/invoker-pod.yaml
index ba93903..d218793 100644
--- a/helm/openwhisk/templates/invoker-pod.yaml
+++ b/helm/openwhisk/templates/invoker-pod.yaml
@@ -93,8 +93,8 @@ spec:
           - name: "DOCKER_REGISTRY"
             value: {{ .Values.docker.registry.name | quote }}
 
-          - name: "CONFIG_whisk_loadbalancer_invokerUserMemory"
-            value: {{ .Values.whisk.loadbalancer.invokerUserMemory | quote }}
+          - name: "CONFIG_whisk_containerPool_userMemory"
+            value: {{ .Values.whisk.containerPool.userMemory | quote }}
 
           # DNS Server passed to action containers
 {{- if not (eq .Values.invoker.kubeDNS "nil") }}
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index 51992f5..db82479 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -37,7 +37,10 @@ whisk:
   systemNameSpace: "/whisk.system"
   runtimes: "runtimes.json"
   loadbalancer:
-    invokerUserMemory: "2048m"
+    blackboxFraction: "10%"
+    timeoutFactor: 2
+  containerPool:
+    userMemory: "2048m"
 
 # Properties of the Kubernetes cluster on which OpenWhisk is being deployed
 k8s:


 

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