This is an automated email from the ASF dual-hosted git repository. sciabarracom pushed a commit to branch 0.9.0 in repository https://gitbox.apache.org/repos/asf/openserverless-task.git
commit d3f8d81fd2c971e58b74f0d27e0db62cdc8656d0 Author: Build OpenServerless <[email protected]> AuthorDate: Mon Sep 21 20:43:57 2026 +0000 minio cleanup --- admin/docopts.md | 3 +- admin/opsfile.yml | 20 ++++----- admin/user-crd.yaml | 8 ++-- config/docopts.md | 6 +-- config/opsfile.yml | 4 +- setup/kubernetes/crds/whisk-crd.yaml | 72 +++---------------------------- setup/kubernetes/crds/whisk-user-crd.yaml | 12 +++--- setup/kubernetes/opsfile.yml | 12 ------ setup/kubernetes/whisk.yaml | 21 ++------- update/opsfile.yml | 3 +- util/opsfile.yml | 10 ++--- 11 files changed, 39 insertions(+), 132 deletions(-) diff --git a/admin/docopts.md b/admin/docopts.md index 4ce482d..651c89f 100644 --- a/admin/docopts.md +++ b/admin/docopts.md @@ -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|--seaweedfs] [--postgres] [--milvus] [--storagequota=<quota>|auto] + admin adduser <username> <email> <password> [--all] [--redis] [--mongodb] [--seaweedfs] [--postgres] [--milvus] [--storagequota=<quota>|auto] admin deleteuser <username> [--confirm-namespace-delete] admin listuser [<username>] admin sso unbind <username> @@ -50,7 +50,6 @@ Usage: --all enable all services --redis enable redis --mongodb enable mongodb - --minio enable minio --seaweedfs enable seaweedfs --postgres enable postgres --milvus enable milvus vector db diff --git a/admin/opsfile.yml b/admin/opsfile.yml index 857c758..438feb7 100644 --- a/admin/opsfile.yml +++ b/admin/opsfile.yml @@ -99,16 +99,16 @@ tasks: export USER_SECRET_REDIS=$($OPS -config "${upperCaseUser}_SECRET_REDIS") export USER_SECRET_POSTGRES=$($OPS -config "${upperCaseUser}_SECRET_POSTGRES") export USER_SECRET_MONGODB=$($OPS -config "${upperCaseUser}_SECRET_MONGODB") - export USER_SECRET_MINIO=$($OPS -config "${upperCaseUser}_SECRET_MINIO") + export USER_SECRET_SEAWEEDFS=$($OPS -config "${upperCaseUser}_SECRET_SEAWEEDFS") export USER_SECRET_MILVUS=$($OPS -config "${upperCaseUser}_SECRET_MILVUS") export REDIS_ENABLED=false export MONGODB_ENABLED=false - export MINIO_DATA_ENABLED=false - export MINIO_STATIC_ENABLED=false + export OBJECT_STORAGE_DATA_ENABLED=false + export OBJECT_STORAGE_STATIC_ENABLED=false export POSTGRES_ENABLED=false export MILVUS_ENABLED=false - export MINIO_STORAGE_QUOTA=auto + export OBJECT_STORAGE_QUOTA=auto if {{.__redis}} || {{.__all}} then @@ -130,20 +130,20 @@ tasks: fi fi - if {{.__minio}} || {{.__seaweedfs}} || {{.__all}} + if {{.__seaweedfs}} || {{.__all}} then - if $OPERATOR_COMPONENT_MINIO || $OPERATOR_COMPONENT_SEAWEEDFS + if $OPERATOR_COMPONENT_SEAWEEDFS then - MINIO_DATA_ENABLED=true - MINIO_STATIC_ENABLED=true + OBJECT_STORAGE_DATA_ENABLED=true + OBJECT_STORAGE_STATIC_ENABLED=true else - die "Error! Minio or Seaweedfs are not enabled in OpenServerless" + die "Error! Seaweedfs is not enabled in OpenServerless" fi fi if test -n "{{.__storagequota}}" - then MINIO_STORAGE_QUOTA={{.__storagequota}} + then OBJECT_STORAGE_QUOTA={{.__storagequota}} fi if {{.__postgres}} || {{.__all}} diff --git a/admin/user-crd.yaml b/admin/user-crd.yaml index 5cf28ad..6e2dfd8 100644 --- a/admin/user-crd.yaml +++ b/admin/user-crd.yaml @@ -39,13 +39,13 @@ spec: database: ${USERNAME} password: ${USER_SECRET_POSTGRES} object-storage: - password: ${USER_SECRET_MINIO} - quota: "${MINIO_STORAGE_QUOTA:-auto}" + password: ${USER_SECRET_SEAWEEDFS} + quota: "${OBJECT_STORAGE_QUOTA:-auto}" data: - enabled: ${MINIO_DATA_ENABLED} + enabled: ${OBJECT_STORAGE_DATA_ENABLED} bucket: ${USERNAME}-data route: - enabled: ${MINIO_STATIC_ENABLED} + enabled: ${OBJECT_STORAGE_STATIC_ENABLED} bucket: ${USERNAME}-web milvus: enabled: ${MILVUS_ENABLED} diff --git a/config/docopts.md b/config/docopts.md index 32c518d..194093e 100644 --- a/config/docopts.md +++ b/config/docopts.md @@ -64,14 +64,13 @@ Usage: config disable disable OpenServerless services to install config slack configure Alert Manager over a given slack channel 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 volumes configure the volume size distinguished in 3 categories (openwhisk couchdb & kafka, database, seaweedfs 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 config postgres allows to customize enterprise options for openserverless default postgres deployment - config minio allows to customize MINIO options config milvus allows to customize MILVUS options config etcd allows to customize ETCD options config aws configure Amazon Web Service (AWS) credentials and parameters @@ -84,7 +83,7 @@ Usage: config status show current configuration config export export all the variables config use use a different kubernetes cluster among those you created - config minimal shortcut for ops config enabling only redis,mongodb,minio,cron,static,postgres + config minimal shortcut for ops config enabling only redis,mongodb,seaweedfs,cron,static,postgres config slim shortcut for ops config slim, but adding lightweight milvus and other sizing improvements config registry configure the internal image registry for actions runtimes config externalregistry configure an external private image registry for action runtimes @@ -96,7 +95,6 @@ Usage: --all select all services --redis select redis --mongodb select mongodb (FerretDB Proxy) - --minio select minio --cron select cron --static select static --postgres select postgres diff --git a/config/opsfile.yml b/config/opsfile.yml index 15eecca..0f4dc04 100644 --- a/config/opsfile.yml +++ b/config/opsfile.yml @@ -111,8 +111,8 @@ tasks: config OPERATOR_COMPONENT_ETCD=true if {{.__milvus}} - then echo 'Milvus deployment requires MINIO. Enabling it.' - config OPERATOR_COMPONENT_MINIO=true + then echo 'Milvus deployment requires SEAWEEDFS. Enabling it.' + config OPERATOR_COMPONENT_SEAWEEDFS=true fi fi - | diff --git a/setup/kubernetes/crds/whisk-crd.yaml b/setup/kubernetes/crds/whisk-crd.yaml index 3c9e5bc..2317535 100644 --- a/setup/kubernetes/crds/whisk-crd.yaml +++ b/setup/kubernetes/crds/whisk-crd.yaml @@ -117,11 +117,8 @@ spec: tls: description: enables TLS support via let's encrypt certificate for the ow apihost type: boolean - minio: - description: deploys MINIO as storage - type: boolean static: - description: activate the MINIO/CEPH OBJECT STORE static internal service (requires components.minio or components.cephobjectstore to be true) + description: activate the static web content internal service (requires components.seaweedfs to be true) type: boolean zookeeper: description: deploys zookeeper if supported by the operator @@ -363,58 +360,6 @@ spec: required: - acme-registered-email - acme-server-url - minio: - description: used to configure the internal minio data storage service - type: object - properties: - volume-size: - description: volume size in GB - type: integer - admin: - description: used to configure the MINIO admin user - type: object - properties: - user: - type: string - password: - type: string - required: - - user - - password - openserverless: - description: used to configure the MINIO openserverless user used for non administrative purposes - type: object - properties: - user: - type: string - password: - type: string - required: - - user - - password - ingress: - description: configuration option for global minio ingresses exposure - type: object - properties: - s3-enabled: - description: boolean flag to activate MINIO S3 compatible ingress. Default to false - type: boolean - s3-hostname: - description: ingress hostname to be used if true (normally s3.<apihost>) - type: string - console-enabled: - description: boolean flag to expose MINIO console - type: boolean - console-hostname: - description: ingress hostname to be used (nora=mally minio.<apihost>) - type: string - required: - - s3-enabled - - console-enabled - required: - - volume-size - - admin - - openserverless redis: description: used to configure redis default credentials type: object @@ -777,7 +722,7 @@ spec: description: ETCD milvus user password type: string s3: - description: MINIO/S3 milvus user password + description: S3 milvus user password type: string required: - root @@ -831,7 +776,7 @@ spec: - auth - hostname seaweedfs: - description: used to configure the internal saweedfs data storage service + description: used to configure the internal seaweedfs data storage service type: object properties: volume-size: @@ -841,7 +786,7 @@ spec: description: default bucket quota, default to 1024MB type: integer openserverless: - description: used to configure the MINIO openserverless user used for non administrative purposes + description: used to configure the SEAWEEDFS openserverless user used for non administrative purposes type: object properties: user: @@ -852,7 +797,7 @@ spec: - user - password ingress: - description: configuration option for global minio ingresses exposure + description: configuration option for global seaweedfs ingresses exposure type: object properties: s3-enabled: @@ -896,8 +841,6 @@ spec: # type: string # tls: # type: string - # minio: - # type: string # postgres: # type: string additionalPrinterColumns: @@ -946,11 +889,6 @@ spec: priority: 0 jsonPath: .status.whisk_create.tls description: Tls - - name: Minio - type: string - priority: 0 - jsonPath: .status.whisk_create.minio - description: Minio - name: Postgres type: string priority: 0 diff --git a/setup/kubernetes/crds/whisk-user-crd.yaml b/setup/kubernetes/crds/whisk-user-crd.yaml index 1da6eec..8176b1e 100644 --- a/setup/kubernetes/crds/whisk-user-crd.yaml +++ b/setup/kubernetes/crds/whisk-user-crd.yaml @@ -104,32 +104,32 @@ spec: - prefix - password object-storage: - description: used to setup openserverless MINIO instance with custom user resources + description: used to setup openserverless object storage with custom user resources type: object x-kubernetes-preserve-unknown-fields: true properties: password: - description: password to access the internal MINIO instance + description: password to access the internal object storage instance type: string quota: description: maximum quota assignable in mb to each defined bucket. Defaults to auto which will not set any specific quota type: string data: - description: used to configure the user MINIO dedicated buckets + description: used to configure the user dedicated buckets type: object x-kubernetes-preserve-unknown-fields: true properties: enabled: - description: boolean flag to configure a MINIO data bucket for the user. defaulted to false + description: boolean flag to configure a data bucket for the user. defaulted to false type: boolean bucket: - description: MINIO data bucket name + description: data bucket name type: string required: - enabled - bucket route: - description: used to configure a user MINIO static web content provider bucket + description: used to configure a user static web content provider bucket type: object x-kubernetes-preserve-unknown-fields: true properties: diff --git a/setup/kubernetes/opsfile.yml b/setup/kubernetes/opsfile.yml index a71f39a..1495f18 100644 --- a/setup/kubernetes/opsfile.yml +++ b/setup/kubernetes/opsfile.yml @@ -310,18 +310,6 @@ tasks: OBJECT: pod/openserverless-postgres-1-0 COND: sh: echo "$OPERATOR_COMPONENT_POSTGRES" - - task: wait-pod - vars: - SELECTOR: "-l app=minio" - COND: - sh: echo "$OPERATOR_COMPONENT_MINIO" - FILE: _minio - #- task: wait - # vars: - # OBJECT: - # sh: echo "pod/$(cat _minio)" - # COND: - # sh: echo "$OPERATOR_COMPONENT_MINIO" - task: wait-pod vars: SELECTOR: "-l app=seaweedfs" diff --git a/setup/kubernetes/whisk.yaml b/setup/kubernetes/whisk.yaml index ee30bbc..5f486a7 100644 --- a/setup/kubernetes/whisk.yaml +++ b/setup/kubernetes/whisk.yaml @@ -53,10 +53,8 @@ spec: cron: ${OPERATOR_COMPONENT_CRON:-false} # enable TLS tls: ${OPERATOR_COMPONENT_TLS:-false} - # minio enabled or not - minio: ${OPERATOR_COMPONENT_MINIO:-false} - # minio static enabled or not - static: ${OPERATOR_COMPONENT_STATIC:-false} + # static web content serving enabled or not + static: ${OPERATOR_COMPONENT_STATIC:-false} # postgres enabled or not postgres: ${OPERATOR_COMPONENT_POSTGRES:-false} # quota enabled or not @@ -175,20 +173,7 @@ spec: password: $SECRET_MONGODB_OPENSERVERLESS exposedExternally: False useOperator: False - minio: - ingress: - s3-enabled: ${MINIO_CONFIG_INGRESS_S3:-false} - console-enabled: ${MINIO_CONFIG_INGRESS_CONSOLE:-false} - s3-hostname: ${MINIO_CONFIG_INGRESS_S3_HOSTNAME:-auto} - console-hostname: ${MINIO_CONFIG_INGRESS_CONSOLE_HOSTNAME:-auto} - volume-size: ${STORAGE_SIZE_MINIO:-50} - admin: - user: minioadmin - password: $SECRET_MINIO_ADMIN - openserverless: - user: openserverless - password: $SECRET_MINIO_OPENSERVERLESS - postgres: + postgres: volume-size: ${STORAGE_SIZE_POSTGRES:-50} replicas: ${POSTGRES_CONFIG_REPLICAS:-2} admin: diff --git a/update/opsfile.yml b/update/opsfile.yml index 4a333ca..4e80135 100644 --- a/update/opsfile.yml +++ b/update/opsfile.yml @@ -54,8 +54,7 @@ tasks: - config SECRET_REDIS_OPENSERVERLESS="$(kubectl -n openserverless get wsk/controller -o jsonpath='{.spec.redis.openserverless.password}')" - config SECRET_MONGODB_ADMIN="$(kubectl -n openserverless get wsk/controller -o jsonpath='{.spec.mongodb.admin.password}')" - config SECRET_MONGODB_OPENSERVERLESS="$(kubectl -n openserverless get wsk/controller -o jsonpath='{.spec.mongodb.openserverless.password}')" - - config SECRET_MINIO_ADMIN="$(kubectl -n openserverless get wsk/controller -ojsonpath='{.spec.minio.admin.password}')" - - config SECRET_MINIO_OPENSERVERLESS="$(kubectl -n openserverless get wsk/controller -o jsonpath='{.spec.minio.openserverless.password}')" + - config SECRET_SEAWEEDFS_OPENSERVERLESS="$(kubectl -n openserverless get wsk/controller -o jsonpath='{.spec.seaweedfs.openserverless.password}')" - config SECRET_POSTGRES_ADMIN="$(kubectl -n openserverless get wsk/controller -o jsonpath='{.spec.postgres.admin.password}')" - config SECRET_POSTGRES_REPLICA="$(kubectl -n openserverless get wsk/controller -o jsonpath='{.spec.postgres.admin.replica-password}')" - config SECRET_POSTGRES_OPENSERVERLESS="$(kubectl -n openserverless get wsk/controller -ojsonpath='{.spec.postgres.openserverless.password}')" diff --git a/util/opsfile.yml b/util/opsfile.yml index ed4eba8..90f7b8c 100644 --- a/util/opsfile.yml +++ b/util/opsfile.yml @@ -115,7 +115,6 @@ tasks: - config SECRET_COUCHDB_ADMIN="$(random --str 12)" SECRET_COUCHDB_CONTROLLER="$(random --str 12)" SECRET_COUCHDB_INVOKER="$(random --str 12)" - config SECRET_REDIS_DEFAULT="$(random --str 12)" SECRET_REDIS_OPENSERVERLESS="$(random --str 12)" - config SECRET_MONGODB_ADMIN="$(random --str 12)" SECRET_MONGODB_OPENSERVERLESS="$(random --str 12)" - - config SECRET_MINIO_ADMIN="$(random --str 40)" SECRET_MINIO_OPENSERVERLESS="$(random --str 40)" - config SECRET_POSTGRES_ADMIN="$(random --str 12)" SECRET_POSTGRES_REPLICA="$(random --str 12)" SECRET_POSTGRES_OPENSERVERLESS="$(random --str 12)" - config SECRET_ETCD_ROOT="$(random --str 12)" SECRET_MILVUS_ROOT="$(random --str 12)" SECRET_MILVUS_S3="$(random --str 12)" SECRET_MILVUS_OPENSERVERLESS="$(random --str 12)" - config SECRET_OPENSERVERLESS_METADATA="$(random --str 12)" @@ -123,7 +122,7 @@ tasks: - echo "Generated $(config -d | rg SECRET_ | wc -l) secrets." user-secrets: - desc: generate user secrets (auth, couchdb, redis, mongodb, minio, postgres) + desc: generate user secrets (auth, couchdb, redis, mongodb, seaweedfs, postgres) silent: true cmds: - | @@ -132,7 +131,7 @@ tasks: config "${USR}_SECRET_COUCHDB"="$(random --str 12)" config "${USR}_SECRET_REDIS"="$(random --str 12)" config "${USR}_SECRET_MONGODB"="$(random --str 12)" - config "${USR}_SECRET_MINIO"="$(random --str 40)" + config "${USR}_SECRET_SEAWEEDFS"="$(random --str 40)" config "${USR}_SECRET_POSTGRES"="$(random --str 12)" config "${USR}_SECRET_MILVUS"="$(random --str 12)" echo "Generated ${USR} user secrets." @@ -145,10 +144,10 @@ tasks: - config -r SECRET_COUCHDB_ADMIN SECRET_COUCHDB_CONTROLLER SECRET_COUCHDB_INVOKER - config -r SECRET_REDIS_DEFAULT SECRET_REDIS_OPENSERVERLESS - config -r SECRET_MONGODB_ADMIN SECRET_MONGODB_OPENSERVERLESS - - config -r SECRET_MINIO_ADMIN SECRET_MINIO_OPENSERVERLESS - config -r SECRET_POSTGRES_ADMIN SECRET_POSTGRES_REPLICA SECRET_POSTGRES_OPENSERVERLESS - config -r SECRET_ETCD_ROOT SECRET_MILVUS_ROOT SECRET_MILVUS_S3 SECRET_MILVUS_OPENSERVERLESS - config -r SECRET_OPENSERVERLESS_METADATA + - config -r SECRET_SEAWEEDFS_OPENSERVERLESS - config -r SECRET_REGISTRY_PUSH_PULL - config -d | rg SECRET_ @@ -163,8 +162,9 @@ tasks: config -r "${USR}_SECRET_COUCHDB" config -r "${USR}_SECRET_REDIS" config -r "${USR}_SECRET_MONGODB" - config -r "${USR}_SECRET_MINIO" + config -r "${USR}_SECRET_SEAWEEDFS" config -r "${USR}_SECRET_POSTGRES" + config -r "${USR}_SECRET_MILVUS" echo "Removed ${USR} user secrets." kubectl:
