rabbah closed pull request #91: update for pureconfig (OpenWhisk PR 2576)
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/91
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/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": "python:3", "image": { "name": "python3action"
}, "deprecated": false } ], "swift": [ { "kind": "swift", "image": { "name":
"swiftaction" }, "deprecated": true }, { "kind": "swift:3", "image": { "name":
"swift3action" }, "deprecated": false }, { "kind": "swift:3.1.1", "default":
true, "image": { "name": "action-swift-v3.1.1" }, "deprecated": false } ],
"java": [ { "kind": "java", "default": true, "image": { "name": "java8action"
}, "deprecated": false, "attached": { "attachmentName": "jarfile",
"attachmentType": "application/java-archive" }, "sentinelledLogs": false,
"requireMain": true } ] }, "blackboxes": [ { "name": "dockerskeleton" } ] }'
@@ -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"
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
