Merge pull request #39 from d4rkstar/issue_89

feat(operator): parameters to set the max. num. of users/roles/databases

Author: francescotimperi

deploy/nuvolaris-permissions/whisk-crd.yaml

@@ -734,6 +734,23 @@ spec:
                     replicas:
                       description: number of total milvus replicas. Defaulted to 1
                       type: integer
+                    proxy:
+                      description: MILVUS proxy related params
+                      type: object
+                      properties:
+                        max-role-num:
+                          description: Modify the Milvus maximum role limit
+                          type: integer
+                        max-user-num:
+                          description: Modify the Milvus maximum user limit
+                          type: integer
+                    root-coord:
+                      description: MILVUS rootCoord related params
+                      type: object
+                      properties:
+                        max-database-num:
+                          description: Modify the Milvus maximum database number
+                          type: integer
                     password:
                       description: MILVUS related user passwords
                       type: object

nuvolaris/templates/milvus-cfg-base.yaml

@@ -79,12 +79,13 @@ data:
       address: localhost
       port: 53100
       enableActiveStandby: false  # Enable rootcoord active-standby
+      maxDatabaseNum: {{milvus_max_database_num}}
     
     proxy:
       port: 19530
       internalPort: 19529
-      maxRoleNum: 100
-      maxUserNum: 100
+      maxRoleNum: {{milvus_max_role_num}}
+      maxUserNum: {{milvus_max_user_num}}
     
     queryCoord:
       address: localhost

nuvolaris/util.py

@@ -717,22 +717,25 @@ def get_milvus_config_data():
     data = {
         'milvus_etcd_username': "etcdmilvus",
         'milvus_etcd_password': cfg.get('milvus.password.etcd') or "0therPa55",
-        "milvus_etcd_root_password":cfg.get("etcd.root.password") or "s0meP@ass3wd",
-        'milvus_etcd_prefix': "milvus",
-        'milvus_s3_username': "miniomilvus",
+        'milvus_etcd_root_password':cfg.get("etcd.root.password") or "s0meP@ass3wd",
+        'milvus_etcd_prefix': 'milvus',
+        'milvus_s3_username': 'miniomilvus',
         'milvus_s3_password': cfg.get('milvus.password.s3') or "s0meP@ass3",
-        'milvus_bucket_name': "vectors",
-        'milvus_bucket_prefix': "milvus/nuvolaris-milvus",
+        'milvus_bucket_name': 'vectors',
+        'milvus_bucket_prefix': 'milvus/nuvolaris-milvus',
         'size': cfg.get('milvus.volume-size.cluster') or 10,
         'zookeeper_size': cfg.get('milvus.volume-size.zookeeper') or 10,
         'bookie_journal_size': cfg.get('milvus.volume-size.journal') or 25,
         'bookie_ledgers_size': cfg.get('milvus.volume-size.ledgers') or 50,
         'replicas': cfg.get('milvus.replicas') or 1,
         'storageClass': cfg.get('nuvolaris.storageclass'),
-        "etcd_replicas":get_etcd_replica(),
-        "etcd_container": "nuvolaris-etcd",
+        'etcd_replicas':get_etcd_replica(),
+        'etcd_container': 'nuvolaris-etcd',
         'milvus_root_password': cfg.get('milvus.password.root') or "An0therPa55",
-        'nuvolaris_password': cfg.get('milvus.nuvolaris.password') or "Nuv0therPa55"
+        'nuvolaris_password': cfg.get('milvus.nuvolaris.password') or "Nuv0therPa55",
+        'milvus_max_role_num': cfg.get('milvus.proxy.max-role-num') or 10,
+        'milvus_max_user_num': cfg.get('milvus.proxy.max-user-num') or 100,
+        'milvus_max_database_num': cfg.get('milvus.root-coord.max-database-num') or 64
         }
 
     data["etcd_range"]=range(data["etcd_replicas"])