This is an automated email from the ASF dual-hosted git repository.
rabbah 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 e746b70 update for pureconfig (OpenWhisk PR 2576) (#91)
e746b70 is described below
commit e746b7065f2324aaed927611c431507f5ec6c9dc
Author: David Grove <[email protected]>
AuthorDate: Tue Nov 28 05:08:37 2017 -0500
update for pureconfig (OpenWhisk PR 2576) (#91)
Update invoker and controller deployments for
upstream change to use pureconfig and also define a new
required envvar, DB_WHISK_ACTIVATIONS_FILTER_DDOC.
---
kubernetes/controller/controller.yml | 12 ++++--------
kubernetes/invoker/invoker.yml | 4 +++-
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/kubernetes/controller/controller.yml
b/kubernetes/controller/controller.yml
index 7e5e1b3..a696a70 100644
--- a/kubernetes/controller/controller.yml
+++ b/kubernetes/controller/controller.yml
@@ -36,7 +36,7 @@ spec:
- name: controller
imagePullPolicy: Always
image: openwhisk/controller
- command: ["/bin/bash", "-c", "COMPONENT_NAME=$(hostname | cut -d'-'
-f2) /controller/bin/controller `hostname | cut -d'-' -f2`"]
+ command: ["/bin/bash", "-c", "COMPONENT_NAME=$(hostname | cut -d'-'
-f2) /init.sh `hostname | cut -d'-' -f2`"]
ports:
- name: controller
containerPort: 8080
@@ -52,10 +52,6 @@ spec:
- name: "PORT"
value: "8080"
- # Loadbalancer options
- - name: "LOADBALANCER_INVOKERBUSYTHRESHOLD"
- value: "16"
-
# This needs to stay up to date with the lates runtime in Ansible
Groupvars
- name: "RUNTIMES_MANIFEST"
value: '{ "defaultImagePrefix": "openwhisk", "defaultImageTag":
"latest", "runtimes": { "nodejs": [ { "kind": "nodejs", "image": { "name":
"nodejsaction" }, "deprecated": true }, { "kind": "nodejs:6", "default": true,
"image": { "name": "nodejs6action" }, "deprecated": false } ], "python": [ {
"kind": "python", "image": { "name": "python2action" }, "deprecated": false },
{ "kind": "python:2", "default": true, "image": { "name": "python2action" },
"deprecated": false }, { "kind" [...]
@@ -102,15 +98,13 @@ spec:
value: "5000"
- name: "LIMITS_ACTIONS_INVOKES_CONCURRENT"
value: "30"
- - name: "CONTROLLER_BLACKBOXFRACTION"
- value: "0.10"
- name: "CONTROLLER_LOCALBOOKKEEPING"
value: "FALSE"
- name: "CONTROLLER_HA"
value: "TRUE"
- name: "AKKA_CLUSTER_SEED_NODES"
value: "controller-0.controller.openwhisk
controller-1.controller.openwhisk"
- - name: "AKKA_ACTOR_PROVIDER"
+ - name: "CONFIG_akka_actor_provider"
value: "cluster"
# properties for DB connection
@@ -130,6 +124,8 @@ spec:
value: "whisks"
- name: "DB_WHISK_ACTIVATIONS_DDOC"
value: "whisks"
+ - name: "DB_WHISK_ACTIVATIONS_FILTER_DDOC"
+ value: "whisks-filters.v2"
- name: "DB_WHISK_ACTIVATIONS"
value: "test_activations"
- name: "DB_WHISK_ACTIONS"
diff --git a/kubernetes/invoker/invoker.yml b/kubernetes/invoker/invoker.yml
index 3e63b70..e79be7b 100644
--- a/kubernetes/invoker/invoker.yml
+++ b/kubernetes/invoker/invoker.yml
@@ -37,7 +37,7 @@ spec:
- name: invoker
imagePullPolicy: Always
image: openwhisk/invoker
- command: [ "/bin/bash", "-c", "COMPONENT_NAME=$(hostname | cut -d'-'
-f2) /invoker/bin/invoker `hostname | cut -d'-' -f2`" ]
+ command: [ "/bin/bash", "-c", "COMPONENT_NAME=$(hostname | cut -d'-'
-f2) /init.sh `hostname | cut -d'-' -f2`" ]
env:
- name: "PORT"
value: "8080"
@@ -125,6 +125,8 @@ spec:
value: "whisks"
- name: "DB_WHISK_ACTIVATIONS_DDOC"
value: "whisks"
+ - name: "DB_WHISK_ACTIVATIONS_FILTER_DDOC"
+ value: "whisks-filters.v2"
- name: "DB_WHISK_ACTIVATIONS"
value: "test_activations"
- name: "DB_WHISK_ACTIONS"
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
