Merge pull request #132 from francescotimperi/github-app

Extra feature nuvolaris/nuvolaris#324
nuvolaris · Nov 8, 2023 · 5b15d36 · 5b15d36
2 parents 1c90247 + 4c685ba
commit 5b15d36
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/deploy/nuvolaris-permissions/whisk-user-crd.yaml b/deploy/nuvolaris-permissions/whisk-user-crd.yaml
@@ -103,8 +103,8 @@ spec:
                       description: password to access the internal MINIO instance
                       type: string
                     quota:
-                      description: maximum quota assignable in mb to each defined bucket, If omitted il will be equivalent to unlimited
-                      type: integer
+                      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
                       type: object

diff --git a/nuvolaris/minio.py b/nuvolaris/minio.py
@@ -146,11 +146,14 @@ def create_nuv_storage(data):
         logging.info(f"*** configured MINIO storage for nuvolaris")
 
 def assign_bucket_quota(bucket_name, quota, minioClient:MinioClient):
-    logging.info(f"*** setting quota on bucket {bucket_name} with hardlimit to {quota}m")
-    res = minioClient.assign_quota_to_bucket(bucket_name,quota)
+    if not quota.lower() in ['auto'] and quota.isnumeric():
+        logging.info(f"*** setting quota on bucket {bucket_name} with hardlimit to {quota}m")
+        res = minioClient.assign_quota_to_bucket(bucket_name,quota)
 
-    if res:
-        logging.info(f"*** quota on bucket {bucket_name} set successfully")
+        if res:
+            logging.info(f"*** quota on bucket {bucket_name} set successfully")
+    else:
+        logging.warn(f"*** skipping quota set on bucket {bucket_name}. Requested quota values is {quota}")
 
 
 def create_ow_storage(state, ucfg: UserConfig, user_metadata: UserMetadata, owner=None):

diff --git a/tests/kind/whisk-user.yaml b/tests/kind/whisk-user.yaml
@@ -31,7 +31,7 @@ spec:
     password: fttredispwd
   object-storage:        
     password: vPtIjR2MFMlYY7U5BY6N7TTogZXnJa8cl6ygPGnJIXOJonfA6MuNpVAdLN7m8iVc
-    quota: 100
+    quota: "100"
     data:
       enabled: true
       bucket: franztt-data