Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions config/docopts.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ Usage:
config mail [--mailuser=<mailuser>] [--mailpwd=<mailpwd>] [--mailfrom=<mailfrom>] [--mailto=<mailto>]
config volumes [--couchdb=<couchdb>] [--kafka=<kafka>] [--pgvol=<postgres>] [--storage=<storage>] [--alerting=<alerting>] [--zookeeper=<zookeeper>] [--redisvol=<redis>] [--mongodbvol=<mongodb>] [--etcdvol=<etcd>] [--mvvol=<milvus>] [--mvzookvol=<milvuszook>] [--pulsarjournalvol=<pulsarjournal>] [--pulsarledgelvol=<pulsarledge>]
config controller [--javaopts=<javaopts>] [--loglevel=<loglevel>] [--replicas=<replicas>]
config ingress [--class=<auto|nginx|traefik|public>]
config invoker [--javaopts=<javaopts>] [--poolmemory=<poolmemory>] [--timeoutsrun=<timeoutsrun>] [--timeoutslogs=<timeoutslogs>] [--loglevel=<loglevel>] [--replicas=<replicas>]
config limits [--time=<time>] [--memory=<memory>] [--sequencelength=<sequencelength>] [--perminute=<perminute>] [--concurrent=<concurrent>] [--triggerperminute=<triggerperminute>] [--activation_max_payload=<activation_max_payload>] [--blackbox_fraction=<blackbox_fraction>]
config storage [--class=<storage_class>] [--provisioner=<storage_provisioner>]
Expand DownExpand Up@@ -63,6 +64,7 @@ Usage:
config mail configure Alert Manager over a gmail account
config volumes configure the volume size distinguished in 3 categories (openwhisk couchdb & kafka, database, minio storage, alerting, milvus)
config controller configure Openwhisk enterprise controller java options
config ingress configure OpenServerless ingress class
config invoker configure Openwhisk enterprise invoker options
config limits configure Openwhisk actions limits
config storage allows to customize storage persistence class and provider
Expand DownExpand Up@@ -120,4 +122,5 @@ Usage:
--quota select quota checker module
--milvus select MILVUS vector database
--registry activate the support for a private image registry for custom actions (by default it will install one)
--class specify the ingress class. It can be auto, traefik, nginx. On microk8s it should be public.
```
14 changes: 12 additions & 2 deletions config/opsfile.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -1080,7 +1080,6 @@ tasks:
then config MINIO_CONFIG_INGRESS_CONSOLE=true
fi


etcd:
silent: true
cmds:
Expand DownExpand Up@@ -1158,7 +1157,6 @@ tasks:
Specifies the volume size assigned to the image registry
VAL: "{{.__disk}}"
DEF: "50"


minimal:
silent: true
Expand DownExpand Up@@ -1205,3 +1203,15 @@ tasks:
config OPENWHISK_INVOKER_CONTAINER_POOL_MEMORY=6g
- task: status
- config CONFIGURED=true

ingress:
silent: true
cmds:
- task: read
vars:
MSG: "Ingress Class"
VAR: "OPERATOR_CONFIG_INGRESSCLASS"
HINT: |
Specify the ingress class.
VAL: "{{.__class}}"
DEF: "auto"
1 change: 1 addition & 0 deletions setup/kubernetes/whisk.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ spec:
slim: ${OPERATOR_CONFIG_SLIM:-false}
affinity: ${OPERATOR_CONFIG_AFFINITY:-false}
tolerations: ${OPERATOR_CONFIG_TOLERATIONS:-false}
ingressclass: ${OPERATOR_CONFIG_INGRESSCLASS:-auto}
preload:
only-apache: ${OPERATOR_CONFIG_PRELOAD_ONLY_APACHE:-true}
components:
Expand Down