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 7071873 Editing pass on values-metadata.yaml (#400)
7071873 is described below
commit 707187353442449d15186953eb923b4de43518be
Author: David Grove <[email protected]>
AuthorDate: Wed Jan 9 18:21:28 2019 -0500
Editing pass on values-metadata.yaml (#400)
* Editing pass on values-metadata.yaml
Take a pass through the metadata file and expand description
text, add options lists where appropriate, and misc. cleanups.
* Update values-metadata.yaml based on review comments
---
docs/k8s-google.md | 2 +-
docs/k8s-ibm-private.md | 2 +-
docs/k8s-ibm-public.md | 2 +-
helm/openwhisk/templates/frontdoor-ingress.yaml | 2 +-
helm/openwhisk/templates/frontdoor-secrets.yaml | 2 +-
helm/openwhisk/values-metadata.yaml | 741 ++++++++++++++----------
helm/openwhisk/values.yaml | 32 +-
7 files changed, 457 insertions(+), 326 deletions(-)
diff --git a/docs/k8s-google.md b/docs/k8s-google.md
index c6970a3..7a68777 100644
--- a/docs/k8s-google.md
+++ b/docs/k8s-google.md
@@ -51,7 +51,7 @@ whisk:
apiHostName: <domain>
apiHostPort: 443
apiHostProto: https
- type: standard
+ type: Standard
domain: <domain>
tls:
enabled: true
diff --git a/docs/k8s-ibm-private.md b/docs/k8s-ibm-private.md
index 1c53ccf..8fca5d8 100644
--- a/docs/k8s-ibm-private.md
+++ b/docs/k8s-ibm-private.md
@@ -122,7 +122,7 @@ whisk:
apiHostName: <your fqdn>
apiHostPort: 443
apiHostProto: https
- type: standard
+ type: Standard
domain: <your fqdn>
tls:
enabled: true
diff --git a/docs/k8s-ibm-public.md b/docs/k8s-ibm-public.md
index 4fc303c..fe30834 100644
--- a/docs/k8s-ibm-public.md
+++ b/docs/k8s-ibm-public.md
@@ -75,7 +75,7 @@ whisk:
apiHostName: openwhisk.<domain>
apiHostPort: 443
apiHostProto: https
- type: standard
+ type: Standard
domain: openwhisk.<domain>
tls:
enabled: true
diff --git a/helm/openwhisk/templates/frontdoor-ingress.yaml
b/helm/openwhisk/templates/frontdoor-ingress.yaml
index a2607b7..5182cca 100644
--- a/helm/openwhisk/templates/frontdoor-ingress.yaml
+++ b/helm/openwhisk/templates/frontdoor-ingress.yaml
@@ -1,7 +1,7 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
# license agreements; and to You under the Apache License, Version 2.0.
-{{- if eq .Values.whisk.ingress.type "standard" }}
+{{- if eq .Values.whisk.ingress.type "Standard" }}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
diff --git a/helm/openwhisk/templates/frontdoor-secrets.yaml
b/helm/openwhisk/templates/frontdoor-secrets.yaml
index 3f3bbcc..62d6ba9 100644
--- a/helm/openwhisk/templates/frontdoor-secrets.yaml
+++ b/helm/openwhisk/templates/frontdoor-secrets.yaml
@@ -1,7 +1,7 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
# license agreements; and to You under the Apache License, Version 2.0.
-{{- if eq .Values.whisk.ingress.type "standard" }}
+{{- if eq .Values.whisk.ingress.type "Standard" }}
{{- if .Values.whisk.ingress.tls.createsecret }}
apiVersion: v1
kind: Secret
diff --git a/helm/openwhisk/values-metadata.yaml
b/helm/openwhisk/values-metadata.yaml
index 76b16d7..555867c 100644
--- a/helm/openwhisk/values-metadata.yaml
+++ b/helm/openwhisk/values-metadata.yaml
@@ -8,137 +8,149 @@
## apiHostName configuration metadata
whisk:
__metadata:
- label: "OpenWhisk configuration"
- description: "Please update the folllowing default values to configure
OpenWhisk"
+ label: "General OpenWhisk configuration"
+ description: "System-wide configuration parameters for your OpenWhisk
deployment"
ingress:
name:
__metadata:
label: "Ingress name"
- description: "Please specify Ingress name"
+ description: "A name for the Ingress resource"
type: "string"
required: true
apiHostName:
__metadata:
label: "API host name"
- description: "Please specify the hostname / IP address of your cluster"
+ description: "The external hostname or IP address used to access the
Ingress of your Kubernetes cluster"
type: "string"
required: true
apiHostPort:
__metadata:
label: "API host port"
- description: "Please specify API host port"
+ description: "The external port used to access the Ingress of your
Kubernetes cluster"
type: "string"
required: true
apiHostProto:
__metadata:
label: "API host protocol"
- description: "Please specify API host protocol"
+ description: "The protocol to be used to connect to the Ingress of
your Kubernetes cluster"
type: "string"
required: true
+ options:
+ - label: "http"
+ value: "http"
+ - label: "https"
+ value: "https"
type:
__metadata:
label: "Ingress type"
- description: "Please specify Ingress type"
+ description: "The type of Ingress being deployed (NodePort,
LoadBalancer, Standard)"
type: "string"
required: true
+ options:
+ - label: "NodePort"
+ value: "NodePort"
+ - label: "LoadBalancer"
+ value: "LoadBalancer"
+ - label: "Standard"
+ value: "Standard"
annotations:
__metadata:
- label: "Annotations"
- description: "Please specify annotations as key: value pairs"
+ label: "Ingress Annotations"
+ description: "Annotations to add to Ingress resource. Specify as a
list of key: value pairs"
type: "string"
multiline: true
required: false
domain:
__metadata:
- label: "Domain"
- description: "Please specify domain"
+ label: "Ingress Domain"
+ description: "The Fully Qualified Host Name for the Ingress domain"
type: "string"
required: true
tls:
enabled:
__metadata:
label: "TLS enabled"
- description: "Please specify if TLS is enabled"
+ description: "If TLS is enabled for the Ingress"
type: "boolean"
required: true
secretenabled:
__metadata:
label: "Secret enabled"
- description: "Please specify if secret is enabled"
+ description: "If TLS secret is enabled for the Ingress"
type: "boolean"
required: true
createsecret:
__metadata:
label: "Create secret"
- description: "Please specify if secret should be created"
+ description: "If the Ingress TLS secret should be auto-created when
chart is deployed"
type: "boolean"
required: true
secretname:
__metadata:
label: "TLS Secret name"
- description: "Please specify TLS secret name"
+ description: "The name of the Ingress TLS secret"
type: "string"
required: true
secrettype:
__metadata:
label: "TLS Secret type"
- description: "Please specify TLS secret type"
+ description: "The type of the Ingress TLS secret"
type: "string"
required: true
crt:
__metadata:
label: "TLS crt"
- description: "Please specify TLS crt"
+ description: "The TLS certificate for the Ingress"
type: "string"
required: true
key:
__metadata:
label: "TLS Key"
- description: "Please specify TLS Key"
+ description: "The TLS key for the Ingress"
type: "string"
required: true
auth:
system:
__metadata:
- label: "Auth system"
- description: "Please specify auth system"
+ label: "System auth"
+ description: "The auth secret for the system namespace"
type: "string"
required: true
guest:
__metadata:
- label: "Auth guest"
- description: "Please specify auth guest"
+ label: "Guest auth"
+ description: "The auth secret for the guest namespace"
type: "string"
required: true
systemNameSpace:
__metadata:
label: "System namespace"
- description: "Please specify system namespace"
+ description: "The namespace in which to install OpenWhisk system actions
and packages"
type: "string"
required: true
limits:
actionsInvokesPerminute:
__metadata:
label: "Maximum actions invoked per minute"
- description: "Please specify maximum actions invoked per minute"
+ description: "The maximum number of action invocations per minute by a
single namespace"
type: "number"
required: true
actionsInvokesConcurrent:
__metadata:
label: "Maximum concurrent action invocations"
- description: "Please specify maximum concurrent action invocations"
+ description: "The maximum number of concurrent action invocations by a
single namespace"
type: "number"
required: true
triggersFiresPerminute:
__metadata:
label: "Maximum triggers fired per minute"
- description: "Please specify maximum triggers fired per minute"
+ description: "The maximum triggers fired per minute for a single
namespace"
type: "number"
required: true
actionsSequenceMaxlength:
__metadata:
label: "Maximum length of action sequence"
- description: "Please specify maximum length of action sequence"
+ description: "The maximum length of an action sequence"
type: "number"
required: true
actions:
@@ -146,76 +158,76 @@ whisk:
min:
__metadata:
label: "Minimum action time"
- description: "Please specify minimum action time"
+ description: "The minimum billing granularity for action execution
time"
type: "string"
required: true
max:
__metadata:
label: "Maximum action time"
- description: "Please specify maximum action time"
+ description: "The maximum allowed execution time for any action"
type: "string"
required: true
std:
__metadata:
label: "Standard action time"
- description: "Please specify standard action time"
+ description: "The default maximum execution time for an action"
type: "string"
required: true
memory:
min:
__metadata:
label: "Minimum action memory"
- description: "Please specify minimum action memory"
+ description: "The minimum memory allocation for an action"
type: "string"
required: true
max:
__metadata:
label: "Maximum action memory"
- description: "Please specify maximum action memory"
+ description: "The maximum allowed memory allocation for an action"
type: "string"
required: true
std:
__metadata:
label: "Standard action memory"
- description: "Please specify standard action memory"
+ description: "The default memory allocation for an action"
type: "string"
required: true
concurrency:
min:
__metadata:
label: "Minimum action concurrency"
- description: "Please specify minimum action concurrency"
- type: "string"
+ description: "The minimum number of concurrent requests supported
by a single action container"
+ type: "number"
required: true
max:
__metadata:
label: "Maximum action concurrency"
- description: "Please specify maximum action concurrency"
- type: "string"
+ description: "The maximum number of concurrent requests supported
by a single action container"
+ type: "number"
required: true
std:
__metadata:
label: "Standard action concurrency"
- description: "Please specify standard action concurrency"
- type: "string"
+ description: "The default number of concurrent requests supported
by a single action container"
+ type: "number"
required: true
log:
min:
__metadata:
label: "Mimimum action log size"
- description: "Please specify mimimum action log size"
+ description: "The mimimum log size for an action invocation"
type: "string"
required: true
max:
__metadata:
label: "Maximum action log size"
- description: "Please specify maximum action log size"
+ description: "The maximum allowed log size for an action
invocation"
type: "string"
required: true
std:
__metadata:
label: "Standard action log size"
- description: "Please specify standard action log size"
+ description: "The default allowed log size for an action
invocation"
type: "string"
required: true
activation:
@@ -223,143 +235,143 @@ whisk:
max:
__metadata:
label: "Maximum activation payload"
- description: "Please specify maximum activation payload"
+ description: "The maximum size of an activation payload"
type: "string"
required: true
loadbalancer:
blackboxFraction:
__metadata:
label: "Loadbalancer blackbox fraction"
- description: "Please specify loadbalancer blackbox fraction"
+ description: "The fraction of invokers reserved to execute blackbox
actions"
type: "string"
required: true
timeoutFactor:
__metadata:
label: "Loadbalancer timeout factor"
- description: "Please specify loadbalancer timeout factor"
+ description: "The loadbalancer's timeout factor"
type: "number"
required: true
kafka:
replicationFactor:
__metadata:
- label: "Kafka replication factor"
- description: "Please specify kafka replication factor"
+ label: "Kafka topic replication factor"
+ description: "The replication factor for all Kafka topics"
type: "string"
required: false
topics:
cacheInvalidation:
segmentBytes:
__metadata:
- label: "Kafka topic cache invalidation segment bytes"
- description: "Please specify Kafka topic cache invalidation
segment bytes"
+ label: "cacheInvalidation segment bytes"
+ description: "Kafka topic configuration: the cacheInvalidation
topic's segment bytes"
type: "string"
required: false
retentionBytes:
__metadata:
- label: "Kafka topic cache invalidation retention bytes"
- description: "Please specify Kafka topic cache invalidation
retention bytes"
+ label: "cacheInvalidation retention bytes"
+ description: "Kafka topic configuration: the cacheInvalidation
topic's retention bytes"
type: "string"
required: false
retentionMs:
__metadata:
- label: "Kafka topic cache invalidation retention ms"
- description: "Please specify Kafka topic cache invalidation
retention ms"
+ label: "cacheInvalidation retention ms"
+ description: "Kafka topic configuration: the cacheInvalidation
topic's retention ms"
type: "string"
required: false
completed:
segmentBytes:
__metadata:
- label: "Kafka topic completed segment bytes"
- description: "Please specify Kafka topic completed segment bytes"
+ label: "completed segment bytes"
+ description: "Kafka topic configuration: the completed topic's
segment bytes"
type: "string"
required: false
retentionBytes:
__metadata:
- label: "Kafka topic completed retention bytes"
- description: "Please specify Kafka topic completed retention bytes"
+ label: "completed retention bytes"
+ description: "Kafka topic configuration: the completed topic's
retention bytes"
type: "string"
required: false
retentionMs:
__metadata:
- label: "Kafka topic completed retention ms"
- description: "Please specify Kafka topic completed retention ms"
+ label: "completed retention ms"
+ description: "Kafka topic configuration: the completed topic's
retention ms"
type: "string"
required: false
events:
segmentBytes:
__metadata:
- label: "Kafka topic events segment bytes"
- description: "Please specify Kafka topic events segment bytes"
+ label: "events segment bytes"
+ description: "Kafka topic configuration: the events topic's
segment bytes"
type: "string"
required: false
retentionBytes:
__metadata:
- label: "Kafka topic events retention bytes"
- description: "Please specify Kafka topic events retention bytes"
+ label: "events retention bytes"
+ description: "Kafka topic configuration: the events topic's
retention bytes"
type: "string"
required: false
retentionMs:
__metadata:
- label: "Kafka topic events retention ms"
- description: "Please specify Kafka topic events retention ms"
+ label: "events retention ms"
+ description: "Kafka topic configuration: the events topic's
retention ms"
type: "string"
required: false
health:
segmentBytes:
__metadata:
- label: "Kafka topic health segment bytes"
- description: "Please specify Kafka topic health segment bytes"
+ label: "health segment bytes"
+ description: "Kafka topic configuration: the health topic's
segment bytes"
type: "string"
required: false
retentionBytes:
__metadata:
- label: "Kafka topic health retention bytes"
- description: "Please specify Kafka topic health retention bytes"
+ label: "health retention bytes"
+ description: "Kafka topic configuration: the health topic's
retention bytes"
type: "string"
required: false
retentionMs:
__metadata:
- label: "Kafka topic health retention ms"
- description: "Please specify Kafka topic health retention ms"
+ label: "health retention ms"
+ description: "Kafka topic configuration: the health topic's
retention ms"
type: "string"
required: false
invoker:
segmentBytes:
__metadata:
- label: "Kafka topic invoker segment bytes"
- description: "Please specify Kafka topic invoker segment bytes"
+ label: "invoker segment bytes"
+ description: "Kafka topic configuration: the invoker-N topic's
segment bytes"
type: "string"
required: false
retentionBytes:
__metadata:
- label: "Kafka topic invoker retention bytes"
- description: "Please specify Kafka topic invoker retention bytes"
+ label: "invoker retention bytes"
+ description: "Kafka topic configuration: the invoker-N topic's
retention bytes"
type: "string"
required: false
retentionMs:
__metadata:
- label: "Kafka topic invoker retention ms"
- description: "Please specify Kafka topic invoker retention ms"
+ label: "invoker retention ms"
+ description: "Kafka topic configuration: the invoker-N topic's
retention ms"
type: "string"
required: false
containerPool:
userMemory:
__metadata:
label: "Comtainerpool user memory"
- description: "Please specify container pool user memory"
+ description: "The total memory available to a single Invoker for
executing user actions"
type: "string"
required: true
runtimes:
__metadata:
label: "Runtimes"
- description: "Please specify runtimes"
+ description: "The JSON file containing the runtimes manifest for this
deployment"
type: "string"
required: true
testing:
includeSystemTests:
__metadata:
label: "Include system tests"
- description: "Please specify if systems tests should be included"
+ description: "If systems tests should be included in the Helm test
suite"
type: "boolean"
required: true
versions:
@@ -367,570 +379,628 @@ whisk:
buildDate:
__metadata:
label: "OpenWhisk build date"
- description: "Please specify OpenWhisk build date"
+ description: "The OpenWhisk build date"
type: "string"
required: true
buildNo:
__metadata:
label: "OpenWhisk build number"
- description: "Please specify OpenWhisk build number"
+ description: "The OpenWhisk build number"
type: "string"
required: true
gitTag:
__metadata:
label: "OpenWhisk git tag"
- description: "Please specify OpenWhisk git tag"
+ description: "The git tag for incubator-openwhisk"
type: "string"
required: true
openwhiskCli:
tag:
__metadata:
label: "CLI tag"
- description: "Please specify CLI tag"
+ description: "The git tag for incubator-openwhisk-cli"
type: "string"
required: true
openwhiskCatalog:
gitTag:
__metadata:
label: "Catalog git tag"
- description: "Please specify Catalog git tag"
+ description: "The git tag for incubator-openwhisk-catalog"
type: "string"
required: true
openwhiskPackageAlarms:
gitTag:
__metadata:
label: "Alarms git tag"
- description: "Please specify Alarms git tag"
+ description: "The git tag for incubator-openwhisk-package-alarms"
type: "string"
required: true
openwhiskPackageCloudant:
gitTag:
__metadata:
label: "Cloudant git tag"
- description: "Please specify Cloudant git tag"
+ description: "The git tag for incubator-openwhisk-package-cloudant"
type: "string"
required: true
openwhiskPackageKafka:
gitTag:
__metadata:
label: "Kafka git tag"
- description: "Please specify Kafka git tag"
+ description: "The git tag for incubator-openwhisk-package-kafka"
type: "string"
required: true
k8s:
__metadata:
label: "Kubernetes configuration"
- description: "Please update the folllowing default values to configure
Kubernetes"
+ description: "Configuration values to describe your Kubernetes cluster"
domain:
__metadata:
label: "Domain"
- description: "Please specify domain"
+ description: "The DNS suffix for services in your cluster (eg.
\"cluster.local\")"
type: "string"
required: true
dns:
__metadata:
- label: "DNS"
- description: "Please specify DNS"
+ label: "DNS nameserver"
+ description: "The Internal IP of your clusters DNS service"
type: "string"
required: true
persistence:
enabled:
__metadata:
label: "Persistence enabled"
- description: "Please specify if persistence should be enabled"
+ description: "If persistence should be enabled"
type: "boolean"
required: true
hasDefaultStorageClass:
__metadata:
label: "Has default storage class"
- description: "Please specify if default storage class is configured"
+ description: "If your cluster has a default storage class configured"
type: "boolean"
required: true
explicitStorageClass:
__metadata:
label: "Explicit storage class"
- description: "Please specify explicit storage class"
+ description: "The name of the StorageClass to use if not using the
default StorageClass"
type: "string"
required: false
utility:
__metadata:
label: "Utility configuration"
- description: "Please update the folllowing default values to configure
utilities"
+ description: "Update these default values to configure utility images"
imageName:
__metadata:
label: "Image name"
- description: "Please specify image name"
+ description: "The name of the OpenWhisk utility image"
type: "string"
required: true
imageTag:
__metadata:
label: "Image tag"
- description: "Please specify image tag"
+ description: "The tag of the OpenWhisk utility image"
type: "string"
required: true
imagePullPolicy:
__metadata:
label: "Image pull policy"
- description: "Please specify image pull policy"
+ description: "The image pull policy to apply for this image."
type: "string"
required: true
-
+ options:
+ - label: "Always"
+ value: "Always"
+ - label: "Never"
+ value: "Never"
+ - label: "IfNotPresent"
+ value: "IfNotPresent"
docker:
__metadata:
- label: "Docker configuration"
- description: "Please update the folllowing default values to configure
Docker"
+ label: "Docker Registry configuration"
+ description: "Change these default values to configure the Docker Registry"
registry:
name:
__metadata:
- label: "Registry name"
- description: "Please specify registry name"
+ label: "Docker Registry name"
+ description: "The Docker Registry name"
type: "string"
required: false
username:
__metadata:
- label: "Username"
- description: "Please specify username"
+ label: "Docker Registry username"
+ description: "The username for the Docker Registry"
type: "string"
required: false
password:
__metadata:
- label: "Password"
- description: "Please specify password"
+ label: "Docker Registry password"
+ description: "The password for the Docker Registry"
type: "password"
required: false
timezone:
__metadata:
label: "Timezone"
- description: "Please specify timezone"
+ description: "The timezone to use when performing Docker operations"
type: "string"
required: false
zookeeper:
__metadata:
label: "Zookeeper configuration"
- description: "PPlease update the folllowing default values to configure
Zookeeper"
+ description: "Update these default values to customize the Zookeeper
deployment"
external:
__metadata:
label: "External"
- description: "Please specify if Zookeeper is external"
+ description: "If using an externally deployed Zookeeper"
type: "boolean"
required: true
name:
__metadata:
label: "Name"
- description: "Please specify name"
+ description: "The service name"
type: "string"
required: true
imageName:
__metadata:
label: "Image name"
- description: "Please specify image name"
+ description: "The docker image name"
type: "string"
required: true
imageTag:
__metadata:
label: "Image tag"
- description: "Please specify image tag"
+ description: "The docker image tag"
type: "string"
required: true
imagePullPolicy:
__metadata:
label: "Image pull policy"
- description: "Please specify image pull policy"
+ description: "The image pull policy to apply for this image."
type: "string"
required: true
+ options:
+ - label: "Always"
+ value: "Always"
+ - label: "Never"
+ value: "Never"
+ - label: "IfNotPresent"
+ value: "IfNotPresent"
replicaCount:
__metadata:
label: "Replica count"
- description: "Please specify replica count"
+ description: "Number of zookeeper instances to deploy; must be an odd
number."
type: "number"
required: true
+ options:
+ - label: "1"
+ value: "1"
+ - label: "3"
+ value: "3"
+ - label: "5"
+ value: "5"
restartPolicy:
__metadata:
label: "Restart policy"
- description: "Please specify restart policy"
+ description: "The restart policy for zookeeper pods"
type: "string"
required: true
port:
__metadata:
label: "Port"
- description: "Please specify port"
+ description: "The primary zookeeper port"
type: "string"
required: true
serverPort:
__metadata:
label: "Server port"
- description: "Please specify server port"
+ description: "The zookeeper server port"
type: "string"
required: true
leaderElectionPort:
__metadata:
label: "Leader election port"
- description: "Please specify leader election port"
+ description: "The zookeeper leader election port"
type: "string"
required: true
persistence:
pvcName:
__metadata:
label: "PVC name"
- description: "Please specify PVC name"
+ description: "The PVC name"
type: "string"
required: true
size:
__metadata:
label: "Size"
- description: "Please specify size"
+ description: "The persistent volume size"
type: "string"
required: true
config:
tickTime:
__metadata:
label: "Tick time"
- description: "Please specify Tick time"
+ description: "Zookeeper configuration: Tick time"
type: "number"
required: true
initLimit:
__metadata:
label: "Init limit"
- description: "Please specify Init limit"
+ description: "Zookeeper configuration: Init limit"
type: "number"
required: true
syncLimit:
__metadata:
label: "Sync limit"
- description: "Please specify Sync limit"
+ description: "Zookeeper configuration: Sync limit"
type: "number"
required: true
dataDir:
__metadata:
label: "Data directory"
- description: "Please specify Data directory"
+ description: "Zookeeper configuration: Data directory"
type: "string"
required: true
dataLogDir:
__metadata:
label: "Data log directory"
- description: "Please specify Data log directory"
+ description: "Zookeeper configuration: Data log directory"
type: "string"
required: true
kafka:
__metadata:
label: "Kafka configuration"
- description: "Please update the folllowing default values to configure
Kafka"
+ description: "Update these default values to customize the Kafka
deployment"
external:
__metadata:
label: "External"
- description: "Please specify if Kafka is external"
+ description: "If using an externally deployed Kafka"
type: "boolean"
required: true
name:
__metadata:
label: "Name"
- description: "Please specify name"
+ description: "The service name"
type: "string"
required: true
imageName:
__metadata:
label: "Image name"
- description: "Please specify image name"
+ description: "The docker image name"
type: "string"
required: true
imageTag:
__metadata:
label: "Image tag"
- description: "Please specify image tag"
+ description: "The docker image tag"
type: "string"
required: true
imagePullPolicy:
__metadata:
label: "Image pull policy"
- description: "Please specify image pull policy"
+ description: "The image pull policy to apply for this image."
type: "string"
required: true
+ options:
+ - label: "Always"
+ value: "Always"
+ - label: "Never"
+ value: "Never"
+ - label: "IfNotPresent"
+ value: "IfNotPresent"
replicaCount:
__metadata:
label: "Replica count"
- description: "Please specify replica count"
+ description: "Number of Kafka instances to deploy. Currently must be 1"
type: "number"
required: true
restartPolicy:
__metadata:
label: "Restart policy"
- description: "Please specify restart policy"
+ description: "The restart policy for Kafka pods"
type: "string"
required: true
port:
__metadata:
label: "Port"
- description: "Please specify port"
+ description: "The primary kafka port"
type: "string"
required: true
persistence:
pvcName:
__metadata:
label: "PVC name"
- description: "Please specify PVC name"
+ description: "The name of the PersistentVolumeClaim for Kafka"
type: "string"
required: true
size:
__metadata:
label: "Size"
- description: "Please specify size"
+ description: "The size of the Kafka persistent volume"
type: "string"
required: true
db:
__metadata:
label: "Database configuration"
- description: "Please update the folllowing default values to configure the
database"
+ description: "Update these default values to customize the CouchDB
deployment"
external:
__metadata:
label: "External"
- description: "Please specify if database is external"
+ description: "If using an externally deployed CouchDB"
type: "boolean"
required: true
wipeAndInit:
__metadata:
label: "wipe and initialise"
- description: "Please specify if database should be wiped and initialised"
+ description: "If the database should be wiped and initialised when
OpenWhisk is deployed"
type: "boolean"
required: true
name:
__metadata:
label: "Name"
- description: "Please specify name"
+ description: "The service name"
type: "string"
required: true
imageName:
__metadata:
label: "Image name"
- description: "Please specify image name"
+ description: "The docker image name"
type: "string"
required: true
imageTag:
__metadata:
label: "Image tag"
- description: "Please specify image tag"
+ description: "The docker image tag"
type: "string"
required: true
imagePullPolicy:
__metadata:
label: "Image pull policy"
- description: "Please specify image pull policy"
+ description: "The image pull policy to apply for this image."
type: "string"
required: true
+ options:
+ - label: "Always"
+ value: "Always"
+ - label: "Never"
+ value: "Never"
+ - label: "IfNotPresent"
+ value: "IfNotPresent"
replicaCount:
__metadata:
label: "Replica count"
- description: "Please specify replica count"
+ description: "Number of database instances to deploy. Currently must be
1"
type: "number"
required: true
restartPolicy:
__metadata:
label: "Restart policy"
- description: "Please specify restart policy"
+ description: "The restart policy for database pods"
type: "string"
required: true
host:
__metadata:
label: "Host"
- description: "Please specify Host"
+ description: "If using an external database, the hostname or IP address
to use to connect to the database"
type: "string"
required: true
port:
__metadata:
label: "Port"
- description: "Please specify port"
+ description: "If using an external database, the port to use to connect
to the database"
type: "string"
required: true
provider:
__metadata:
label: "Provider"
- description: "Please specify Provider"
+ description: "If using an external database, whether it is Cloudant or
CouchDB"
type: "string"
required: true
+ options:
+ - label: "CouchDB"
+ value: "CouchDB"
+ - label: "Cloudant"
+ value: "Cloudant"
protocol:
__metadata:
label: "Protocol"
- description: "Please specify Protocol"
+ description: "If using an external database, the protocol to use to
connect to the database"
type: "string"
required: true
+ options:
+ - label: "http"
+ value: "http"
+ - label: "https"
+ value: "https"
auth:
username:
__metadata:
label: "Username"
- description: "Please specify Username"
+ description: "The username to use when connecting to the database"
type: "string"
required: true
password:
__metadata:
label: "Password"
- description: "Please specify Password"
+ description: "The password to use when connecting to the database"
type: "password"
required: true
dbPrefix:
__metadata:
label: "Prefix"
- description: "Please specify Prefix"
+ description: "The prefix to use when creating database resources"
type: "string"
required: true
activationsTable:
__metadata:
label: "Activations table"
- description: "Please specify Activations table"
+ description: "The name of the activations table"
type: "string"
required: true
actionsTable:
__metadata:
label: "Actions table"
- description: "Please specify actions table"
+ description: "The name of the actions table"
type: "string"
required: true
authsTable:
__metadata:
label: "Auths table"
- description: "Please specify Auths table"
+ description: "The name of the auths table"
type: "string"
required: true
persistence:
pvcName:
__metadata:
label: "PVC name"
- description: "Please specify PVC name"
+ description: "The PersistentVolumeClaim name for CouchDB"
type: "string"
required: true
size:
__metadata:
label: "Size"
- description: "Please specify size"
+ description: "The size of the persistent volume for CouchDB"
type: "string"
required: true
nginx:
__metadata:
label: "NGINX Configuration"
- description: "Please update the folllowing default values to configure
NGINX"
+ description: "Update these default values to customize the NGINX
deployment"
name:
__metadata:
label: "Name"
- description: "Please specify name"
+ description: "The service name"
type: "string"
required: true
imageName:
__metadata:
label: "Image name"
- description: "Please specify image name"
+ description: "The docker image name"
type: "string"
required: true
imageTag:
__metadata:
label: "Image tag"
- description: "Please specify image tag"
+ description: "The docker image tag"
type: "string"
required: true
imagePullPolicy:
__metadata:
label: "Image pull policy"
- description: "Please specify image pull policy"
+ description: "The image pull policy to apply for this image."
type: "string"
required: true
+ options:
+ - label: "Always"
+ value: "Always"
+ - label: "Never"
+ value: "Never"
+ - label: "IfNotPresent"
+ value: "IfNotPresent"
replicaCount:
__metadata:
label: "Replica count"
- description: "Please specify replica count"
+ description: "The number of nginx instances to deploy"
type: "string"
required: true
restartPolicy:
__metadata:
label: "Restart policy"
- description: "Please specify restart policy"
+ description: "The restart policy for nginx pods"
type: "string"
required: true
httpPort:
__metadata:
label: "HTTP port"
- description: "Please specify HTTP port"
+ description: "The port to use for HTTP connections"
type: "string"
required: true
httpsPort:
__metadata:
label: "HTTPS port"
- description: "Please specify HTTPS port"
+ description: "The port to use for HTTPS connections"
type: "string"
required: true
httpsNodePort:
__metadata:
label: "HTTPS node port"
- description: "Please specify HTTPS node port"
+ description: "The port for HTTPS connections when using a NodePort
Ingress"
type: "string"
required: true
controller:
__metadata:
label: "Controller configuration"
- description: "Please update the folllowing default values to configure
Controller"
+ description: "Update these default values to customize the OpenWhisk
Controller deployment"
name:
__metadata:
label: "Name"
- description: "Please specify name"
+ description: "The service name"
type: "string"
required: true
imageName:
__metadata:
label: "Image name"
- description: "Please specify image name"
+ description: "The docker image name"
type: "string"
required: true
imageTag:
__metadata:
label: "Image tag"
- description: "Please specify image tag"
+ description: "The docker image tag"
type: "string"
required: true
imagePullPolicy:
__metadata:
label: "Image pull policy"
- description: "Please specify image pull policy"
+ description: "The image pull policy to apply for this image."
type: "string"
required: true
+ options:
+ - label: "Always"
+ value: "Always"
+ - label: "Never"
+ value: "Never"
+ - label: "IfNotPresent"
+ value: "IfNotPresent"
replicaCount:
__metadata:
label: "Replica count"
- description: "Please specify replica count"
- type: "string"
+ description: "The number of controller instances to deploy"
+ type: "number"
required: true
restartPolicy:
__metadata:
label: "Restart policy"
- description: "Please specify restart policy"
+ description: "The restart policy for controller pods"
type: "string"
required: true
port:
__metadata:
label: "Port"
- description: "Please specify port"
+ description: "The primary port for the controller service"
type: "string"
required: true
options:
__metadata:
label: "Options"
- description: "Please specify options"
+ description: "Additional controller command line options"
type: "string"
required: false
jvmHeapMB:
__metadata:
label: "JVM heap memory (MB)"
- description: "Please specify the maximum Java heap size in megabytes
(MB)"
+ description: "The maximum Java heap size in megabytes (MB)"
type: "string"
required: true
jvmOptions:
__metadata:
label: "JVM options"
- description: "Please specify JVM options"
+ description: "Additional JVM command line options"
type: "string"
required: false
@@ -938,134 +1008,153 @@ controller:
invoker:
__metadata:
label: "Invoker Configuration"
- description: "Please update the folllowing default values to configure
Invoker"
+ description: "Update these default values to customize the OpenWhisk
Invoker deployment"
name:
__metadata:
label: "Name"
- description: "Please specify name"
+ description: "The service name"
type: "string"
required: true
imageName:
__metadata:
label: "Image name"
- description: "Please specify image name"
+ description: "Docker image name for the Invoker"
type: "string"
required: true
imageTag:
__metadata:
label: "Image tag"
- description: "Please specify image tag"
+ description: "The docker image tag for the Invoker"
type: "string"
required: true
imagePullPolicy:
__metadata:
label: "Image pull policy"
- description: "Please specify image pull policy"
+ description: "The image pull policy to apply for this image."
type: "string"
required: true
+ options:
+ - label: "Always"
+ value: "Always"
+ - label: "Never"
+ value: "Never"
+ - label: "IfNotPresent"
+ value: "IfNotPresent"
restartPolicy:
__metadata:
label: "Restart policy"
- description: "Please specify restart policy"
+ description: "The restart policy for invoker pods"
type: "string"
required: true
port:
__metadata:
label: "Port"
- description: "Please specify port"
+ description: "The primary invoker port"
type: "string"
required: true
options:
__metadata:
label: "Additional options"
- description: "Please specify additional options"
+ description: "Additional command line options to give to the invoker"
type: "string"
required: false
jvmHeapMB:
__metadata:
label: "JVM heap memory (MB)"
- description: "Please specify the maximum Java heap size in megabytes
(MB)"
+ description: "the maximum Java heap size in megabytes (MB)"
type: "string"
required: true
jvmOptions:
__metadata:
label: "JVM options"
- description: "Please specify JVM options"
+ description: "Additional JVM command line options"
type: "string"
required: false
containerFactory:
dind:
__metadata:
label: "dind"
- description: "Please specify if dind shoud be used"
+ description: "If using Docker-in-Docker to run your Kubernetes cluster"
type: "boolean"
required: true
useRunc:
__metadata:
label: "useRunc"
- description: "Please specify if Runc should be used"
+ description: "Should the invoker use runc to pause/unpause idle action
containers"
type: "boolean"
required: true
impl:
__metadata:
label: "impl"
- description: "Please specify the implementation to be used"
+ description: "Which ContainerFactory shoUld be used"
type: "string"
required: true
+ options:
+ - label: "docker"
+ value: "docker"
+ - label: "kubernetes"
+ value: "kubernetes"
kubernetes:
replicaCount:
__metadata:
- label: "Kubernetes replica count"
- description: "Please specify Kubernetes replica count"
- type: "string"
+ label: "ContainerFactory replica count"
+ description: "How many instances of the KubernetesContainerFactory
should be deployed?"
+ type: "number"
required: true
agent:
name:
__metadata:
- label: "Agent name"
- description: "Please specify agent name"
+ label: "name of InvokerAgent"
+ description: "The name of the invoker agent daemonset"
type: "string"
required: true
imageName:
__metadata:
- label: "Agent image name"
- description: "Please specify agent image name"
+ label: "InvokerAgent image name"
+ description: "The docker image name for the invoker agent"
type: "string"
required: true
imageTag:
__metadata:
- label: "Agent image tag"
- description: "Please specify agent image tag"
+ label: "InvokerAgent image tag"
+ description: "The docker image tag for the invoker agent"
type: "string"
required: true
imagePullPolicy:
__metadata:
- label: "Agent image pull policy"
- description: "Please specify agent image pull policy"
+ label: "Image pull policy"
+ description: "The image pull policy to apply for this image."
type: "string"
required: true
+ options:
+ - label: "Always"
+ value: "Always"
+ - label: "Never"
+ value: "Never"
+ - label: "IfNotPresent"
+ value: "IfNotPresent"
enabled:
__metadata:
label: "Agent enabled"
- description: "Please specify if agent should be enabled"
+ description: "If the invoker agent should be enabled"
type: "boolean"
required: true
port:
__metadata:
label: "Agent port"
- description: "Please specify agent port"
+ description: "The primary invoker agent port"
type: "string"
required: true
containerNetwork:
__metadata:
label: "Container Network"
- description: "Please specify container network"
+ description: "Docker network to be used by user action containers"
type: "string"
required: false
nameservers:
__metadata:
label: "Nameservers"
- description: "Please specify nameservers"
+ description: "The DNS nameserver to be used by user action containers"
type: "string"
required: false
@@ -1073,156 +1162,175 @@ invoker:
apigw:
__metadata:
label: "API gateway configuration"
- description: "Please update the folllowing default values to configure API
gateway"
+ description: "Update these default values to customize the API Gateway
deployment"
name:
__metadata:
label: "Name"
- description: "Please specify name"
+ description: "The service name"
type: "string"
required: true
imageName:
__metadata:
label: "Image name"
- description: "Please specify image name"
+ description: "The docker image name"
type: "string"
required: true
imageTag:
__metadata:
label: "Image tag"
- description: "Please specify image tag"
+ description: "The docker image tag"
type: "string"
required: true
imagePullPolicy:
__metadata:
label: "Image pull policy"
- description: "Please specify image pull policy"
+ description: "The image pull policy to apply for this image."
type: "string"
required: true
+ options:
+ - label: "Always"
+ value: "Always"
+ - label: "Never"
+ value: "Never"
+ - label: "IfNotPresent"
+ value: "IfNotPresent"
replicaCount:
__metadata:
label: "Replica count"
- description: "Please specify replica count"
+ description: "Number of apigw instances to deploy"
type: "string"
required: true
restartPolicy:
__metadata:
label: "Restart policy"
- description: "Please specify restart policy"
+ description: "The restart policy for apigw pods"
type: "string"
required: true
apiPort:
__metadata:
label: "API port"
- description: "Please specify API port"
+ description: "The API port"
type: "string"
required: true
mgmtPort:
__metadata:
label: "Management port"
- description: "Please specify management port"
+ description: "The management port"
type: "string"
required: true
redis:
__metadata:
label: "Redis configuration"
- description: "Please update the folllowing default values to configure
Redis"
+ description: "Update these default values to customize the Redis
deployment"
name:
__metadata:
label: "Name"
- description: "Please specify name"
+ description: "The service name"
type: "string"
required: true
imageName:
__metadata:
label: "Image name"
- description: "Please specify image name"
+ description: "The docker image name"
type: "string"
required: true
imageTag:
__metadata:
label: "Image tag"
- description: "Please specify image tag"
+ description: "The docker image tag"
type: "string"
required: true
imagePullPolicy:
__metadata:
label: "Image pull policy"
- description: "Please specify image pull policy"
+ description: "The image pull policy to apply for this image."
type: "string"
required: true
+ options:
+ - label: "Always"
+ value: "Always"
+ - label: "Never"
+ value: "Never"
+ - label: "IfNotPresent"
+ value: "IfNotPresent"
replicaCount:
__metadata:
label: "Replica count"
- description: "Please specify replica count"
+ description: "The number of redis instances to deploy (currently must be
1)"
type: "string"
required: true
restartPolicy:
__metadata:
label: "Restart policy"
- description: "Please specify restart policy"
+ description: "The restart policy for redis pods"
type: "string"
required: true
port:
__metadata:
label: "Port"
- description: "Please specify port"
+ description: "The primary service port"
type: "string"
required: true
persistence:
pvcName:
__metadata:
label: "PVC name"
- description: "Please specify PVC name"
+ description: "The name of the PersistentVolumeClaim for redis"
type: "string"
required: true
size:
__metadata:
label: "Size"
- description: "Please specify size"
+ description: "The size of the persistent volume for redis"
type: "string"
required: true
providers:
__metadata:
label: "OpenWhisk providers configuration"
- description: "Please update the folllowing default values to configure
OpenWhisk providers (Alarm, Cloudant and Kafka)"
+ description: "Update these default values to customize OpenWhisk providers
(Alarm, Cloudant and Kafka)"
db:
external:
__metadata:
- label: "Databsae external"
- description: "Please specify if databsae is external"
+ label: "External Providers Databaae"
+ description: "If the event providers database is external"
type: "boolean"
required: true
host:
__metadata:
label: "Database host"
- description: "Please specify database host"
+ description: "The external event providers database host"
type: "string"
required: true
required: true
port:
__metadata:
label: "Database port"
- description: "Please specify database port"
+ description: "The external event providers database port"
type: "string"
required: true
protocol:
__metadata:
label: "Database protocol"
- description: "Please specify database protocol"
+ description: "The external event providers database protocol"
type: "string"
required: true
+ options:
+ - label: "http"
+ value: "http"
+ - label: "https"
+ value: "https"
username:
__metadata:
label: "Database username"
- description: "Please specify database username"
+ description: "The external event providers database username"
type: "string"
required: true
password:
__metadata:
label: "Database password"
- description: "Please specify database password"
+ description: "The external event providers database password"
type: "password"
required: true
@@ -1230,227 +1338,248 @@ providers:
enabled:
__metadata:
label: "Alarm enabled"
- description: "Please specify if alarm provider should be enabled"
+ description: "If alarm provider should be enabled"
type: "boolean"
required: true
name:
__metadata:
label: "Alarm name"
- description: "Please specify Alarm name"
+ description: "The Alarm service name"
type: "string"
required: true
imageName:
__metadata:
label: "Alarm image name"
- description: "Please specify Alarm image name"
+ description: "The alarm docker image name"
type: "string"
required: true
imageTag:
__metadata:
label: "Alarm image tag"
- description: "Please specify Alarm image tag"
+ description: "The alarm docker image tag"
type: "string"
required: true
imagePullPolicy:
__metadata:
- label: "Alarm image pull policy"
- description: "Please specify Alarm image pull policy"
+ label: "Image pull policy"
+ description: "The image pull policy to apply for this image."
type: "string"
required: true
+ options:
+ - label: "Always"
+ value: "Always"
+ - label: "Never"
+ value: "Never"
+ - label: "IfNotPresent"
+ value: "IfNotPresent"
replicaCount:
__metadata:
label: "Alarm replica count"
- description: "Please specify Alarm replica count"
+ description: "The number of alarm provider instances to deploy"
type: "string"
required: true
restartPolicy:
__metadata:
label: "Alarm restart policy"
- description: "Please specify Alarm restart policy"
+ description: "The restart policy for Alarm provider pods"
type: "string"
required: true
apiPort:
__metadata:
label: "Alarm API port"
- description: "Please specify Alarm API port"
+ description: "The API port for the Alarm provider"
type: "string"
required: true
dbPrefix:
__metadata:
label: "Alarm DB prefix"
- description: "Please specify Alarm DB prefix"
+ description: "The prefix for the Alarm provider's database tables"
type: "string"
required: true
persistence:
pvcName:
__metadata:
label: "Alarm PVC name"
- description: "Please specify Alarm PVC name"
+ description: "The name of the PersistentVolumeClaim for the Alarm
provider"
type: "string"
required: true
size:
__metadata:
label: "Alarm persistence size"
- description: "Please specify Alarm persistence size"
+ description: "The size of the persistent volume for the Alarm
provider"
type: "string"
required: true
- kafka:
+ cloudant:
enabled:
__metadata:
- label: "Kafka enabled"
- description: "Please specify if Kafka provider should be enabled"
+ label: "Cloudant enabled"
+ description: "if Cloudant provider should be enabled"
type: "boolean"
required: true
name:
__metadata:
- label: "Kafka name"
- description: "Please specify Kafka name"
+ label: "Cloudant name"
+ description: "The service name for the Cloudant provider"
type: "string"
required: true
imageName:
__metadata:
- label: "Kafka image name"
- description: "Please specify Kafka image name"
+ label: "Cloudant image name"
+ description: "The Cloudant provider docker image name"
type: "string"
required: true
imageTag:
__metadata:
- label: "Kafka image tag"
- description: "Please specify Kafka image tag"
+ label: "Cloudant image tag"
+ description: "The Cloudant provider docker image tag"
type: "string"
required: true
imagePullPolicy:
__metadata:
- label: "Kafka image pull policy"
- description: "Please specify Kafka image pull policy"
+ label: "Image pull policy"
+ description: "The image pull policy to apply for this image."
type: "string"
required: true
+ options:
+ - label: "Always"
+ value: "Always"
+ - label: "Never"
+ value: "Never"
+ - label: "IfNotPresent"
+ value: "IfNotPresent"
replicaCount:
__metadata:
- label: "Kafka replica count"
- description: "Please specify Kafka replica count"
+ label: "Cloudant replica count"
+ description: "The number of Cloudant provider instances to deploy"
type: "string"
required: true
restartPolicy:
__metadata:
- label: "Kafka restart policy"
- description: "Please specify Kafka restart policy"
+ label: "Cloudant restart policy"
+ description: "The restart policy for Cloudant provider pods"
type: "string"
required: true
apiPort:
__metadata:
- label: "Kafka API port"
- description: "Please specify Kafka API port"
+ label: "Cloudant API port"
+ description: "The API port for the Cloudant provider"
type: "string"
required: true
dbPrefix:
__metadata:
- label: "Kafka DB prefix"
- description: "Please specify Kafka DB prefix"
+ label: "Cloudant DB prefix"
+ description: "The prefix to use for Cloudant provider database tables"
type: "string"
required: true
+ persistence:
+ pvcName:
+ __metadata:
+ label: "Cloudant PVC name"
+ description: "The PersistentVolumeClaim name for the Cloudant
provider"
+ type: "string"
+ required: true
+ size:
+ __metadata:
+ label: "Cloudant persistence size"
+ description: "The size of the persistent volume for the Cloudant
provider"
+ type: "string"
+ required: true
- cloudant:
+ kafka:
enabled:
__metadata:
- label: "Cloudant enabled"
- description: "Please specify if Cloudant provider should be enabled"
+ label: "Kafka enabled"
+ description: "If the Kafka provider should be enabled"
type: "boolean"
required: true
name:
__metadata:
- label: "Cloudant name"
- description: "Please specify Cloudant name"
+ label: "Kafka name"
+ description: "The Kafka provider service name"
type: "string"
required: true
imageName:
__metadata:
- label: "Cloudant image name"
- description: "Please specify Cloudant image name"
+ label: "Kafka image name"
+ description: "The docker image name for the Kakfa provider"
type: "string"
required: true
imageTag:
__metadata:
- label: "Cloudant image tag"
- description: "Please specify Cloudant image tag"
+ label: "Kafka image tag"
+ description: "The docker image tag for the Kafka provider"
type: "string"
required: true
imagePullPolicy:
__metadata:
- label: "Cloudant image pull policy"
- description: "Please specify Cloudant image pull policy"
+ label: "Image pull policy"
+ description: "The image pull policy to apply for this image."
type: "string"
required: true
+ options:
+ - label: "Always"
+ value: "Always"
+ - label: "Never"
+ value: "Never"
+ - label: "IfNotPresent"
+ value: "IfNotPresent"
replicaCount:
__metadata:
- label: "Cloudant replica count"
- description: "Please specify Cloudant replica count"
+ label: "Kafka replica count"
+ description: "The number of instances of the Kafka provider to deploy"
type: "string"
required: true
restartPolicy:
__metadata:
- label: "Cloudant restart policy"
- description: "Please specify Cloudant restart policy"
+ label: "Kafka restart policy"
+ description: "The restart policy for Kafka provider pods"
type: "string"
required: true
apiPort:
__metadata:
- label: "Cloudant API port"
- description: "Please specify Cloudant API port"
+ label: "Kafka API port"
+ description: "The API port for the Kafka provider"
type: "string"
required: true
dbPrefix:
__metadata:
- label: "Cloudant DB prefix"
- description: "Please specify Cloudant DB prefix"
+ label: "Kafka DB prefix"
+ description: "The prefix to use for the Kafka provider's database
tables"
type: "string"
required: true
- persistence:
- pvcName:
- __metadata:
- label: "Cloudant PVC name"
- description: "Please specify Cloudant PVC name"
- type: "string"
- required: true
- size:
- __metadata:
- label: "Cloudant persistence size"
- description: "Please specify Cloudant persistence size"
- type: "string"
- required: true
affinity:
__metadata:
- label: "Affinity configuration"
- description: "Please update the folllowing default values to configure
Affinity"
+ label: "Node affinity configuration"
+ description: "Labels used to tag Kubernetes worker nodes to enable
scheduling affinity"
enabled:
__metadata:
label: "Affinity enabled"
- description: "Please specify if affinity should be enabled"
+ description: "If affinity should be enabled"
type: "boolean"
required: true
coreNodeLabel:
__metadata:
label: "Core node label"
- description: "Please specify core node label"
+ description: "Label used for worker nodes that should execute OpenWhisk
core pods"
type: "string"
required: true
edgeNodeLabel:
__metadata:
label: "Edge node label"
- description: "Please specify edge node label"
+ description: "Label used for worker nodes that should execute OpenWhisk
Ingress pods"
type: "string"
required: true
invokerNodeLabel:
__metadata:
label: "Invoker node label"
- description: "Please specify invoker node label"
+ description: "Label used for worker nodes that should execute OpenWhisk
Invoker pods and user actions"
type: "string"
required: true
providerNodeLabel:
__metadata:
label: "Provider node label"
- description: "Please specify provider node label"
+ description: "Label used for worker nodes that should execute OpenWhisk
event provider pods"
type: "string"
required: true
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index 9ebaf07..05f760a 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -23,7 +23,10 @@
# The file docs/configurationChoices.md discusses other common
# configuration options for OpenWhisk and which variables to override
# to enable them.
-
+#
+# The file values-metadata.yaml contains a description of each
+# of these variables and must also be updated when any changes are
+# made to this file.
# Overall configuration of OpenWhisk deployment
whisk:
@@ -123,7 +126,6 @@ whisk:
openwhiskPackageKafka:
gitTag: "6dbafc49107567185ee3a55781c8b3144fad6f63"
-# Properties of the Kubernetes cluster on which OpenWhisk is being deployed
k8s:
domain: cluster.local
dns: kube-dns.kube-system
@@ -177,7 +179,7 @@ kafka:
imageName: "wurstmeister/kafka"
imageTag: "0.11.0.1"
imagePullPolicy: "IfNotPresent"
- # NOTE: setting replicaCount > 1 will not work...actively being worked on.
+ # NOTE: setting replicaCount > 1 will not work (Issue #354)
replicaCount: 1
restartPolicy: "Always"
port: 9092
@@ -320,18 +322,6 @@ providers:
persistence:
pvcName: alarmprovider-pvc
size: 1Gi
- # Kafka provider configurations
- kafka:
- enabled: false
- name: "kafkaprovider"
- imageName: "openwhisk/kafkaprovider"
- imageTag: "1.4.18"
- imagePullPolicy: "IfNotPresent"
- # NOTE: setting replicaCount > 1 has not been tested and may not work
- replicaCount: 1
- restartPolicy: "Always"
- apiPort: 8080
- dbPrefix: "kp"
# Cloudant provider configurations
cloudant:
enabled: false
@@ -347,6 +337,18 @@ providers:
persistence:
pvcName: cloudntprovider-pvc
size: 1Gi
+ # Kafka provider configurations
+ kafka:
+ enabled: false
+ name: "kafkaprovider"
+ imageName: "openwhisk/kafkaprovider"
+ imageTag: "1.4.18"
+ imagePullPolicy: "IfNotPresent"
+ # NOTE: setting replicaCount > 1 has not been tested and may not work
+ replicaCount: 1
+ restartPolicy: "Always"
+ apiPort: 8080
+ dbPrefix: "kp"
# Used to define pod affinity and anti-affinity for the Kubernetes scheduler.
