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: 2 additions & 1 deletion admin/docopts.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ You can create namespaces and choose which services to enable.

```text
Usage:
admin adduser <username> <email> <password> [--all] [--redis] [--mongodb] [--minio] [--postgres] [--milvus] [--storagequota=<quota>|auto]
admin adduser <username> <email> <password> [--all] [--redis] [--mongodb] [--minio|--seaweedfs] [--postgres] [--milvus] [--storagequota=<quota>|auto]
admin deleteuser <username>
admin listuser [<username>]
admin compact [--ttl=<ttl>|10]
Expand All @@ -49,6 +49,7 @@ Usage:
--redis enable redis
--mongodb enable mongodb
--minio enable minio
--seaweedfs enable seaweedfs
--postgres enable postgres
--milvus enable milvus vector db
--storagequota=<quota>
Expand Down
7 changes: 4 additions & 3 deletions admin/opsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,18 @@ tasks:
fi
fi

if {{.__minio}} || {{.__all}}
if {{.__minio}} || {{.__seaweedfs}} || {{.__all}}
then
if $OPERATOR_COMPONENT_MINIO
if $OPERATOR_COMPONENT_MINIO || $OPERATOR_COMPONENT_SEAWEEDFS
then
MINIO_DATA_ENABLED=true
MINIO_STATIC_ENABLED=true
else
die "Error! Minio is not enabled in OpenServerless"
die "Error! Minio or Seaweedfs are not enabled in OpenServerless"
fi
fi


if test -n "{{.__storagequota}}"
then MINIO_STORAGE_QUOTA={{.__storagequota}}
fi
Expand Down
6 changes: 3 additions & 3 deletions config/opsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,13 @@ tasks:
- |
if {{.__milvus}} || {{.__all}}
then
config OPERATOR_CONFIG_MILVUS=false
config OPERATOR_CONFIG_ETCD=false
config OPERATOR_COMPONENT_MILVUS=false
config OPERATOR_COMPONENT_ETCD=false
fi
- |
if {{.__registry}} || {{.__all}}
then
config OPERATOR_CONFIG_REGISTRY=false
config OPERATOR_COMPONENT_REGISTRY=false
fi
- |
if {{.__seaweedfs}} || {{.__all}}
Expand Down
2 changes: 1 addition & 1 deletion opsroot.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"coreutils": "arch b2sum b3sum base32 basename basenc cat chgrp chmod chown chroot cksum comm cp csplit cut date dd df dir dircolors dirname du env expand expr factor fmt fold groups hashsum head hostid hostname id install join kill link ln logname ls md5sum mkdir mkfifo mknod mktemp more mv nice nl nohup nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd readlink realpath rm rmdir seq sha1sum sha224sum sha256sum sha3-224sum sha3-256sum sha3-384sum sha3-512sum sha384sum sha3sum sha512sum shake128sum shake256sum shred shuf sleep sort split stat stdbuf stty sum sync tac tail tee timeout touch tr truncate tsort tty uname unexpand uniq unlink uptime users vdir wc who whoami yes"
},
"images": {
"operator": "registry.hub.docker.com/apache/openserverless-operator:0.1.0-incubating.2509241822",
"operator": "registry.hub.docker.com/apache/openserverless-operator:0.1.0-incubating.2509252352",
"controller": "ghcr.io/nuvolaris/openwhisk-controller:3.1.0-mastrogpt.2402101445",
"invoker": "ghcr.io/nuvolaris/openwhisk-invoker:3.1.0-mastrogpt.2402101445",
"streamer": "registry.hub.docker.com/apache/openserverless-streamer:0.1.0-incubating.2505031325",
Expand Down
5 changes: 4 additions & 1 deletion update/opsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,17 @@ tasks:
- config SECRET_POSTGRES_REPLICA="$(kubectl -n nuvolaris get wsk/controller -o jsonpath='{.spec.postgres.admin.replica-password}')"
- config SECRET_POSTGRES_NUVOLARIS="$(kubectl -n nuvolaris get wsk/controller -ojsonpath='{.spec.postgres.nuvolaris.password}')"
- config SECRET_NUVOLARIS_METADATA="$(kubectl -n nuvolaris get wsk/controller -ojsonpath='{.spec.nuvolaris.password}')"
- config SECRET_MILVUS_ROOT="$(kubectl -n nuvolaris get wsk/controller -ojsonpath='{.spec.milvus.password.root}')"
- config SECRET_MILVUS_S3="$(kubectl -n nuvolaris get wsk/controller -ojsonpath='{.spec.milvus.password.s3}')"
- config REGISTRY_CONFIG_SECRET_PUSH_PULL="$(kubectl -n nuvolaris get wsk/controller -ojsonpath='{.spec.registry.auth.password}')"

apply:
desc: apply updated config
cmds:
- $OPS update secrets
- $OPS setup kubernetes runtimes
- $OPS setup kubernetes instance
- $OPS setup kubernetes services
- $OPS setup kubernetes wait-services
- $OPS setup nuvolaris login

operator:
Expand Down